Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.6.2

Browse Source 
Tareas #1246: En albaranes de cliente debe salir la base imponible (y no el importe total)
Tareas #1248: REvisar agrupaciones facturas proveedor
Tareas #1254: Que al seleccionar el cliente se copie la forma de pago del mismo
Tareas #1255: Forma de pago, notas y observaciones a nivel de empresa
Tareas #1261: Se arregla el tipo de id_tipo_IVA y ID_forma_pago de empresa para que soporte integers
Tareas #1264: Revisar el guardar los datos de configuración de la empresa ya que da error
Tareas #1265: Revisar forma de pago por defecto de los contactos ya que no está bien
Tareas #1269: Que en la lista de contratos se puedan ver las facturas asociadas si las tuviera

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@84 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2013-10-08 16:59:28 +00:00
parent ec5eeb3fb0
commit 4dc42f3a9d
30 changed files with 911 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

16
Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
View File

@ -9,10 +9,10 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_EmpresasTiendas = '{74B8F6E8-F54A-4CE5-8D8C-4793AD36775A}'; RID_EmpresasTiendas = '{24354065-34FB-4D22-9253-5CC082F7F289}';
RID_DarNombre = '{C31A013C-8C38-4E98-96C0-50DBC7D8B73E}'; RID_DarNombre = '{908C8404-6D2A-40FA-B291-D2E17BF5ED33}';
RID_Empresas = '{CEF1ACC5-4CC7-4A29-B512-532A1B0C2917}'; RID_Empresas = '{1B9E49DD-EA45-4FDC-9438-299F6CD8D55F}';
RID_EmpresasDatosBanco = '{E1E6796F-5841-47B5-AFCF-5DEBE3A6C903}'; RID_EmpresasDatosBanco = '{281E9067-263E-447E-896F-E5D3C8B51D73}';
{ Data table names } { Data table names }
nme_EmpresasTiendas = 'EmpresasTiendas'; nme_EmpresasTiendas = 'EmpresasTiendas';
@ -145,7 +145,7 @@ const
type type
{ IEmpresasTiendas } { IEmpresasTiendas }
IEmpresasTiendas = interface(IDAStronglyTypedDataTable) IEmpresasTiendas = interface(IDAStronglyTypedDataTable)
['{C6667179-F2F3-48DA-97B4-03E67A6E087A}'] ['{072C4F53-5CB8-42B1-8E7B-1B9F9566A489}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -360,7 +360,7 @@ type
{ IDarNombre } { IDarNombre }
IDarNombre = interface(IDAStronglyTypedDataTable) IDarNombre = interface(IDAStronglyTypedDataTable)
['{5F2B65AC-C81D-4780-AEBE-C137CE4CADCA}'] ['{36C6DE99-879C-4CD9-BAC2-86D29EA32BA0}']
{ Property getters and setters } { Property getters and setters }
function GetNOMBREValue: String; function GetNOMBREValue: String;
procedure SetNOMBREValue(const aValue: String); procedure SetNOMBREValue(const aValue: String);
@ -395,7 +395,7 @@ type
{ IEmpresas } { IEmpresas }
IEmpresas = interface(IDAStronglyTypedDataTable) IEmpresas = interface(IDAStronglyTypedDataTable)
['{20CF86F9-265B-450D-99B5-6F784684B3F0}'] ['{E55587B7-F61A-4FE3-A87E-23B2937651C9}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -742,7 +742,7 @@ type
{ IEmpresasDatosBanco } { IEmpresasDatosBanco }
IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable) IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
['{FC451B78-DF0A-4C99-A5C8-F56B4C03C5FF}'] ['{BE056627-D7CE-45E0-9C9B-9A8EEEE21DC7}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);

16
Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
View File

@ -9,15 +9,15 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_EmpresasTiendasDelta = '{A3CE7076-3DD1-413E-8A22-76E00907B3F8}'; RID_EmpresasTiendasDelta = '{C2DF8351-F4BD-45D9-B158-5B6229017A94}';
RID_DarNombreDelta = '{1A33D883-5482-424E-A458-406627B7C222}'; RID_DarNombreDelta = '{E132F7C4-76CF-4381-A65F-3FE396C43927}';
RID_EmpresasDelta = '{3D30AB01-4425-491D-AF07-E6C3B9D4268E}'; RID_EmpresasDelta = '{7F3E50C3-3DF3-44E3-A6DF-5159F721FC65}';
RID_EmpresasDatosBancoDelta = '{34696D9E-C399-422A-B9DC-7B4D3A0434DD}'; RID_EmpresasDatosBancoDelta = '{8444CEF5-4F93-4913-ADC9-EA4151961E85}';
type type
{ IEmpresasTiendasDelta } { IEmpresasTiendasDelta }
IEmpresasTiendasDelta = interface(IEmpresasTiendas) IEmpresasTiendasDelta = interface(IEmpresasTiendas)
['{A3CE7076-3DD1-413E-8A22-76E00907B3F8}'] ['{C2DF8351-F4BD-45D9-B158-5B6229017A94}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -232,7 +232,7 @@ type
{ IDarNombreDelta } { IDarNombreDelta }
IDarNombreDelta = interface(IDarNombre) IDarNombreDelta = interface(IDarNombre)
['{1A33D883-5482-424E-A458-406627B7C222}'] ['{E132F7C4-76CF-4381-A65F-3FE396C43927}']
{ Property getters and setters } { Property getters and setters }
function GetOldNOMBREValue : String; function GetOldNOMBREValue : String;
@ -266,7 +266,7 @@ type
{ IEmpresasDelta } { IEmpresasDelta }
IEmpresasDelta = interface(IEmpresas) IEmpresasDelta = interface(IEmpresas)
['{3D30AB01-4425-491D-AF07-E6C3B9D4268E}'] ['{7F3E50C3-3DF3-44E3-A6DF-5159F721FC65}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String; function GetOldNIF_CIFValue : String;
@ -614,7 +614,7 @@ type
{ IEmpresasDatosBancoDelta } { IEmpresasDatosBancoDelta }
IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco) IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
['{34696D9E-C399-422A-B9DC-7B4D3A0434DD}'] ['{8444CEF5-4F93-4913-ADC9-EA4151961E85}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;

376
Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
View File

@ -594,7 +594,370 @@ object srvEmpresas: TsrvEmpresas
end> end>
JoinDataTables = <> JoinDataTables = <>
UnionDataTables = <> UnionDataTables = <>
Commands = <> Commands = <
item
Params = <
item
Name = 'ID'
DataType = datAutoInc
GeneratorName = 'GEN_EMPRESAS_ID'
Value = ''
end
item
Name = 'NIF_CIF'
DataType = datString
Size = 15
Value = ''
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'RAZON_SOCIAL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'CALLE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
Value = ''
end
item
Name = 'TELEFONO_1'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'TELEFONO_2'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'MOVIL_1'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'MOVIL_2'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'FAX'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'EMAIL_1'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'EMAIL_2'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'PAGINA_WEB'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'NOTAS'
DataType = datMemo
Value = ''
end
item
Name = 'FECHA_ALTA'
DataType = datDateTime
Value = ''
end
item
Name = 'FECHA_MODIFICACION'
DataType = datDateTime
Value = ''
end
item
Name = 'USUARIO'
DataType = datString
Size = 30
Value = ''
end
item
Name = 'LOGOTIPO'
DataType = datBlob
Value = ''
end
item
Name = 'REGISTRO_MERCANTIL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'ID_TIPO_IVA'
DataType = datInteger
Value = ''
end
item
Name = 'ID_FORMA_PAGO'
DataType = datInteger
Value = ''
end
item
Name = 'VALIDEZ_PRESUPUESTOS'
DataType = datSmallInt
Value = ''
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
Value = ''
end>
Statements = <
item
Connection = 'IBX'
Default = True
TargetTable = 'EMPRESAS'
SQL =
'INSERT'#10' INTO EMPRESAS'#10' (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, C' +
'ALLE, POBLACION, PROVINCIA,'#10' CODIGO_POSTAL, TELEFONO_1, TELE' +
'FONO_2, MOVIL_1, MOVIL_2, '#10' FAX, EMAIL_1, EMAIL_2, PAGINA_WE' +
'B, NOTAS, FECHA_ALTA, '#10' FECHA_MODIFICACION, USUARIO, LOGOTIP' +
'O, REGISTRO_MERCANTIL, '#10' ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ' +
'_PRESUPUESTOS, PRECIO_PUNTO'#10' )'#10' VALUES'#10' (:ID, :NIF_CIF, ' +
':NOMBRE, :RAZON_SOCIAL, :CALLE, :POBLACION,'#10' :PROVINCIA, :CO' +
'DIGO_POSTAL, :TELEFONO_1, :TELEFONO_2, '#10' :MOVIL_1, :MOVIL_2,' +
' :FAX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, '#10' :NOTAS, :FECHA_ALT' +
'A, :FECHA_MODIFICACION, :USUARIO, '#10' :LOGOTIPO, :REGISTRO_MER' +
'CANTIL, :ID_TIPO_IVA, :ID_FORMA_PAGO, '#10' :VALIDEZ_PRESUPUESTO' +
'S, :PRECIO_PUNTO)'#10
StatementType = stSQL
ColumnMappings = <>
end>
Name = 'Insert_Empresas'
end
item
Params = <
item
Name = 'OLD_ID'
DataType = datAutoInc
Value = ''
end>
Statements = <
item
Connection = 'IBX'
Default = True
TargetTable = 'EMPRESAS'
SQL = 'DELETE '#10' FROM'#10' EMPRESAS'#10' WHERE'#10' (ID = :OLD_ID)'#10
StatementType = stSQL
ColumnMappings = <>
end>
Name = 'Delete_Empresas'
end
item
Params = <
item
Name = 'NIF_CIF'
DataType = datString
Size = 15
Value = ''
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'RAZON_SOCIAL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'CALLE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
Value = ''
end
item
Name = 'TELEFONO_1'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'TELEFONO_2'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'MOVIL_1'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'MOVIL_2'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'FAX'
DataType = datString
Size = 25
Value = ''
end
item
Name = 'EMAIL_1'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'EMAIL_2'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'PAGINA_WEB'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'NOTAS'
DataType = datMemo
Value = ''
end
item
Name = 'FECHA_ALTA'
DataType = datDateTime
Value = ''
end
item
Name = 'FECHA_MODIFICACION'
DataType = datDateTime
Value = ''
end
item
Name = 'USUARIO'
DataType = datString
Size = 30
Value = ''
end
item
Name = 'LOGOTIPO'
DataType = datBlob
Value = ''
end
item
Name = 'REGISTRO_MERCANTIL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'ID_TIPO_IVA'
DataType = datInteger
Value = ''
end
item
Name = 'ID_FORMA_PAGO'
DataType = datInteger
Value = ''
end
item
Name = 'VALIDEZ_PRESUPUESTOS'
DataType = datSmallInt
Value = ''
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
Value = ''
end
item
Name = 'OLD_ID'
Value = ''
end>
Statements = <
item
Connection = 'IBX'
Default = True
TargetTable = 'EMPRESAS'
SQL =
'UPDATE EMPRESAS'#10' SET '#10' NIF_CIF = :NIF_CIF, '#10' NOMBRE = :NO' +
'MBRE, '#10' RAZON_SOCIAL = :RAZON_SOCIAL, '#10' CALLE = :CALLE, '#10' ' +
' POBLACION = :POBLACION, '#10' PROVINCIA = :PROVINCIA, '#10' COD' +
'IGO_POSTAL = :CODIGO_POSTAL, '#10' TELEFONO_1 = :TELEFONO_1, '#10' ' +
' TELEFONO_2 = :TELEFONO_2, '#10' MOVIL_1 = :MOVIL_1, '#10' MOVIL_2' +
' = :MOVIL_2, '#10' FAX = :FAX, '#10' EMAIL_1 = :EMAIL_1, '#10' EMAI' +
'L_2 = :EMAIL_2, '#10' PAGINA_WEB = :PAGINA_WEB, '#10' NOTAS = :NOT' +
'AS, '#10' FECHA_ALTA = :FECHA_ALTA, '#10' FECHA_MODIFICACION = :FE' +
'CHA_MODIFICACION, '#10' USUARIO = :USUARIO, '#10' LOGOTIPO = :LOGO' +
'TIPO, '#10' REGISTRO_MERCANTIL = :REGISTRO_MERCANTIL, '#10' ID_TIP' +
'O_IVA = :ID_TIPO_IVA, '#10' ID_FORMA_PAGO = :ID_FORMA_PAGO, '#10' ' +
'VALIDEZ_PRESUPUESTOS = :VALIDEZ_PRESUPUESTOS, '#10' PRECIO_PUNTO ' +
'= :PRECIO_PUNTO'#10' WHERE'#10' (ID = :OLD_ID)'#10
StatementType = stSQL
ColumnMappings = <>
end>
Name = 'Update_Empresas'
end>
RelationShips = < RelationShips = <
item item
Name = 'FK_EmpresasTiendas_Empresas' Name = 'FK_EmpresasTiendas_Empresas'
@ -962,4 +1325,15 @@ object srvEmpresas: TsrvEmpresas
Left = 48 Left = 48
Top = 88 Top = 88
end end
object bpEmpresas: TDABusinessProcessor
Schema = schEmpresas
InsertCommandName = 'Insert_Empresas'
DeleteCommandName = 'Delete_Empresas'
UpdateCommandName = 'Update_Empresas'
ReferencedDataset = 'Empresas'
ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
UpdateMode = updWhereKeyOnly
Left = 264
Top = 24
end
end end

1
Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
View File

@ -24,6 +24,7 @@ type
DABin2DataStreamer: TDABin2DataStreamer; DABin2DataStreamer: TDABin2DataStreamer;
schEmpresas: TDASchema; schEmpresas: TDASchema;
DataDictionary: TDADataDictionary; DataDictionary: TDADataDictionary;
bpEmpresas: TDABusinessProcessor;
procedure DARemoteServiceCreate(Sender: TObject); procedure DARemoteServiceCreate(Sender: TObject);
procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject; procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
var aConnectionName: string); var aConnectionName: string);

96
Source/Base/Base.dproj
View File

@ -65,55 +65,55 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\designide.dcp" />
<DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contactos\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
<DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="..\Servidor\adortl.dcp" />
<DCCReference Include="..\Servidor\cxDataD11.dcp" />
<DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
<DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Servidor\cxGridD11.dcp" />
<DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
<DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
<DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Servidor\dbrtl.dcp" />
<DCCReference Include="..\Servidor\dclIndyCore.dcp" />
<DCCReference Include="..\Servidor\designide.dcp" />
<DCCReference Include="..\Servidor\dsnap.dcp" />
<DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Servidor\dxThemeD11.dcp" />
<DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
<DCCReference Include="..\Servidor\IndyCore.dcp" />
<DCCReference Include="..\Servidor\IndyProtocols.dcp" />
<DCCReference Include="..\Servidor\IndySystem.dcp" />
<DCCReference Include="..\Servidor\Jcl.dcp" />
<DCCReference Include="..\Servidor\JclVcl.dcp" />
<DCCReference Include="..\Servidor\JSDialog100.dcp" />
<DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
<DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
<DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Servidor\JvMMD11R.dcp" />
<DCCReference Include="..\Servidor\JvNetD11R.dcp" />
<DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
<DCCReference Include="..\Servidor\pckMD5.dcp" />
<DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Servidor\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
<DCCReference Include="..\Servidor\PNG_D10.dcp" />
<DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Servidor\rtl.dcp" />
<DCCReference Include="..\Servidor\TB2k_D10.dcp" />
<DCCReference Include="..\Servidor\tbx_d10.dcp" />
<DCCReference Include="..\Servidor\vcl.dcp" />
<DCCReference Include="..\Servidor\vclactnband.dcp" />
<DCCReference Include="..\Servidor\vcldb.dcp" />
<DCCReference Include="..\Servidor\vcljpg.dcp" />
<DCCReference Include="..\Servidor\VclSmp.dcp" />
<DCCReference Include="..\Servidor\vclx.dcp" />
<DCCReference Include="..\Servidor\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\ccpackD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExportD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxLayoutControlD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxCommonD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frx11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frxe11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\fs11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvAppFrmD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvGlobusD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tb2k_d10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

22
Source/Informes/1/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

23
Source/Informes/2/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

22
Source/Informes/3/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

22
Source/Informes/4/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

16
Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj
View File

@ -15,6 +15,7 @@
<Projects Include="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" /> <Projects Include="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" />
<Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" /> <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
<Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" /> <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
<Projects Include="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" />
<Projects Include="Controller\AlbaranesCliente_controller.dproj" /> <Projects Include="Controller\AlbaranesCliente_controller.dproj" />
<Projects Include="Data\AlbaranesCliente_data.dproj" /> <Projects Include="Data\AlbaranesCliente_data.dproj" />
<Projects Include="Model\AlbaranesCliente_model.dproj" /> <Projects Include="Model\AlbaranesCliente_model.dproj" />
@ -171,14 +172,23 @@
<Target Name="ContratosCliente_view:Make"> <Target Name="ContratosCliente_view:Make">
<MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Make" /> <MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="ConCli_FacCli_relation">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="" />
</Target>
<Target Name="ConCli_FacCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="ConCli_FacCli_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;ContratosCliente_view" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;ContratosCliente_view;ConCli_FacCli_relation" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;ContratosCliente_view:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;ContratosCliente_view:Clean;ConCli_FacCli_relation:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;ContratosCliente_view:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;ContratosCliente_view:Make;ConCli_FacCli_relation:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

81
Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
View File

@ -102,6 +102,22 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Name = 'OBSERVACIONES' Name = 'OBSERVACIONES'
DataType = datMemo DataType = datMemo
end end
item
Name = 'IMPORTE_NETO'
DataType = datCurrency
end
item
Name = 'DESCUENTO'
DataType = datFloat
end
item
Name = 'IMPORTE_DESCUENTO'
DataType = datCurrency
end
item
Name = 'BASE_IMPONIBLE'
DataType = datCurrency
end
item item
Name = 'IMPORTE_TOTAL' Name = 'IMPORTE_TOTAL'
DataType = datCurrency DataType = datCurrency
@ -324,20 +340,23 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
'CONTACTOS_DIRECCIONES.TELEFONO, CONTACTOS.TELEFONO_1) AS TELEFON' + 'CONTACTOS_DIRECCIONES.TELEFONO, CONTACTOS.TELEFONO_1) AS TELEFON' +
'O,'#10' COALESCE(CONTACTOS_DIRECCIONES.MOVIL, CONTACTOS.MOVIL_1) AS' + 'O,'#10' COALESCE(CONTACTOS_DIRECCIONES.MOVIL, CONTACTOS.MOVIL_1) AS' +
' MOVIL,'#10' ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' ALBARANES_CLIENT' + ' MOVIL,'#10' ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' ALBARANES_CLIENT' +
'E.OBSERVACIONES,'#10' ALBARANES_CLIENTE.IMPORTE_TOTAL,'#10' ALBARANES_' + 'E.OBSERVACIONES,'#10' ALBARANES_CLIENTE.IMPORTE_NETO,'#10' ALBARANES_C' +
'CLIENTE.FECHA_PREVISTA_ENVIO,'#10' EMPRESAS.NIF_CIF AS NIF_CIF_EMPR' + 'LIENTE.DESCUENTO,'#10' ALBARANES_CLIENTE.IMPORTE_DESCUENTO,'#10' ALBAR' +
'ESA,'#10' EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10' EMPRESAS.RAZON_SOCIA' + 'ANES_CLIENTE.BASE_IMPONIBLE,'#10' ALBARANES_CLIENTE.IMPORTE_TOTAL,'#10 +
'L AS RAZON_SOCIAL_EMPRESA,'#10' EMPRESAS.CALLE AS CALLE_EMPRESA,'#10' ' + ' ALBARANES_CLIENTE.FECHA_PREVISTA_ENVIO,'#10' EMPRESAS.NIF_CIF AS ' +
'EMPRESAS.CODIGO_POSTAL AS CODIGO_POSTAL_EMPRESA,'#10' EMPRESAS.POBL' + 'NIF_CIF_EMPRESA,'#10' EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10' EMPRESAS' +
'ACION AS POBLACION_EMPRESA,'#10' EMPRESAS.PROVINCIA AS PROVINCIA_EM' + '.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,'#10' EMPRESAS.CALLE AS CALLE' +
'PRESA,'#10' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10' EMPRESAS.F' + '_EMPRESA,'#10' EMPRESAS.CODIGO_POSTAL AS CODIGO_POSTAL_EMPRESA,'#10' E' +
'AX AS FAX_EMPRESA,'#10' EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10' EMPR' + 'MPRESAS.POBLACION AS POBLACION_EMPRESA,'#10' EMPRESAS.PROVINCIA AS ' +
'ESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10' EMPRESAS.PAGINA_WEB AS PAGINA' + 'PROVINCIA_EMPRESA,'#10' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10 +
'_WEB_EMPRESA'#10'FROM'#10' ALBARANES_CLIENTE'#10' INNER JOIN EMPRESAS ON (' + ' EMPRESAS.FAX AS FAX_EMPRESA,'#10' EMPRESAS.MOVIL_1 AS MOVIL_1_EMP' +
'EMPRESAS.ID = ALBARANES_CLIENTE.ID_EMPRESA)'#10' INNER JOIN CONTACT' + 'RESA,'#10' EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10' EMPRESAS.PAGINA_W' +
'OS ON (CONTACTOS.ID = ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT OUTER' + 'EB AS PAGINA_WEB_EMPRESA'#10'FROM'#10' ALBARANES_CLIENTE'#10' INNER JOIN E' +
' JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID = ALBAR' + 'MPRESAS ON (EMPRESAS.ID = ALBARANES_CLIENTE.ID_EMPRESA)'#10' INNER ' +
'ANES_CLIENTE.ID_DIRECCION)'#10'WHERE ALBARANES_CLIENTE.ID = :ID'#10 'JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_CLIENTE.ID_CLIENTE)'#10 +
' LEFT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONE' +
'S.ID = ALBARANES_CLIENTE.ID_DIRECCION)'#10'WHERE ALBARANES_CLIENTE.I' +
'D = :ID'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -470,6 +489,22 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
DatasetField = 'REF_CLIENTE' DatasetField = 'REF_CLIENTE'
TableField = '<unknown>' TableField = '<unknown>'
SQLOrigin = 'REF_CLIENTE' SQLOrigin = 'REF_CLIENTE'
end
item
DatasetField = 'IMPORTE_NETO'
TableField = 'IMPORTE_NETO'
end
item
DatasetField = 'DESCUENTO'
TableField = 'DESCUENTO'
end
item
DatasetField = 'IMPORTE_DESCUENTO'
TableField = 'IMPORTE_DESCUENTO'
end
item
DatasetField = 'BASE_IMPONIBLE'
TableField = 'BASE_IMPONIBLE'
end> end>
end> end>
Name = 'Informe_Cabecera' Name = 'Informe_Cabecera'
@ -558,6 +593,22 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Name = 'OBSERVACIONES' Name = 'OBSERVACIONES'
DataType = datMemo DataType = datMemo
end end
item
Name = 'IMPORTE_NETO'
DataType = datCurrency
end
item
Name = 'DESCUENTO'
DataType = datFloat
end
item
Name = 'IMPORTE_DESCUENTO'
DataType = datCurrency
end
item
Name = 'BASE_IMPONIBLE'
DataType = datCurrency
end
item item
Name = 'IMPORTE_TOTAL' Name = 'IMPORTE_TOTAL'
DataType = datCurrency DataType = datCurrency
@ -1097,7 +1148,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
PrintOptions.Printer = 'Default' PrintOptions.Printer = 'Default'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 37871.995398692100000000 ReportOptions.CreateDate = 37871.995398692100000000
ReportOptions.LastChange = 40142.519712557870000000 ReportOptions.LastChange = 41544.473509386570000000
ReportOptions.VersionBuild = '1' ReportOptions.VersionBuild = '1'
ReportOptions.VersionMajor = '12' ReportOptions.VersionMajor = '12'
ReportOptions.VersionMinor = '13' ReportOptions.VersionMinor = '13'

115
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
View File

@ -157,26 +157,27 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 781 Width = 781
Height = 333 Height = 418
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 112 ExplicitTop = 112
ExplicitWidth = 781 ExplicitWidth = 781
ExplicitHeight = 333 ExplicitHeight = 421
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 773 ExplicitWidth = 773
ExplicitHeight = 305 ExplicitHeight = 393
end end
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitHeight = 393
inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 773 Width = 773
Height = 305 Height = 390
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -189,14 +190,50 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 773 ExplicitWidth = 773
ExplicitHeight = 305 ExplicitHeight = 393
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 773 Width = 773
ExplicitWidth = 773 ExplicitWidth = 773
inherited UpDown1: TUpDown
Left = 239
ExplicitLeft = 239
end
inherited ToolButton13: TToolButton
Left = 256
ExplicitLeft = 256
end
inherited ToolButton6: TToolButton
Left = 264
ExplicitLeft = 264
end
inherited ToolButton7: TToolButton
Left = 298
ExplicitLeft = 298
end
inherited ToolButton8: TToolButton
Left = 332
ExplicitLeft = 332
end
inherited ToolButton12: TToolButton
Left = 366
ExplicitLeft = 366
end
inherited ToolButton9: TToolButton
Left = 374
ExplicitLeft = 374
end
inherited ToolButton10: TToolButton
Left = 408
ExplicitLeft = 408
end
inherited ToolButton11: TToolButton
Left = 442
ExplicitLeft = 442
end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 773 Width = 773
Height = 233 Height = 318
ExplicitWidth = 773 ExplicitWidth = 773
ExplicitHeight = 321 ExplicitHeight = 321
end end
@ -204,23 +241,23 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 773 Width = 773
ExplicitWidth = 773 ExplicitWidth = 773
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 622 ExplicitWidth = 719
end end
end end
inherited cxRichEdit1: TcxRichEdit
Style.IsFontAssigned = True
end
end end
end end
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0 ExplicitHeight = 393
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
Width = 773 Width = 773
Height = 305 Height = 390
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -231,7 +268,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 773 ExplicitWidth = 773
ExplicitHeight = 305 ExplicitHeight = 393
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 773 Width = 773
ExplicitWidth = 773 ExplicitWidth = 773
@ -241,13 +278,13 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 773 Width = 773
Height = 277 Height = 362
ExplicitWidth = 773 ExplicitWidth = 773
ExplicitHeight = 277 ExplicitHeight = 365
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 769 ExplicitWidth = 769
ExplicitHeight = 260 ExplicitHeight = 348
Height = 260 Height = 345
Width = 769 Width = 769
end end
end end
@ -256,9 +293,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end end
inline frViewTotales1: TfrViewTotales [4] inline frViewTotales1: TfrViewTotales [4]
Left = 0 Left = 0
Top = 448 Top = 533
Width = 787 Width = 787
Height = 161 Height = 76
Align = alBottom Align = alBottom
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -268,16 +305,16 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
ReadOnly = False ReadOnly = False
ExplicitTop = 448 ExplicitTop = 533
ExplicitWidth = 787 ExplicitWidth = 787
ExplicitHeight = 161 ExplicitHeight = 76
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 787 Width = 787
Height = 161 Height = 76
Align = alClient Align = alClient
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 787 ExplicitWidth = 787
ExplicitHeight = 161 ExplicitHeight = 73
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 377 Left = 377
Top = 11 Top = 11
@ -395,6 +432,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Left = 93 Left = 93
Top = 65 Top = 65
Enabled = False
Properties.OnValidate = frViewTotales1ePortePropertiesValidate Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 93 ExplicitLeft = 93
@ -406,6 +444,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 93 Left = 93
Top = 92 Top = 92
DataBinding.DataField = '' DataBinding.DataField = ''
Enabled = False
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 92 ExplicitTop = 92
ExplicitWidth = 121 ExplicitWidth = 121
@ -414,6 +453,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 229 Left = 229
Top = 92 Top = 92
Enabled = False
ExplicitLeft = 229 ExplicitLeft = 229
ExplicitTop = 92 ExplicitTop = 92
end end
@ -422,6 +462,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Top = 119 Top = 119
DataBinding.DataField = '' DataBinding.DataField = ''
DataBinding.DataSource = nil DataBinding.DataSource = nil
Enabled = False
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 119 ExplicitTop = 119
ExplicitWidth = 259 ExplicitWidth = 259
@ -434,9 +475,18 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Group7: TdxLayoutGroup
inherited dxLayoutControl1Item9: TdxLayoutItem inherited dxLayoutControl1Item9: TdxLayoutItem
Enabled = False
Visible = False Visible = False
end end
end end
inherited dxLayoutControl1Group6: TdxLayoutGroup
Enabled = False
Visible = False
end
inherited dxLayoutControl1Item16: TdxLayoutItem
Enabled = False
Visible = False
end
end end
inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup
@ -445,6 +495,21 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Visible = False Visible = False
end end
end end
inherited dxLayoutControl1Group9: TdxLayoutGroup
Enabled = False
Visible = False
end
inherited dxLayoutControl1Group1191: TdxLayoutGroup
Enabled = False
end
inherited dxLayoutControl1Group8: TdxLayoutGroup
Enabled = False
Visible = False
end
inherited dxLayoutControl1Item3: TdxLayoutItem
Enabled = False
Visible = False
end
end end
end end
end end
@ -455,6 +520,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 787 Width = 787
ExplicitTop = 79 ExplicitTop = 79
ExplicitWidth = 787 ExplicitWidth = 787
inherited lbComentario: TLabel
Width = 777
Height = 25
end
end end
inherited EditorActionList: TActionList [9] inherited EditorActionList: TActionList [9]
Left = 32 Left = 32

26
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
View File

@ -19,7 +19,7 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
Format = ',0.00 '#8364';-,0.00 '#8364 Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum Kind = skSum
Position = spFooter Position = spFooter
Column = cxGridViewIMPORTE_TOTAL Column = cxGridViewBASE_IMPONIBLE
end> end>
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
@ -34,7 +34,7 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
item item
Format = ',0.00 '#8364';-,0.00 '#8364 Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum Kind = skSum
Column = cxGridViewIMPORTE_TOTAL Column = cxGridViewBASE_IMPONIBLE
end> end>
OptionsCustomize.ColumnHidingOnGrouping = False OptionsCustomize.ColumnHidingOnGrouping = False
OptionsView.GroupFooters = gfAlwaysVisible OptionsView.GroupFooters = gfAlwaysVisible
@ -168,9 +168,25 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
BestFitMaxWidth = 25 BestFitMaxWidth = 25
VisibleForCustomization = False VisibleForCustomization = False
end end
object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn object cxGridViewIMPORTE_NETO: TcxGridDBColumn
Caption = 'Importe total' Caption = 'Importe neto'
DataBinding.FieldName = 'IMPORTE_TOTAL' DataBinding.FieldName = 'IMPORTE_NETO'
PropertiesClassName = 'TcxCurrencyEditProperties'
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewDESCUENTO: TcxGridDBColumn
Caption = 'Dto'
DataBinding.FieldName = 'DESCUENTO'
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewIMPORTE_DESCUENTO: TcxGridDBColumn
Caption = 'Importe descuento'
DataBinding.FieldName = 'IMPORTE_DESCUENTO'
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewBASE_IMPONIBLE: TcxGridDBColumn
Caption = 'Base imponible'
DataBinding.FieldName = 'BASE_IMPONIBLE'
PropertiesClassName = 'TcxCurrencyEditProperties' PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify Properties.Alignment.Horz = taRightJustify
BestFitMaxWidth = 65 BestFitMaxWidth = 65

5
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
View File

@ -49,7 +49,7 @@ type
cxStylePENDIENTES: TcxStyle; cxStylePENDIENTES: TcxStyle;
cxStyleENVIADOS: TcxStyle; cxStyleENVIADOS: TcxStyle;
cxStyleSERVIDOS: TcxStyle; cxStyleSERVIDOS: TcxStyle;
cxGridViewIMPORTE_TOTAL: TcxGridDBColumn; cxGridViewBASE_IMPONIBLE: TcxGridDBColumn;
actClientes: TAction; actClientes: TAction;
actAlmacenes: TAction; actAlmacenes: TAction;
TBXItem2: TTBXItem; TBXItem2: TTBXItem;
@ -60,6 +60,9 @@ type
cxStyleRETRASADOS: TcxStyle; cxStyleRETRASADOS: TcxStyle;
cxGridViewTIENDA: TcxGridDBColumn; cxGridViewTIENDA: TcxGridDBColumn;
cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn; cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn;
cxGridViewIMPORTE_NETO: TcxGridDBColumn;
cxGridViewDESCUENTO: TcxGridDBColumn;
cxGridViewIMPORTE_DESCUENTO: TcxGridDBColumn;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel); TcxGridLevel);
procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView; procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;

4
Source/Modulos/Contactos/Views/uContactosViewRegister.pas
View File

@ -44,7 +44,7 @@ begin
EditorRegistry.RegisterClass(TfEditorPersonal, 'EditorPersonalContacto'); EditorRegistry.RegisterClass(TfEditorPersonal, 'EditorPersonalContacto');
EditorRegistry.RegisterClass(TfEditorElegirPersonaContacto, 'EditorElegirPersonaContacto'); EditorRegistry.RegisterClass(TfEditorElegirPersonaContacto, 'EditorElegirPersonaContacto');
ViewConfiguracionRegistry.RegisterClass(TfrViewConfiguracionContactos, 'Contactos'); // ViewConfiguracionRegistry.RegisterClass(TfrViewConfiguracionContactos, 'Contactos');
end; end;
procedure UnregisterViews; procedure UnregisterViews;
@ -73,7 +73,7 @@ begin
EditorRegistry.UnRegisterClass(TfEditorPersonal); EditorRegistry.UnRegisterClass(TfEditorPersonal);
EditorRegistry.UnRegisterClass(TfEditorElegirPersonaContacto); EditorRegistry.UnRegisterClass(TfEditorElegirPersonaContacto);
ViewConfiguracionRegistry.UnRegisterClass(TfrViewConfiguracionContactos); // ViewConfiguracionRegistry.UnRegisterClass(TfrViewConfiguracionContactos);
end; end;
end. end.

25
Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm
View File

@ -1,22 +1,25 @@
inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Height = 416 Width = 586
Height = 406
inherited Panel1: TPanel inherited Panel1: TPanel
ExplicitWidth = 424 Width = 576
ExplicitWidth = 422
inherited Label3: TLabel inherited Label3: TLabel
Width = 429 Width = 564
Caption = 'Configuraci'#243'n para clientes' Caption = 'Configuraci'#243'n para clientes'
ExplicitWidth = 166 ExplicitWidth = 166
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 586
LabelCaption = 'Configuraci'#243'n para contactos' LabelCaption = 'Configuraci'#243'n para contactos'
ExplicitWidth = 434 ExplicitWidth = 432
end end
object Panel3: TPanel object Panel3: TPanel
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 68 Top = 68
Width = 441 Width = 576
Height = 133 Height = 133
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -26,7 +29,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
BevelOuter = bvNone BevelOuter = bvNone
ParentColor = True ParentColor = True
TabOrder = 2 TabOrder = 2
ExplicitWidth = 424 ExplicitWidth = 422
object Label1: TLabel object Label1: TLabel
Left = 17 Left = 17
Top = 36 Top = 36
@ -105,7 +108,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 223 Top = 223
Width = 441 Width = 576
Height = 130 Height = 130
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -115,7 +118,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
BevelOuter = bvNone BevelOuter = bvNone
ParentColor = True ParentColor = True
TabOrder = 3 TabOrder = 3
ExplicitWidth = 424 ExplicitWidth = 422
object Label7: TLabel object Label7: TLabel
Left = 17 Left = 17
Top = 37 Top = 37
@ -194,7 +197,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 201 Top = 201
Width = 441 Width = 576
Height = 22 Height = 22
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -218,11 +221,11 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
ParentBackground = False ParentBackground = False
ParentFont = False ParentFont = False
TabOrder = 4 TabOrder = 4
ExplicitWidth = 424 ExplicitWidth = 422
object Label6: TLabel object Label6: TLabel
Left = 6 Left = 6
Top = 4 Top = 4
Width = 429 Width = 564
Height = 14 Height = 14
Align = alTop Align = alTop
Caption = 'Configuraci'#243'n para proveedores' Caption = 'Configuraci'#243'n para proveedores'

5
Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm
View File

@ -325,6 +325,11 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
Name = 'REFERENCIA_CLIENTE' Name = 'REFERENCIA_CLIENTE'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FACTURA_ASOCIADA'
DataType = datString
Size = 255
end> end>
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]

63
Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
View File

@ -9,13 +9,13 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_Valores = '{4E975748-969A-4FE9-BBD2-CC9D7B1CC40D}'; RID_Valores = '{85C69203-C88F-4A9D-AA12-DE1F6ACFD665}';
RID_Propiedades = '{D68E9D8E-0FE2-47A8-A050-ACB95BF5AFAF}'; RID_Propiedades = '{CB2E34C1-796F-448F-A4A6-846D624B852E}';
RID_ListaAnosContratos = '{7D999AE9-F346-450E-AF32-20F0F0F25228}'; RID_ListaAnosContratos = '{E6BA2538-34EE-4BC8-8856-A422852BFAAF}';
RID_ContratosClienteBeneficios = '{15AA6996-23F8-4883-B18C-43F5168D8F3B}'; RID_ContratosClienteBeneficios = '{38C0DE62-7B04-4DC8-8CD1-E58555EE0C8E}';
RID_ContratosCliente = '{D19AE467-7980-4CF4-B273-2BDB037E7D84}'; RID_ContratosCliente = '{38FD388B-7CAE-48F3-B299-C815FDEFB7EC}';
RID_TiposCapitulos = '{D18EC00D-ED0C-4BDD-BBC2-D2DE0794C1EF}'; RID_TiposCapitulos = '{C6155131-527F-4917-9E35-588127E79C9F}';
RID_ContratosCliente_Detalles = '{B7F0780D-5DEE-44BB-91E4-9D7B39A77425}'; RID_ContratosCliente_Detalles = '{884DB417-09B0-45BE-98A0-BF118A908349}';
{ Data table names } { Data table names }
nme_Valores = 'Valores'; nme_Valores = 'Valores';
@ -131,6 +131,7 @@ const
fld_ContratosClientePERSONA_CONTACTO = 'PERSONA_CONTACTO'; fld_ContratosClientePERSONA_CONTACTO = 'PERSONA_CONTACTO';
fld_ContratosClienteTIPO_CONTRATO = 'TIPO_CONTRATO'; fld_ContratosClienteTIPO_CONTRATO = 'TIPO_CONTRATO';
fld_ContratosClienteREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE'; fld_ContratosClienteREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE';
fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA';
{ ContratosCliente field indexes } { ContratosCliente field indexes }
idx_ContratosClienteID = 0; idx_ContratosClienteID = 0;
@ -179,6 +180,7 @@ const
idx_ContratosClientePERSONA_CONTACTO = 43; idx_ContratosClientePERSONA_CONTACTO = 43;
idx_ContratosClienteTIPO_CONTRATO = 44; idx_ContratosClienteTIPO_CONTRATO = 44;
idx_ContratosClienteREFERENCIA_CLIENTE = 45; idx_ContratosClienteREFERENCIA_CLIENTE = 45;
idx_ContratosClienteFACTURA_ASOCIADA = 46;
{ TiposCapitulos fields } { TiposCapitulos fields }
fld_TiposCapitulosID = 'ID'; fld_TiposCapitulosID = 'ID';
@ -237,7 +239,7 @@ const
type type
{ IValores } { IValores }
IValores = interface(IDAStronglyTypedDataTable) IValores = interface(IDAStronglyTypedDataTable)
['{E8AD85FE-0E64-418E-BA2A-9787E4F4F489}'] ['{0189264B-8AD0-4068-8E27-FA6906AA8105}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -296,7 +298,7 @@ type
{ IPropiedades } { IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable) IPropiedades = interface(IDAStronglyTypedDataTable)
['{69C96C55-8229-43B6-8D8C-5B5AD61C3165}'] ['{29CC0CF4-C2C1-4C0D-B975-FAE4239194A8}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -355,7 +357,7 @@ type
{ IListaAnosContratos } { IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable) IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{F7CDB162-A98F-4A06-9412-29DC6A122C9E}'] ['{06AFA59E-EE56-4C39-8BD3-3F12115F94A2}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -390,7 +392,7 @@ type
{ IContratosClienteBeneficios } { IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{01F28039-DF8B-4839-B3B0-8EE2E53D91E4}'] ['{8EBBB0F4-9441-44BA-B2E3-1450D22BD87A}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -581,7 +583,7 @@ type
{ IContratosCliente } { IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable) IContratosCliente = interface(IDAStronglyTypedDataTable)
['{4960869A-BFBB-4CC7-85E1-86B6918D188F}'] ['{56584CDC-67FF-4EE9-AED7-AA788EA382DA}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -763,6 +765,10 @@ type
procedure SetREFERENCIA_CLIENTEValue(const aValue: String); procedure SetREFERENCIA_CLIENTEValue(const aValue: String);
function GetREFERENCIA_CLIENTEIsNull: Boolean; function GetREFERENCIA_CLIENTEIsNull: Boolean;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
function GetFACTURA_ASOCIADAValue: String;
procedure SetFACTURA_ASOCIADAValue(const aValue: String);
function GetFACTURA_ASOCIADAIsNull: Boolean;
procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean);
{ Properties } { Properties }
@ -858,6 +864,8 @@ type
property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull; property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull;
property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue; property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue;
property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
end; end;
{ TContratosClienteDataTableRules } { TContratosClienteDataTableRules }
@ -1053,6 +1061,10 @@ type
procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual; procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual; function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetFACTURA_ASOCIADAValue: String; virtual;
procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual;
function GetFACTURA_ASOCIADAIsNull: Boolean; virtual;
procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
@ -1147,6 +1159,8 @@ type
property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull; property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull;
property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue; property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue;
property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
public public
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
@ -1159,7 +1173,7 @@ type
} }
{ ITiposCapitulos } { ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable) ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{BEF6D716-8772-4793-8AA9-E7C4C6426AFC}'] ['{2376F69B-6893-4066-83C8-C5302031CB4C}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1254,7 +1268,7 @@ type
{ IContratosCliente_Detalles } { IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{3EBE8691-1080-4B52-A2FC-67A44C2ACC76}'] ['{0A8E4C29-8121-4FFF-BFCE-BCA46AB5F97E}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2971,6 +2985,27 @@ begin
DataTable.Fields[idx_ContratosClienteREFERENCIA_CLIENTE].AsVariant := Null; DataTable.Fields[idx_ContratosClienteREFERENCIA_CLIENTE].AsVariant := Null;
end; end;
function TContratosClienteDataTableRules.GetFACTURA_ASOCIADAValue: String;
begin
result := DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsString;
end;
procedure TContratosClienteDataTableRules.SetFACTURA_ASOCIADAValue(const aValue: String);
begin
DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsString := aValue;
end;
function TContratosClienteDataTableRules.GetFACTURA_ASOCIADAIsNull: boolean;
begin
result := DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].IsNull;
end;
procedure TContratosClienteDataTableRules.SetFACTURA_ASOCIADAIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsVariant := Null;
end;
{ TTiposCapitulosDataTableRules } { TTiposCapitulosDataTableRules }
constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable); constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable);

71
Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas
View File

@ -9,18 +9,18 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ValoresDelta = '{C34332AC-76CB-4E0E-8515-D9BBDFF2E1BF}'; RID_ValoresDelta = '{9149743D-AD7E-4B3D-BD91-811AA69C3A9D}';
RID_PropiedadesDelta = '{C04FC4AE-3189-44DA-9D7D-4F61DCE51BA1}'; RID_PropiedadesDelta = '{BB4061A1-FBEA-4E8E-AF30-85D4DCAE4AB6}';
RID_ListaAnosContratosDelta = '{2C0E2A20-BA28-41BE-92AD-EE946662BCE6}'; RID_ListaAnosContratosDelta = '{35EDD3EF-F51E-4465-B7F8-17C52EE11522}';
RID_ContratosClienteBeneficiosDelta = '{686A9966-2BF0-4D3B-A11D-77E9DEED5396}'; RID_ContratosClienteBeneficiosDelta = '{B057495F-3D21-47BA-B9A5-85BA36CDA2B0}';
RID_ContratosClienteDelta = '{A741E047-68D3-42B4-9C3D-F4B84A2FD5A8}'; RID_ContratosClienteDelta = '{402BB40F-3E53-4941-A42D-3AFE9B181157}';
RID_TiposCapitulosDelta = '{4C4B88B8-967F-457E-BB65-9B3406F31242}'; RID_TiposCapitulosDelta = '{C3893479-3E86-4DFE-82F7-067CC2E61FB5}';
RID_ContratosCliente_DetallesDelta = '{336EDADB-89CC-4ABD-9861-C3441FA348C5}'; RID_ContratosCliente_DetallesDelta = '{A169B5F1-0496-4515-98E8-A9BA0449FF62}';
type type
{ IValoresDelta } { IValoresDelta }
IValoresDelta = interface(IValores) IValoresDelta = interface(IValores)
['{C34332AC-76CB-4E0E-8515-D9BBDFF2E1BF}'] ['{9149743D-AD7E-4B3D-BD91-811AA69C3A9D}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer; function GetOldID_PROPIEDADValue : Integer;
@ -78,7 +78,7 @@ type
{ IPropiedadesDelta } { IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades) IPropiedadesDelta = interface(IPropiedades)
['{C04FC4AE-3189-44DA-9D7D-4F61DCE51BA1}'] ['{BB4061A1-FBEA-4E8E-AF30-85D4DCAE4AB6}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String; function GetOldDESCRIPCIONValue : String;
@ -136,7 +136,7 @@ type
{ IListaAnosContratosDelta } { IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos) IListaAnosContratosDelta = interface(IListaAnosContratos)
['{2C0E2A20-BA28-41BE-92AD-EE946662BCE6}'] ['{35EDD3EF-F51E-4465-B7F8-17C52EE11522}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -170,7 +170,7 @@ type
{ IContratosClienteBeneficiosDelta } { IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{686A9966-2BF0-4D3B-A11D-77E9DEED5396}'] ['{B057495F-3D21-47BA-B9A5-85BA36CDA2B0}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String; function GetOldREFERENCIAValue : String;
@ -360,7 +360,7 @@ type
{ IContratosClienteDelta } { IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente) IContratosClienteDelta = interface(IContratosCliente)
['{A741E047-68D3-42B4-9C3D-F4B84A2FD5A8}'] ['{402BB40F-3E53-4941-A42D-3AFE9B181157}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -408,6 +408,7 @@ type
function GetOldPERSONA_CONTACTOValue : String; function GetOldPERSONA_CONTACTOValue : String;
function GetOldTIPO_CONTRATOValue : String; function GetOldTIPO_CONTRATOValue : String;
function GetOldREFERENCIA_CLIENTEValue : String; function GetOldREFERENCIA_CLIENTEValue : String;
function GetOldFACTURA_ASOCIADAValue : String;
{ Properties } { Properties }
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
@ -456,6 +457,7 @@ type
property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue; property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue;
property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue; property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue;
property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue; property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue;
end; end;
{ TContratosClienteBusinessProcessorRules } { TContratosClienteBusinessProcessorRules }
@ -743,6 +745,12 @@ type
function GetOldREFERENCIA_CLIENTEIsNull: Boolean; virtual; function GetOldREFERENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual; procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetFACTURA_ASOCIADAValue: String; virtual;
function GetFACTURA_ASOCIADAIsNull: Boolean; virtual;
function GetOldFACTURA_ASOCIADAValue: String; virtual;
function GetOldFACTURA_ASOCIADAIsNull: Boolean; virtual;
procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual;
procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID : Integer read GetIDValue write SetIDValue; property ID : Integer read GetIDValue write SetIDValue;
@ -929,6 +937,10 @@ type
property REFERENCIA_CLIENTEIsNull : Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property REFERENCIA_CLIENTEIsNull : Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue; property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
property OldREFERENCIA_CLIENTEIsNull : Boolean read GetOldREFERENCIA_CLIENTEIsNull; property OldREFERENCIA_CLIENTEIsNull : Boolean read GetOldREFERENCIA_CLIENTEIsNull;
property FACTURA_ASOCIADA : String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue;
property FACTURA_ASOCIADAIsNull : Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue;
property OldFACTURA_ASOCIADAIsNull : Boolean read GetOldFACTURA_ASOCIADAIsNull;
public public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override; constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -938,7 +950,7 @@ type
{ ITiposCapitulosDelta } { ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos) ITiposCapitulosDelta = interface(ITiposCapitulos)
['{4C4B88B8-967F-457E-BB65-9B3406F31242}'] ['{C3893479-3E86-4DFE-82F7-067CC2E61FB5}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer; function GetOldPOSICIONValue : Integer;
@ -1032,7 +1044,7 @@ type
{ IContratosCliente_DetallesDelta } { IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{336EDADB-89CC-4ABD-9861-C3441FA348C5}'] ['{A169B5F1-0496-4515-98E8-A9BA0449FF62}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer; function GetOldID_CONTRATOValue : Integer;
@ -3423,6 +3435,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteREFERENCIA_CLIENTE] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteREFERENCIA_CLIENTE] := Null;
end; end;
function TContratosClienteBusinessProcessorRules.GetFACTURA_ASOCIADAValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA];
end;
function TContratosClienteBusinessProcessorRules.GetFACTURA_ASOCIADAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA]);
end;
function TContratosClienteBusinessProcessorRules.GetOldFACTURA_ASOCIADAValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFACTURA_ASOCIADA];
end;
function TContratosClienteBusinessProcessorRules.GetOldFACTURA_ASOCIADAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFACTURA_ASOCIADA]);
end;
procedure TContratosClienteBusinessProcessorRules.SetFACTURA_ASOCIADAValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := aValue;
end;
procedure TContratosClienteBusinessProcessorRules.SetFACTURA_ASOCIADAIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := Null;
end;
{ TTiposCapitulosBusinessProcessorRules } { TTiposCapitulosBusinessProcessorRules }
constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

9
Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm
View File

@ -455,6 +455,10 @@ object srvContratosCliente: TsrvContratosCliente
item item
DatasetField = 'REFERENCIA_CLIENTE' DatasetField = 'REFERENCIA_CLIENTE'
TableField = 'REFERENCIA_CLIENTE' TableField = 'REFERENCIA_CLIENTE'
end
item
DatasetField = 'FACTURA_ASOCIADA'
TableField = 'FACTURA_ASOCIADA'
end> end>
end> end>
Name = 'ContratosCliente' Name = 'ContratosCliente'
@ -712,6 +716,11 @@ object srvContratosCliente: TsrvContratosCliente
Name = 'REFERENCIA_CLIENTE' Name = 'REFERENCIA_CLIENTE'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FACTURA_ASOCIADA'
DataType = datString
Size = 255
end> end>
end end
item item

16
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm
View File

@ -111,6 +111,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
HeaderAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify
Width = 63 Width = 63
end end
object cxGridViewFACTURA_ASOCIADA: TcxGridDBColumn
Caption = 'Factura/s asociada/s'
DataBinding.FieldName = 'FACTURA_ASOCIADA'
end
end end
inherited cxGridLevel: TcxGridLevel inherited cxGridLevel: TcxGridLevel
Caption = 'Todos' Caption = 'Todos'
@ -471,17 +475,17 @@ inherited frViewContratosCliente: TfrViewContratosCliente
inherited cxStyleRepository1: TcxStyleRepository inherited cxStyleRepository1: TcxStyleRepository
Left = 216 Left = 216
Top = 160 Top = 160
object cxStylePENDIENTES: TcxStyle object cxStylePENDIENTESConFacturas: TcxStyle
AssignedValues = [svTextColor] AssignedValues = [svTextColor]
TextColor = clWindowText TextColor = clWindowText
end end
object cxStyleACEPTADO: TcxStyle object cxStyleTERMINADO: TcxStyle
AssignedValues = [svTextColor]
TextColor = clGreen
end
object cxStyleRECHAZADO: TcxStyle
AssignedValues = [svTextColor] AssignedValues = [svTextColor]
TextColor = clGrayText TextColor = clGrayText
end end
object cxStylePENDIENTESSinFacturas: TcxStyle
AssignedValues = [svTextColor]
TextColor = clRed
end
end end
end end

20
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas
View File

@ -31,16 +31,17 @@ type
cxGridViewIMPORTE_TOTAL: TcxGridDBColumn; cxGridViewIMPORTE_TOTAL: TcxGridDBColumn;
cxGridLevelPendientes: TcxGridLevel; cxGridLevelPendientes: TcxGridLevel;
cxGridLevelTerminados: TcxGridLevel; cxGridLevelTerminados: TcxGridLevel;
cxStylePENDIENTES: TcxStyle; cxStylePENDIENTESConFacturas: TcxStyle;
cxStyleACEPTADO: TcxStyle;
actCliente: TAction; actCliente: TAction;
TBXSeparatorItem2: TTBXSeparatorItem; TBXSeparatorItem2: TTBXSeparatorItem;
TBXItem3: TTBXItem; TBXItem3: TTBXItem;
cxGridViewNIF_CIF: TcxGridDBColumn; cxGridViewNIF_CIF: TcxGridDBColumn;
cxGridViewINCIDENCIAS: TcxGridDBColumn; cxGridViewINCIDENCIAS: TcxGridDBColumn;
cxStyleRECHAZADO: TcxStyle; cxStyleTERMINADO: TcxStyle;
cxGridViewTIPO_CONTRATO: TcxGridDBColumn; cxGridViewTIPO_CONTRATO: TcxGridDBColumn;
cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn; cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn;
cxGridViewFACTURA_ASOCIADA: TcxGridDBColumn;
cxStylePENDIENTESSinFacturas: TcxStyle;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel); TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@ -209,17 +210,26 @@ procedure TfrViewContratosCliente.cxGridViewStylesGetContentStyle(Sender:
TcxCustomGridTableItem; out AStyle: TcxStyle); TcxCustomGridTableItem; out AStyle: TcxStyle);
var var
IndiceCol: Integer; IndiceCol: Integer;
IndiceCol2: Integer;
ASituacion: string; ASituacion: string;
AFacturas: string;
begin begin
inherited; inherited;
if Assigned(ARecord) then if Assigned(ARecord) then
begin begin
IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_ContratosClienteSITUACION).Index; IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_ContratosClienteSITUACION).Index;
IndiceCol2 := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_ContratosClienteFACTURA_ASOCIADA).Index;
ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]);
AFacturas := VarToStr(ARecord.DisplayTexts[IndiceCol2]);
if ASituacion = SITUACION_CONTRATO_PENDIENTE then if ASituacion = SITUACION_CONTRATO_PENDIENTE then
AStyle.TextColor := cxStylePENDIENTES.TextColor begin
if (AFacturas = '') then
AStyle.TextColor := cxStylePENDIENTESSinFacturas.TextColor
else
AStyle.TextColor := cxStylePENDIENTESConFacturas.TextColor;
end
else if ASituacion = SITUACION_CONTRATO_TERMINADO then else if ASituacion = SITUACION_CONTRATO_TERMINADO then
AStyle.TextColor := cxStyleRECHAZADO.TextColor AStyle.TextColor := cxStyleTERMINADO.TextColor
end; end;
end; end;

8
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
View File

@ -209,14 +209,22 @@ procedure TFacturasClienteController.ActualizarFormaDePago(
var var
AFormasPago : IBizFormaPago; AFormasPago : IBizFormaPago;
AFormasPagoController : IFormasPagoController; AFormasPagoController : IFormasPagoController;
bEnEdicion : Boolean;
begin begin
AFormasPagoController := TFormasPagoController.Create; AFormasPagoController := TFormasPagoController.Create;
AFormasPago := AFormasPagoController.Buscar(ID_FORMA_PAGO); AFormasPago := AFormasPagoController.Buscar(ID_FORMA_PAGO);
AFormasPago.Open; AFormasPago.Open;
bEnEdicion := (AFactura.DataTable.State in dsEditModes);
if not bEnEdicion then
AFactura.Edit;
AFactura.ID_FORMA_PAGO := AFormasPago.ID; AFactura.ID_FORMA_PAGO := AFormasPago.ID;
// AFactura.DataTable.FieldByName(fld_FacturasClienteFORMA_PAGO).AsString := AFormasPago.DESCRIPCION; // AFactura.DataTable.FieldByName(fld_FacturasClienteFORMA_PAGO).AsString := AFormasPago.DESCRIPCION;
if not bEnEdicion then
AFactura.Post;
AFormasPago := NIL; AFormasPago := NIL;
AFormasPagoController := NIL; AFormasPagoController := NIL;
end; end;

2
Source/Modulos/Formas de pago/Controller/uFormasPagoController.pas
View File

@ -143,7 +143,7 @@ begin
AFormasPago.DataTable.First; AFormasPago.DataTable.First;
while not AFormasPago.DataTable.EOF do while not AFormasPago.DataTable.EOF do
begin begin
Add(AFormasPago.DESCRIPCION); Add(AFormasPago.REFERENCIA);
AFormasPago.DataTable.Next; AFormasPago.DataTable.Next;
end; end;
end; end;

8
Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas
View File

@ -210,14 +210,22 @@ procedure TPresupuestosClienteController.ActualizarFormaDePago(APresupuesto: IBi
var var
AFormasPago : IBizFormaPago; AFormasPago : IBizFormaPago;
AFormasPagoController : IFormasPagoController; AFormasPagoController : IFormasPagoController;
bEnEdicion : Boolean;
begin begin
AFormasPagoController := TFormasPagoController.Create; AFormasPagoController := TFormasPagoController.Create;
AFormasPago := AFormasPagoController.Buscar(ID_FORMA_PAGO); AFormasPago := AFormasPagoController.Buscar(ID_FORMA_PAGO);
AFormasPago.Open; AFormasPago.Open;
bEnEdicion := (APresupuesto.DataTable.State in dsEditModes);
if not bEnEdicion then
APresupuesto.Edit;
APresupuesto.ID_FORMA_PAGO := AFormasPago.ID; APresupuesto.ID_FORMA_PAGO := AFormasPago.ID;
APresupuesto.DataTable.FieldByName(fld_PresupuestosClienteFORMA_PAGO).AsString := AFormasPago.DESCRIPCION; APresupuesto.DataTable.FieldByName(fld_PresupuestosClienteFORMA_PAGO).AsString := AFormasPago.DESCRIPCION;
if not bEnEdicion then
APresupuesto.Post;
AFormasPago := NIL; AFormasPago := NIL;
AFormasPagoController := NIL; AFormasPagoController := NIL;
end; end;

13
Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
View File

@ -66,14 +66,14 @@ begin
AFactura.DESCUENTO := AContrato.DESCUENTO; AFactura.DESCUENTO := AContrato.DESCUENTO;
AFactura.IMPORTE_DESCUENTO := AContrato.IMPORTE_DESCUENTO; AFactura.IMPORTE_DESCUENTO := AContrato.IMPORTE_DESCUENTO;
AFactura.BASE_IMPONIBLE := AContrato.BASE_IMPONIBLE; AFactura.BASE_IMPONIBLE := AContrato.BASE_IMPONIBLE;
// AFactura.ID_TIPO_IVA := AContrato.ID_TIPO_IVA; AFactura.ID_TIPO_IVA := AContrato.ID_TIPO_IVA;
// AFactura.IVA := AContrato.IVA; AFactura.IVA := AContrato.IVA;
// AFactura.IMPORTE_IVA := AContrato.IMPORTE_IVA; AFactura.IMPORTE_IVA := AContrato.IMPORTE_IVA;
AFactura.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL; AFactura.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL;
// AFactura.ID_VENDEDOR := AContrato.ID_VENDEDOR; // AFactura.ID_VENDEDOR := AContrato.ID_VENDEDOR;
// AFactura.RECARGO_EQUIVALENCIA := AContrato.RECARGO_EQUIVALENCIA; AFactura.RECARGO_EQUIVALENCIA := AContrato.RECARGO_EQUIVALENCIA;
// AFactura.RE := AContrato.RE; AFactura.RE := AContrato.RE;
// AFactura.IMPORTE_RE := AContrato.IMPORTE_RE; AFactura.IMPORTE_RE := AContrato.IMPORTE_RE;
AFactura.ID_CONTRATO := AContrato.ID; AFactura.ID_CONTRATO := AContrato.ID;
AFactura.ID_FORMA_PAGO := AContrato.ID_FORMA_PAGO; AFactura.ID_FORMA_PAGO := AContrato.ID_FORMA_PAGO;
end; end;
@ -201,7 +201,6 @@ begin
AFactura.TIENDA := AppFactuGES.TiendaActiva.NOMBRE; AFactura.TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
CopiarContratoAFactura(AContrato, AFactura); CopiarContratoAFactura(AContrato, AFactura);
AFactura.ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; //SIEMPRE SE ASIGNARÄ EL IVA DE LA EMPRESA ACTIVA AFactura.ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; //SIEMPRE SE ASIGNARÄ EL IVA DE LA EMPRESA ACTIVA
CopiarDetallesAFactura(AContrato, AFactura, AContrato.Detalles); CopiarDetallesAFactura(AContrato, AFactura, AContrato.Detalles);
//Sustituir por if de guardar //Sustituir por if de guardar

4
Source/Servidor/FactuGES_Server.dpr
View File

@ -126,8 +126,6 @@ uses
schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
uRptRemesasCliente_Server in '..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas' {RptRemesasCliente: TDataModule}, uRptRemesasCliente_Server in '..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas' {RptRemesasCliente: TDataModule},
uRptRemesasProveedor_Server in '..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas' {RptRemesasProveedor: TDataModule}, uRptRemesasProveedor_Server in '..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas' {RptRemesasProveedor: TDataModule},
schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas', schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas',
@ -140,6 +138,8 @@ uses
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas', schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas',
schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas'; schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas';

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.