diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 5bbd0e52..326b0324 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -51,13 +51,6 @@ - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -74,56 +67,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Modulos/Contabilidad/Data/uDataModuleContabilidad.dfm b/Source/Modulos/Contabilidad/Data/uDataModuleContabilidad.dfm index e1bd253b..001cfd07 100644 --- a/Source/Modulos/Contabilidad/Data/uDataModuleContabilidad.dfm +++ b/Source/Modulos/Contabilidad/Data/uDataModuleContabilidad.dfm @@ -496,6 +496,18 @@ inherited DataModuleContabilidad: TDataModuleContabilidad DataType = datInteger DisplayLabel = 'Asientos_ORDEN' DictionaryEntry = 'Asientos_ORDEN' + end + item + Name = 'ID_FACTURA' + DataType = datInteger + DisplayLabel = 'Asientos_ID_FACTURA' + DictionaryEntry = 'Asientos_ID_FACTURA' + end + item + Name = 'ID_RECIBO' + DataType = datInteger + DisplayLabel = 'Asientos_ID_RECIBO' + DictionaryEntry = 'Asientos_ID_RECIBO' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contabilidad/Model/schContabilidadClient_Intf.pas b/Source/Modulos/Contabilidad/Model/schContabilidadClient_Intf.pas index 7217fbe1..3b2d0a18 100644 --- a/Source/Modulos/Contabilidad/Model/schContabilidadClient_Intf.pas +++ b/Source/Modulos/Contabilidad/Model/schContabilidadClient_Intf.pas @@ -3,20 +3,20 @@ unit schContabilidadClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Diario = '{66712740-10D2-4473-B0A9-EFFD4AC0B07B}'; - RID_Apuntes = '{0A3E0101-E3E5-4E82-8AD0-D469CD1486C5}'; - RID_Asientos = '{1D02E039-AD52-4983-9209-380097067356}'; - RID_SubCuentas = '{18A3B588-2C4C-404F-8D40-FF8E09A4F16A}'; - RID_Cuentas = '{1DF0C5B8-1A7A-4077-A69B-81B3A1938CCC}'; - RID_CuentasEspeciales = '{09EE5C02-8563-4873-835A-9D6485039ACA}'; - RID_Epigrafes = '{FC10535F-25FE-407E-9168-7D78FB9427A5}'; - RID_Balances = '{7897556D-5310-4EA5-AA9C-1D4E88729372}'; + RID_Diario = '{D82D3AB7-DF24-495E-8364-FE35C84A5B98}'; + RID_Apuntes = '{DB1540B8-60CF-41C1-9583-9DB8B436C90C}'; + RID_Asientos = '{25DD3D96-A3B1-4D2E-906D-5426063FC28B}'; + RID_SubCuentas = '{84DF18AF-8F7D-4059-A27D-498675555921}'; + RID_Cuentas = '{B4E99ED2-DEB9-4329-BAEB-7D68DEABB3BF}'; + RID_CuentasEspeciales = '{EAE10E2C-BA4C-4EBD-A88B-1E7D7315A189}'; + RID_Epigrafes = '{404E197C-5984-49EC-AE04-64D0E212112B}'; + RID_Balances = '{425C6D97-157D-4372-9312-FB797BDEADDF}'; { Data table names } nme_Diario = 'Diario'; @@ -86,11 +86,15 @@ const fld_AsientosID = 'ID'; fld_AsientosFECHA_ASIENTO = 'FECHA_ASIENTO'; fld_AsientosORDEN = 'ORDEN'; + fld_AsientosID_FACTURA = 'ID_FACTURA'; + fld_AsientosID_RECIBO = 'ID_RECIBO'; { Asientos field indexes } idx_AsientosID = 0; idx_AsientosFECHA_ASIENTO = 1; idx_AsientosORDEN = 2; + idx_AsientosID_FACTURA = 3; + idx_AsientosID_RECIBO = 4; { SubCuentas fields } fld_SubCuentasID = 'ID'; @@ -193,7 +197,7 @@ const type { IDiario } IDiario = interface(IDAStronglyTypedDataTable) - ['{31F2AED8-604E-49BA-8323-9F0928E09AEB}'] + ['{44E078C5-01C0-49EA-BC54-7D59EC624B99}'] { Property getters and setters } function GetID_APUNTEValue: Integer; procedure SetID_APUNTEValue(const aValue: Integer); @@ -273,7 +277,7 @@ type end; { TDiarioDataTableRules } - TDiarioDataTableRules = class(TIntfObjectDADataTableRules, IDiario) + TDiarioDataTableRules = class(TDADataTableRules, IDiario) private protected { Property getters and setters } @@ -360,7 +364,7 @@ type { IApuntes } IApuntes = interface(IDAStronglyTypedDataTable) - ['{68BA9EE2-FAAF-4CFD-B30E-C9AA86DA65BF}'] + ['{FA7E84FE-CFF8-43E4-8BCC-658C8AD5ED92}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -434,7 +438,7 @@ type end; { TApuntesDataTableRules } - TApuntesDataTableRules = class(TIntfObjectDADataTableRules, IApuntes) + TApuntesDataTableRules = class(TDADataTableRules, IApuntes) private protected { Property getters and setters } @@ -515,7 +519,7 @@ type { IAsientos } IAsientos = interface(IDAStronglyTypedDataTable) - ['{E85CCB4A-1856-4479-9B50-1C9D82F466A4}'] + ['{4EDC82EE-6AB5-419D-8A46-4EA93B9FCE62}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -529,6 +533,14 @@ type procedure SetORDENValue(const aValue: Integer); function GetORDENIsNull: Boolean; procedure SetORDENIsNull(const aValue: Boolean); + function GetID_FACTURAValue: Integer; + procedure SetID_FACTURAValue(const aValue: Integer); + function GetID_FACTURAIsNull: Boolean; + procedure SetID_FACTURAIsNull(const aValue: Boolean); + function GetID_RECIBOValue: Integer; + procedure SetID_RECIBOValue(const aValue: Integer); + function GetID_RECIBOIsNull: Boolean; + procedure SetID_RECIBOIsNull(const aValue: Boolean); { Properties } @@ -538,10 +550,14 @@ type property FECHA_ASIENTOIsNull: Boolean read GetFECHA_ASIENTOIsNull write SetFECHA_ASIENTOIsNull; property ORDEN: Integer read GetORDENValue write SetORDENValue; property ORDENIsNull: Boolean read GetORDENIsNull write SetORDENIsNull; + property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; + property ID_FACTURAIsNull: Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull; + property ID_RECIBO: Integer read GetID_RECIBOValue write SetID_RECIBOValue; + property ID_RECIBOIsNull: Boolean read GetID_RECIBOIsNull write SetID_RECIBOIsNull; end; { TAsientosDataTableRules } - TAsientosDataTableRules = class(TIntfObjectDADataTableRules, IAsientos) + TAsientosDataTableRules = class(TDADataTableRules, IAsientos) private protected { Property getters and setters } @@ -557,6 +573,14 @@ type procedure SetORDENValue(const aValue: Integer); virtual; function GetORDENIsNull: Boolean; virtual; procedure SetORDENIsNull(const aValue: Boolean); virtual; + function GetID_FACTURAValue: Integer; virtual; + procedure SetID_FACTURAValue(const aValue: Integer); virtual; + function GetID_FACTURAIsNull: Boolean; virtual; + procedure SetID_FACTURAIsNull(const aValue: Boolean); virtual; + function GetID_RECIBOValue: Integer; virtual; + procedure SetID_RECIBOValue(const aValue: Integer); virtual; + function GetID_RECIBOIsNull: Boolean; virtual; + procedure SetID_RECIBOIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -565,6 +589,10 @@ type property FECHA_ASIENTOIsNull: Boolean read GetFECHA_ASIENTOIsNull write SetFECHA_ASIENTOIsNull; property ORDEN: Integer read GetORDENValue write SetORDENValue; property ORDENIsNull: Boolean read GetORDENIsNull write SetORDENIsNull; + property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; + property ID_FACTURAIsNull: Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull; + property ID_RECIBO: Integer read GetID_RECIBOValue write SetID_RECIBOValue; + property ID_RECIBOIsNull: Boolean read GetID_RECIBOIsNull write SetID_RECIBOIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -574,7 +602,7 @@ type { ISubCuentas } ISubCuentas = interface(IDAStronglyTypedDataTable) - ['{3E241AD4-8F16-4FCF-A2EB-B0587C349B69}'] + ['{2DF97A58-3A87-493F-BE0E-3B3A9AD434D1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -648,7 +676,7 @@ type end; { TSubCuentasDataTableRules } - TSubCuentasDataTableRules = class(TIntfObjectDADataTableRules, ISubCuentas) + TSubCuentasDataTableRules = class(TDADataTableRules, ISubCuentas) private protected { Property getters and setters } @@ -729,7 +757,7 @@ type { ICuentas } ICuentas = interface(IDAStronglyTypedDataTable) - ['{2F1AE932-7409-46F6-A20F-BF0F596BD647}'] + ['{224540E1-2427-45A3-8AE8-098EF584CC48}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -797,7 +825,7 @@ type end; { TCuentasDataTableRules } - TCuentasDataTableRules = class(TIntfObjectDADataTableRules, ICuentas) + TCuentasDataTableRules = class(TDADataTableRules, ICuentas) private protected { Property getters and setters } @@ -872,7 +900,7 @@ type { ICuentasEspeciales } ICuentasEspeciales = interface(IDAStronglyTypedDataTable) - ['{CD95E7CE-E25A-4EFA-ADBD-34E9DEBE509D}'] + ['{6C618900-0005-4D0E-BCBD-D16CC6943D4D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -898,7 +926,7 @@ type end; { TCuentasEspecialesDataTableRules } - TCuentasEspecialesDataTableRules = class(TIntfObjectDADataTableRules, ICuentasEspeciales) + TCuentasEspecialesDataTableRules = class(TDADataTableRules, ICuentasEspeciales) private protected { Property getters and setters } @@ -931,7 +959,7 @@ type { IEpigrafes } IEpigrafes = interface(IDAStronglyTypedDataTable) - ['{537496C2-B8D8-4810-9052-7A634FF9D518}'] + ['{8D2F3AA1-A5A0-4BD2-AE75-02A77E561AC0}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -975,7 +1003,7 @@ type end; { TEpigrafesDataTableRules } - TEpigrafesDataTableRules = class(TIntfObjectDADataTableRules, IEpigrafes) + TEpigrafesDataTableRules = class(TDADataTableRules, IEpigrafes) private protected { Property getters and setters } @@ -1026,7 +1054,7 @@ type { IBalances } IBalances = interface(IDAStronglyTypedDataTable) - ['{EAA5385C-5E33-4860-AA47-1A750F557669}'] + ['{1710F763-139F-4B4C-9AB8-565C7608CDC5}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1088,7 +1116,7 @@ type end; { TBalancesDataTableRules } - TBalancesDataTableRules = class(TIntfObjectDADataTableRules, IBalances) + TBalancesDataTableRules = class(TDADataTableRules, IBalances) private protected { Property getters and setters } @@ -1740,6 +1768,48 @@ begin DataTable.Fields[idx_AsientosORDEN].AsVariant := Null; end; +function TAsientosDataTableRules.GetID_FACTURAValue: Integer; +begin + result := DataTable.Fields[idx_AsientosID_FACTURA].AsInteger; +end; + +procedure TAsientosDataTableRules.SetID_FACTURAValue(const aValue: Integer); +begin + DataTable.Fields[idx_AsientosID_FACTURA].AsInteger := aValue; +end; + +function TAsientosDataTableRules.GetID_FACTURAIsNull: boolean; +begin + result := DataTable.Fields[idx_AsientosID_FACTURA].IsNull; +end; + +procedure TAsientosDataTableRules.SetID_FACTURAIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_AsientosID_FACTURA].AsVariant := Null; +end; + +function TAsientosDataTableRules.GetID_RECIBOValue: Integer; +begin + result := DataTable.Fields[idx_AsientosID_RECIBO].AsInteger; +end; + +procedure TAsientosDataTableRules.SetID_RECIBOValue(const aValue: Integer); +begin + DataTable.Fields[idx_AsientosID_RECIBO].AsInteger := aValue; +end; + +function TAsientosDataTableRules.GetID_RECIBOIsNull: boolean; +begin + result := DataTable.Fields[idx_AsientosID_RECIBO].IsNull; +end; + +procedure TAsientosDataTableRules.SetID_RECIBOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_AsientosID_RECIBO].AsVariant := Null; +end; + { TSubCuentasDataTableRules } constructor TSubCuentasDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contabilidad/Model/schContabilidadServer_Intf.pas b/Source/Modulos/Contabilidad/Model/schContabilidadServer_Intf.pas index bacdf6fa..083c35be 100644 --- a/Source/Modulos/Contabilidad/Model/schContabilidadServer_Intf.pas +++ b/Source/Modulos/Contabilidad/Model/schContabilidadServer_Intf.pas @@ -9,19 +9,19 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DiarioDelta = '{E378FEF4-3D61-494F-8DA1-C1B5D1AEA218}'; - RID_ApuntesDelta = '{A3928C23-C317-44BA-9D86-2246C6A0C67E}'; - RID_AsientosDelta = '{BCC4A7C1-B43B-48DD-882B-1D481E0F7E53}'; - RID_SubCuentasDelta = '{C0A6D73D-4D31-409B-B279-F5746A696C17}'; - RID_CuentasDelta = '{CC8F052F-E8A4-4895-A2D3-BC9197C44621}'; - RID_CuentasEspecialesDelta = '{B6130FAB-FA0F-4CD3-9359-0868A0B185AA}'; - RID_EpigrafesDelta = '{8980017F-915A-44BC-A43E-EB6810173932}'; - RID_BalancesDelta = '{A9862597-2EFE-45B7-8584-03FC75228C0C}'; + RID_DiarioDelta = '{A2BD28BD-6104-4050-A980-42D308B729CC}'; + RID_ApuntesDelta = '{77CF8AFF-894E-4CCC-B12B-694EB64A63B5}'; + RID_AsientosDelta = '{FBC0DED1-4573-4276-A430-60AD20D7CA81}'; + RID_SubCuentasDelta = '{E8522236-BC04-4A7A-8268-C4BB4CF8C186}'; + RID_CuentasDelta = '{02901439-401B-4A39-BC7F-9AA5D0AA3BB1}'; + RID_CuentasEspecialesDelta = '{60CA3AD9-10E2-4A89-B84E-413E469CA851}'; + RID_EpigrafesDelta = '{32161D74-2F7A-4BD5-8B4B-C2D8BB0B8B4B}'; + RID_BalancesDelta = '{430B2E47-5249-4A6F-9FE2-5307953BEB95}'; type { IDiarioDelta } IDiarioDelta = interface(IDiario) - ['{E378FEF4-3D61-494F-8DA1-C1B5D1AEA218}'] + ['{A2BD28BD-6104-4050-A980-42D308B729CC}'] { Property getters and setters } function GetOldID_APUNTEValue : Integer; function GetOldID_ASIENTOValue : Integer; @@ -187,7 +187,7 @@ type { IApuntesDelta } IApuntesDelta = interface(IApuntes) - ['{A3928C23-C317-44BA-9D86-2246C6A0C67E}'] + ['{77CF8AFF-894E-4CCC-B12B-694EB64A63B5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ASIENTOValue : Integer; @@ -341,16 +341,20 @@ type { IAsientosDelta } IAsientosDelta = interface(IAsientos) - ['{BCC4A7C1-B43B-48DD-882B-1D481E0F7E53}'] + ['{FBC0DED1-4573-4276-A430-60AD20D7CA81}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldFECHA_ASIENTOValue : DateTime; function GetOldORDENValue : Integer; + function GetOldID_FACTURAValue : Integer; + function GetOldID_RECIBOValue : Integer; { Properties } property OldID : Integer read GetOldIDValue; property OldFECHA_ASIENTO : DateTime read GetOldFECHA_ASIENTOValue; property OldORDEN : Integer read GetOldORDENValue; + property OldID_FACTURA : Integer read GetOldID_FACTURAValue; + property OldID_RECIBO : Integer read GetOldID_RECIBOValue; end; { TAsientosBusinessProcessorRules } @@ -376,6 +380,18 @@ type function GetOldORDENIsNull: Boolean; virtual; procedure SetORDENValue(const aValue: Integer); virtual; procedure SetORDENIsNull(const aValue: Boolean); virtual; + function GetID_FACTURAValue: Integer; virtual; + function GetID_FACTURAIsNull: Boolean; virtual; + function GetOldID_FACTURAValue: Integer; virtual; + function GetOldID_FACTURAIsNull: Boolean; virtual; + procedure SetID_FACTURAValue(const aValue: Integer); virtual; + procedure SetID_FACTURAIsNull(const aValue: Boolean); virtual; + function GetID_RECIBOValue: Integer; virtual; + function GetID_RECIBOIsNull: Boolean; virtual; + function GetOldID_RECIBOValue: Integer; virtual; + function GetOldID_RECIBOIsNull: Boolean; virtual; + procedure SetID_RECIBOValue(const aValue: Integer); virtual; + procedure SetID_RECIBOIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -390,6 +406,14 @@ type property ORDENIsNull : Boolean read GetORDENIsNull write SetORDENIsNull; property OldORDEN : Integer read GetOldORDENValue; property OldORDENIsNull : Boolean read GetOldORDENIsNull; + property ID_FACTURA : Integer read GetID_FACTURAValue write SetID_FACTURAValue; + property ID_FACTURAIsNull : Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull; + property OldID_FACTURA : Integer read GetOldID_FACTURAValue; + property OldID_FACTURAIsNull : Boolean read GetOldID_FACTURAIsNull; + property ID_RECIBO : Integer read GetID_RECIBOValue write SetID_RECIBOValue; + property ID_RECIBOIsNull : Boolean read GetID_RECIBOIsNull write SetID_RECIBOIsNull; + property OldID_RECIBO : Integer read GetOldID_RECIBOValue; + property OldID_RECIBOIsNull : Boolean read GetOldID_RECIBOIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -399,7 +423,7 @@ type { ISubCuentasDelta } ISubCuentasDelta = interface(ISubCuentas) - ['{C0A6D73D-4D31-409B-B279-F5746A696C17}'] + ['{E8522236-BC04-4A7A-8268-C4BB4CF8C186}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_SUBCUENTAValue : String; @@ -553,7 +577,7 @@ type { ICuentasDelta } ICuentasDelta = interface(ICuentas) - ['{CC8F052F-E8A4-4895-A2D3-BC9197C44621}'] + ['{02901439-401B-4A39-BC7F-9AA5D0AA3BB1}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_CUENTAValue : String; @@ -695,7 +719,7 @@ type { ICuentasEspecialesDelta } ICuentasEspecialesDelta = interface(ICuentasEspeciales) - ['{B6130FAB-FA0F-4CD3-9359-0868A0B185AA}'] + ['{60CA3AD9-10E2-4A89-B84E-413E469CA851}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREFERENCIAValue : String; @@ -753,7 +777,7 @@ type { IEpigrafesDelta } IEpigrafesDelta = interface(IEpigrafes) - ['{8980017F-915A-44BC-A43E-EB6810173932}'] + ['{32161D74-2F7A-4BD5-8B4B-C2D8BB0B8B4B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_EPIGRAFEValue : String; @@ -847,7 +871,7 @@ type { IBalancesDelta } IBalancesDelta = interface(IBalances) - ['{A9862597-2EFE-45B7-8584-03FC75228C0C}'] + ['{430B2E47-5249-4A6F-9FE2-5307953BEB95}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_BALANCEValue : String; @@ -1821,6 +1845,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosORDEN] := Null; end; +function TAsientosBusinessProcessorRules.GetID_FACTURAValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_FACTURA]; +end; + +function TAsientosBusinessProcessorRules.GetID_FACTURAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_FACTURA]); +end; + +function TAsientosBusinessProcessorRules.GetOldID_FACTURAValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AsientosID_FACTURA]; +end; + +function TAsientosBusinessProcessorRules.GetOldID_FACTURAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_AsientosID_FACTURA]); +end; + +procedure TAsientosBusinessProcessorRules.SetID_FACTURAValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_FACTURA] := aValue; +end; + +procedure TAsientosBusinessProcessorRules.SetID_FACTURAIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_FACTURA] := Null; +end; + +function TAsientosBusinessProcessorRules.GetID_RECIBOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_RECIBO]; +end; + +function TAsientosBusinessProcessorRules.GetID_RECIBOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_RECIBO]); +end; + +function TAsientosBusinessProcessorRules.GetOldID_RECIBOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AsientosID_RECIBO]; +end; + +function TAsientosBusinessProcessorRules.GetOldID_RECIBOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_AsientosID_RECIBO]); +end; + +procedure TAsientosBusinessProcessorRules.SetID_RECIBOValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_RECIBO] := aValue; +end; + +procedure TAsientosBusinessProcessorRules.SetID_RECIBOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_AsientosID_RECIBO] := Null; +end; + { TSubCuentasBusinessProcessorRules } constructor TSubCuentasBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm index f90b0b89..97f9aa4d 100644 --- a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm +++ b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm @@ -321,6 +321,14 @@ object srvContabilidad: TsrvContabilidad item Name = 'Cuentas_ID_EMPRESA' DataType = datInteger + end + item + Name = 'Asientos_ID_FACTURA' + DataType = datInteger + end + item + Name = 'Asientos_ID_RECIBO' + DataType = datInteger end> Left = 150 Top = 24 @@ -596,6 +604,14 @@ object srvContabilidad: TsrvContabilidad item DatasetField = 'ORDEN' TableField = 'ORDEN' + end + item + DatasetField = 'ID_FACTURA' + TableField = 'ID_FACTURA' + end + item + DatasetField = 'ID_RECIBO' + TableField = 'ID_RECIBO' end> end> Name = 'Asientos' @@ -616,6 +632,16 @@ object srvContabilidad: TsrvContabilidad Name = 'ORDEN' DataType = datInteger DictionaryEntry = 'Asientos_ORDEN' + end + item + Name = 'ID_FACTURA' + DataType = datInteger + DictionaryEntry = 'Asientos_ID_FACTURA' + end + item + Name = 'ID_RECIBO' + DataType = datInteger + DictionaryEntry = 'Asientos_ID_RECIBO' end> end item diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm index 5501f1b1..17da469f 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm @@ -64,6 +64,9 @@ inherited frViewDiario: TfrViewDiario DataBinding.FieldName = 'HABER' PropertiesClassName = 'TcxCurrencyEditProperties' end + object cxGridViewID_FACTURA: TcxGridDBColumn + DataBinding.FieldName = 'ID_FACTURA' + end end end inherited frViewFiltroBase1: TfrViewFiltroBase @@ -84,6 +87,9 @@ inherited frViewDiario: TfrViewDiario end end end + inherited pnlAgrupaciones: TTBXDockablePanel + ExplicitWidth = 554 + end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.842406053240000000 diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.pas b/Source/Modulos/Contabilidad/Views/uViewDiario.pas index 6963f0e2..db4e0abf 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.pas +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.pas @@ -35,6 +35,7 @@ type cxGridViewFECHA_ASIENTO: TcxGridDBColumn; cxGridViewORDEN: TcxGridDBColumn; cxGridViewID_APUNTE: TcxGridDBColumn; + cxGridViewID_FACTURA: TcxGridDBColumn; procedure cxGridViewID_AsientoCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); protected diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm index 1338c902..2316aba0 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm @@ -69,7 +69,7 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente Name = 'SITUACION' DataType = datString Size = 255 - DisplayLabel = 'Situaci'#195#179'n' + DisplayLabel = 'Situaci'#243'n' DictionaryEntry = 'FacturasCliente_SITUACION' end item @@ -155,14 +155,14 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente Name = 'CALLE' DataType = datString Size = 150 - DisplayLabel = 'Direcci'#195#179'n' + DisplayLabel = 'Direcci'#243'n' DictionaryEntry = 'FacturasCliente_CALLE' end item Name = 'POBLACION' DataType = datString Size = 150 - DisplayLabel = 'Poblaci'#195#179'n' + DisplayLabel = 'Poblaci'#243'n' DictionaryEntry = 'FacturasCliente_POBLACION' end item @@ -176,7 +176,7 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente Name = 'CODIGO_POSTAL' DataType = datString Size = 10 - DisplayLabel = 'C'#195#179'd. postal' + DisplayLabel = 'C'#243'd. postal' DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL' end item @@ -204,7 +204,7 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente item Name = 'RECARGO_EQUIVALENCIA' DataType = datSmallInt - DisplayLabel = #194#191'Con R.E.?' + DisplayLabel = #191'Con R.E.?' DictionaryEntry = 'FacturasCliente_RECARGO_EQUIVALENCIA' end item @@ -236,6 +236,12 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente DataType = datString Size = 255 DictionaryEntry = 'FacturasCliente_REFERENCIA_COMISION' + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt + DisplayLabel = 'FacturasCliente_IGNORAR_CONTABILIDAD' + DictionaryEntry = 'FacturasCliente_IGNORAR_CONTABILIDAD' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas index 2d65ae18..bb6a5ca9 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas @@ -3,15 +3,15 @@ unit schFacturasClienteClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarReferencia = '{CC46C1A7-C6CE-4ABE-B1A8-4C2BABFB5C93}'; - RID_FacturasCliente = '{51E6C07A-D580-46D7-9032-1838AF4D4B07}'; - RID_FacturasCliente_Detalles = '{8A70D0F2-F09E-4166-A792-00012AA7C35A}'; + RID_DarReferencia = '{BFD0BE4F-A013-4368-AAB1-D78832815453}'; + RID_FacturasCliente = '{F251FC90-F8DB-4542-BB27-1D9D1C38B5C2}'; + RID_FacturasCliente_Detalles = '{21F1B1B1-A23D-4DE8-A7A9-91B042AA33C4}'; { Data table names } nme_DarReferencia = 'DarReferencia'; @@ -58,6 +58,7 @@ const fld_FacturasClienteIMPORTE_PORTE = 'IMPORTE_PORTE'; fld_FacturasClienteID_AGENTE = 'ID_AGENTE'; fld_FacturasClienteREFERENCIA_COMISION = 'REFERENCIA_COMISION'; + fld_FacturasClienteIGNORAR_CONTABILIDAD = 'IGNORAR_CONTABILIDAD'; { FacturasCliente field indexes } idx_FacturasClienteID = 0; @@ -93,6 +94,7 @@ const idx_FacturasClienteIMPORTE_PORTE = 30; idx_FacturasClienteID_AGENTE = 31; idx_FacturasClienteREFERENCIA_COMISION = 32; + idx_FacturasClienteIGNORAR_CONTABILIDAD = 33; { FacturasCliente_Detalles fields } fld_FacturasCliente_DetallesID = 'ID'; @@ -129,7 +131,7 @@ const type { IDarReferencia } IDarReferencia = interface(IDAStronglyTypedDataTable) - ['{3338E715-B18C-4550-BE4C-C92B071770B4}'] + ['{2F985A85-CE21-459E-9476-83CB04A2F9AC}'] { Property getters and setters } function GetVALORValue: String; procedure SetVALORValue(const aValue: String); @@ -143,7 +145,7 @@ type end; { TDarReferenciaDataTableRules } - TDarReferenciaDataTableRules = class(TIntfObjectDADataTableRules, IDarReferencia) + TDarReferenciaDataTableRules = class(TDADataTableRules, IDarReferencia) private protected { Property getters and setters } @@ -164,7 +166,7 @@ type { IFacturasCliente } IFacturasCliente = interface(IDAStronglyTypedDataTable) - ['{0ACBE344-A040-4AD4-8037-DA9382B4D9CF}'] + ['{153F474D-B1D3-4EC7-A4AE-B83884F61A16}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -297,6 +299,10 @@ type procedure SetREFERENCIA_COMISIONValue(const aValue: String); function GetREFERENCIA_COMISIONIsNull: Boolean; procedure SetREFERENCIA_COMISIONIsNull(const aValue: Boolean); + function GetIGNORAR_CONTABILIDADValue: SmallInt; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); + function GetIGNORAR_CONTABILIDADIsNull: Boolean; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); { Properties } @@ -366,10 +372,12 @@ type property ID_AGENTEIsNull: Boolean read GetID_AGENTEIsNull write SetID_AGENTEIsNull; property REFERENCIA_COMISION: String read GetREFERENCIA_COMISIONValue write SetREFERENCIA_COMISIONValue; property REFERENCIA_COMISIONIsNull: Boolean read GetREFERENCIA_COMISIONIsNull write SetREFERENCIA_COMISIONIsNull; + property IGNORAR_CONTABILIDAD: SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull: Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; end; { TFacturasClienteDataTableRules } - TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente) + TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente) private f_OBSERVACIONES: IROStrings; procedure OBSERVACIONES_OnChange(Sender: TObject); @@ -506,6 +514,10 @@ type procedure SetREFERENCIA_COMISIONValue(const aValue: String); virtual; function GetREFERENCIA_COMISIONIsNull: Boolean; virtual; procedure SetREFERENCIA_COMISIONIsNull(const aValue: Boolean); virtual; + function GetIGNORAR_CONTABILIDADValue: SmallInt; virtual; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); virtual; + function GetIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -574,6 +586,8 @@ type property ID_AGENTEIsNull: Boolean read GetID_AGENTEIsNull write SetID_AGENTEIsNull; property REFERENCIA_COMISION: String read GetREFERENCIA_COMISIONValue write SetREFERENCIA_COMISIONValue; property REFERENCIA_COMISIONIsNull: Boolean read GetREFERENCIA_COMISIONIsNull write SetREFERENCIA_COMISIONIsNull; + property IGNORAR_CONTABILIDAD: SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull: Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -583,7 +597,7 @@ type { IFacturasCliente_Detalles } IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{E62E97AD-C08F-4BB6-A6EF-21BF966630A0}'] + ['{CC81CA29-10BA-4644-B6C0-86EB1BB27BBD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -675,7 +689,7 @@ type end; { TFacturasCliente_DetallesDataTableRules } - TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles) + TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles) private protected { Property getters and setters } @@ -1520,6 +1534,27 @@ begin DataTable.Fields[idx_FacturasClienteREFERENCIA_COMISION].AsVariant := Null; end; +function TFacturasClienteDataTableRules.GetIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := DataTable.Fields[idx_FacturasClienteIGNORAR_CONTABILIDAD].AsSmallInt; +end; + +procedure TFacturasClienteDataTableRules.SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); +begin + DataTable.Fields[idx_FacturasClienteIGNORAR_CONTABILIDAD].AsSmallInt := aValue; +end; + +function TFacturasClienteDataTableRules.GetIGNORAR_CONTABILIDADIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasClienteIGNORAR_CONTABILIDAD].IsNull; +end; + +procedure TFacturasClienteDataTableRules.SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasClienteIGNORAR_CONTABILIDAD].AsVariant := Null; +end; + { TFacturasCliente_DetallesDataTableRules } constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas index 00c491af..1f111756 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarReferenciaDelta = '{E8B8EB94-54CB-49B3-879C-1CF0319BCBBD}'; - RID_FacturasClienteDelta = '{EC7543D0-B0B5-48F9-9401-DEEE0D0BEFF2}'; - RID_FacturasCliente_DetallesDelta = '{A1C5C789-FF93-491C-82C6-A49EF37F27A3}'; + RID_DarReferenciaDelta = '{96BD45A4-7433-4AE5-B411-7B16AB88936D}'; + RID_FacturasClienteDelta = '{4EBF93DA-5847-45E1-960B-069B5239374F}'; + RID_FacturasCliente_DetallesDelta = '{1CB4A035-683D-412C-A365-6CF3A4E86ACD}'; type { IDarReferenciaDelta } IDarReferenciaDelta = interface(IDarReferencia) - ['{E8B8EB94-54CB-49B3-879C-1CF0319BCBBD}'] + ['{96BD45A4-7433-4AE5-B411-7B16AB88936D}'] { Property getters and setters } function GetOldVALORValue : String; @@ -50,7 +50,7 @@ type { IFacturasClienteDelta } IFacturasClienteDelta = interface(IFacturasCliente) - ['{EC7543D0-B0B5-48F9-9401-DEEE0D0BEFF2}'] + ['{4EBF93DA-5847-45E1-960B-069B5239374F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -85,6 +85,7 @@ type function GetOldIMPORTE_PORTEValue : Currency; function GetOldID_AGENTEValue : Integer; function GetOldREFERENCIA_COMISIONValue : String; + function GetOldIGNORAR_CONTABILIDADValue : SmallInt; { Properties } property OldID : Integer read GetOldIDValue; @@ -120,6 +121,7 @@ type property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue; property OldID_AGENTE : Integer read GetOldID_AGENTEValue; property OldREFERENCIA_COMISION : String read GetOldREFERENCIA_COMISIONValue; + property OldIGNORAR_CONTABILIDAD : SmallInt read GetOldIGNORAR_CONTABILIDADValue; end; { TFacturasClienteBusinessProcessorRules } @@ -326,6 +328,12 @@ type function GetOldREFERENCIA_COMISIONIsNull: Boolean; virtual; procedure SetREFERENCIA_COMISIONValue(const aValue: String); virtual; procedure SetREFERENCIA_COMISIONIsNull(const aValue: Boolean); virtual; + function GetIGNORAR_CONTABILIDADValue: SmallInt; virtual; + function GetIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + function GetOldIGNORAR_CONTABILIDADValue: SmallInt; virtual; + function GetOldIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); virtual; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -460,6 +468,10 @@ type property REFERENCIA_COMISIONIsNull : Boolean read GetREFERENCIA_COMISIONIsNull write SetREFERENCIA_COMISIONIsNull; property OldREFERENCIA_COMISION : String read GetOldREFERENCIA_COMISIONValue; property OldREFERENCIA_COMISIONIsNull : Boolean read GetOldREFERENCIA_COMISIONIsNull; + property IGNORAR_CONTABILIDAD : SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull : Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; + property OldIGNORAR_CONTABILIDAD : SmallInt read GetOldIGNORAR_CONTABILIDADValue; + property OldIGNORAR_CONTABILIDADIsNull : Boolean read GetOldIGNORAR_CONTABILIDADIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -469,7 +481,7 @@ type { IFacturasCliente_DetallesDelta } IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles) - ['{A1C5C789-FF93-491C-82C6-A49EF37F27A3}'] + ['{1CB4A035-683D-412C-A365-6CF3A4E86ACD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -1747,6 +1759,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA_COMISION] := Null; end; +function TFacturasClienteBusinessProcessorRules.GetIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD]; +end; + +function TFacturasClienteBusinessProcessorRules.GetIGNORAR_CONTABILIDADIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD]); +end; + +function TFacturasClienteBusinessProcessorRules.GetOldIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD]; +end; + +function TFacturasClienteBusinessProcessorRules.GetOldIGNORAR_CONTABILIDADIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD]); +end; + +procedure TFacturasClienteBusinessProcessorRules.SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD] := aValue; +end; + +procedure TFacturasClienteBusinessProcessorRules.SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIGNORAR_CONTABILIDAD] := Null; +end; + { TFacturasCliente_DetallesBusinessProcessorRules } constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index c17f21dd..bb6b745b 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -256,6 +256,7 @@ begin IVA := AppFactuGES.EmpresaActiva.IVA; RE := 0; SITUACION := CTE_PENDIENTE; + IGNORAR_CONTABILIDAD := 0; end; procedure TBizFacturaCliente.IVAOnChange(Sender: TDACustomField); diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas index b1c2bcd2..892e47fb 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas @@ -16,7 +16,12 @@ const type TBizFacturasClienteServer = class(TFacturasClienteBusinessProcessorRules) protected + procedure Insert_Asiento_Factura(aChange: TDADeltaChange); virtual; + procedure Update_Asiento_Factura(aChange: TDADeltaChange); virtual; + procedure Delete_Asiento_Factura(aChange: TDADeltaChange); virtual; + procedure BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta); override; + procedure AfterProcessChange(Sender: TDABusinessProcessor; aChange: TDADeltaChange; Processed: Boolean; var CanRemoveFromDelta: Boolean); override; end; implementation @@ -27,6 +32,27 @@ uses { TBizFacturasClienteServer } +procedure TBizFacturasClienteServer.AfterProcessChange(Sender: TDABusinessProcessor; aChange: TDADeltaChange; Processed: Boolean; + var CanRemoveFromDelta: Boolean); +begin + case aChange.ChangeType of + ctInsert: begin + Insert_Asiento_Factura(aChange); + end; + ctUpdate: begin + Update_Asiento_Factura(aChange); + end; + ctDelete: begin + Delete_Asiento_Factura(aChange); + end; + end; + + // No hay que quitar los deltas para que los datos del contacto se + // mantengan por si alguna tabla detalle lo necesita + // (por ejemplo, DireccionesContacto) + CanRemoveFromDelta := False; +end; + procedure TBizFacturasClienteServer.BeforeProcessDelta( Sender: TDABusinessProcessor; const aDelta: IDADelta); var @@ -40,13 +66,14 @@ begin inherited; case Sender.CurrentChange.ChangeType of ctInsert, ctUpdate: begin + + ASchema := BusinessProcessor.Schema; + ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); + //Si la referencia no ha sido asignada le asignamos una nosotros if (VarIsNull(Sender.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA])) or (VarToStr(Sender.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA]) = '') then begin - ASchema := BusinessProcessor.Schema; - ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); - try //Siempre va a estar rellena Empresa := Sender.CurrentChange.NewValueByName[fld_FacturasClienteID_EMPRESA]; @@ -82,6 +109,69 @@ begin end; end; +procedure TBizFacturasClienteServer.Delete_Asiento_Factura(aChange: TDADeltaChange); +var + ASchema : TDASchema; + ACurrentConn : IDAConnection; + ACommand : IDASQLCommand; +begin + ASchema := BusinessProcessor.Schema; + ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); + + ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_AsientoFactura'); + try + with ACommand do + begin + ParamByName('IdFactura').Value := aChange.OldValueByName[fld_FacturasClienteID]; + Execute; + end; + finally + ACommand := NIL; + end; +end; + +procedure TBizFacturasClienteServer.Insert_Asiento_Factura(aChange: TDADeltaChange); +var + ASchema : TDASchema; + ACurrentConn : IDAConnection; + ACommand : IDASQLCommand; +begin + ASchema := BusinessProcessor.Schema; + ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); + + ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_AsientoFactura'); + try + with ACommand do + begin + ParamByName('IdFactura').Value := aChange.NewValueByName[fld_FacturasClienteID]; + Execute; + end; + finally + ACommand := NIL; + end; +end; + +procedure TBizFacturasClienteServer.Update_Asiento_Factura(aChange: TDADeltaChange); +var + ASchema : TDASchema; + ACurrentConn : IDAConnection; + ACommand : IDASQLCommand; +begin + ASchema := BusinessProcessor.Schema; + ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); + + ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_AsientoFactura'); + try + with ACommand do + begin + ParamByName('IdFactura').Value := aChange.NewValueByName[fld_FacturasClienteID]; + Execute; + end; + finally + ACommand := NIL; + end; +end; + initialization RegisterBusinessProcessorRules(BIZ_SERVER_FACTURAS_CLIENTE, TBizFacturasClienteServer); diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm index 14f3e134..fd18bcce 100644 --- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm +++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm @@ -190,6 +190,10 @@ object srvFacturasCliente: TsrvFacturasCliente item DatasetField = 'REFERENCIA_COMISION' TableField = 'REFERENCIA_COMISION' + end + item + DatasetField = 'IGNORAR_CONTABILIDAD' + TableField = 'IGNORAR_CONTABILIDAD' end> end> Name = 'FacturasCliente' @@ -372,6 +376,11 @@ object srvFacturasCliente: TsrvFacturasCliente DataType = datString Size = 255 DictionaryEntry = 'FacturasCliente_REFERENCIA_COMISION' + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt + DictionaryEntry = 'FacturasCliente_IGNORAR_CONTABILIDAD' end> end item @@ -534,6 +543,42 @@ object srvFacturasCliente: TsrvFacturasCliente JoinDataTables = <> UnionDataTables = <> Commands = < + item + Params = < + item + Name = 'IdFactura' + Value = '' + end> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + Name = 'IBX' + SQL = 'execute procedure proc_delete_asiento_factura :IdFactura'#10 + StatementType = stSQL + ColumnMappings = <> + end> + Name = 'Delete_AsientoFactura' + end + item + Params = < + item + Name = 'IdFactura' + Value = '' + end> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + Name = 'IBX' + SQL = 'execute procedure proc_new_asiento_factura :IdFactura'#10 + StatementType = stSQL + ColumnMappings = <> + end> + Name = 'Insert_AsientoFactura' + end item Params = < item @@ -793,173 +838,115 @@ object srvFacturasCliente: TsrvFacturasCliente end item Name = 'ID_EMPRESA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'REFERENCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'FECHA_FACTURA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'BASE_IMPONIBLE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_TOTAL' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'OBSERVACIONES' - DataType = datMemo Value = '' - ParamType = daptInput end item Name = 'ID_CLIENTE' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'NIF_CIF' - DataType = datString - Size = 15 Value = '' - ParamType = daptInput end item Name = 'NOMBRE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CALLE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'POBLACION' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'PROVINCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CODIGO_POSTAL' - DataType = datString - Size = 10 Value = '' - ParamType = daptInput end item Name = 'FECHA_ALTA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'FECHA_MODIFICACION' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'USUARIO' - DataType = datString - Size = 20 Value = '' - ParamType = daptInput end item Name = 'ID_FORMA_PAGO' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RECARGO_EQUIVALENCIA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_TIPO_IVA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'IMPORTE_NETO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_PORTE' - DataType = datFloat Value = '' - ParamType = daptInput + end + item + Name = 'IGNORAR_CONTABILIDAD' + Value = '' end> Statements = < item @@ -974,15 +961,16 @@ object srvFacturasCliente: TsrvFacturasCliente 'NIF_CIF,'#10' NOMBRE,'#10' CALLE,'#10' POBLACION,'#10' PROVINCIA,'#10' ' + ' CODIGO_POSTAL,'#10' FECHA_ALTA,'#10' FECHA_MODIFICACION,'#10' USU' + 'ARIO,'#10' ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA,'#10' ID_TIPO_I' + - 'VA,'#10' IMPORTE_NETO,'#10' IMPORTE_PORTE)'#10' VALUES ('#10' :ID,'#10' ' + - ' :ID_EMPRESA,'#10' :REFERENCIA,'#10' :FECHA_FACTURA,'#10' :BASE_IMP' + - 'ONIBLE,'#10' :DESCUENTO,'#10' :IMPORTE_DESCUENTO,'#10' :IVA,'#10' :I' + - 'MPORTE_IVA,'#10' :RE,'#10' :IMPORTE_RE,'#10' :IMPORTE_TOTAL,'#10' :O' + - 'BSERVACIONES,'#10' :ID_CLIENTE,'#10' :NIF_CIF,'#10' :NOMBRE,'#10' :C' + - 'ALLE,'#10' :POBLACION,'#10' :PROVINCIA,'#10' :CODIGO_POSTAL,'#10' :F' + - 'ECHA_ALTA,'#10' :FECHA_MODIFICACION,'#10' :USUARIO,'#10' :ID_FORMA_' + - 'PAGO,'#10' :RECARGO_EQUIVALENCIA,'#10' :ID_TIPO_IVA,'#10' :IMPORTE_' + - 'NETO,'#10' :IMPORTE_PORTE);' + 'VA,'#10' IMPORTE_NETO,'#10' IMPORTE_PORTE,'#10' IGNORAR_CONTABILIDA' + + 'D)'#10' VALUES ('#10' :ID,'#10' :ID_EMPRESA,'#10' :REFERENCIA,'#10' :FE' + + 'CHA_FACTURA,'#10' :BASE_IMPONIBLE,'#10' :DESCUENTO,'#10' :IMPORTE_D' + + 'ESCUENTO,'#10' :IVA,'#10' :IMPORTE_IVA,'#10' :RE,'#10' :IMPORTE_RE,'#10 + + ' :IMPORTE_TOTAL,'#10' :OBSERVACIONES,'#10' :ID_CLIENTE,'#10' :NI' + + 'F_CIF,'#10' :NOMBRE,'#10' :CALLE,'#10' :POBLACION,'#10' :PROVINCIA,'#10 + + ' :CODIGO_POSTAL,'#10' :FECHA_ALTA,'#10' :FECHA_MODIFICACION,'#10' ' + + ' :USUARIO,'#10' :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVALENCIA,'#10' :' + + 'ID_TIPO_IVA,'#10' :IMPORTE_NETO,'#10' :IMPORTE_PORTE,'#10' :IGNORAR' + + '_CONTABILIDAD);'#10 StatementType = stSQL ColumnMappings = <> end> @@ -992,179 +980,119 @@ object srvFacturasCliente: TsrvFacturasCliente Params = < item Name = 'ID_EMPRESA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'REFERENCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'FECHA_FACTURA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'BASE_IMPONIBLE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_TOTAL' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'OBSERVACIONES' - DataType = datMemo Value = '' - ParamType = daptInput end item Name = 'ID_CLIENTE' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'NIF_CIF' - DataType = datString - Size = 15 Value = '' - ParamType = daptInput end item Name = 'NOMBRE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CALLE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'POBLACION' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'PROVINCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CODIGO_POSTAL' - DataType = datString - Size = 10 Value = '' - ParamType = daptInput end item Name = 'FECHA_ALTA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'FECHA_MODIFICACION' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'USUARIO' - DataType = datString - Size = 20 Value = '' - ParamType = daptInput end item Name = 'ID_FORMA_PAGO' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RECARGO_EQUIVALENCIA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_TIPO_IVA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'IMPORTE_NETO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_PORTE' - DataType = datFloat Value = '' - ParamType = daptInput + end + item + Name = 'IGNORAR_CONTABILIDAD' + Value = '' end item Name = 'OLD_ID' - DataType = datInteger Value = '' - ParamType = daptInput end> Statements = < item @@ -1184,8 +1112,8 @@ object srvFacturasCliente: TsrvFacturasCliente ' = :FECHA_MODIFICACION,'#10' USUARIO = :USUARIO,'#10' ID_FORMA_PAG' + 'O = :ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALE' + 'NCIA,'#10' ID_TIPO_IVA = :ID_TIPO_IVA,'#10' IMPORTE_NETO = :IMPORT' + - 'E_NETO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE'#10' WHERE'#10' (ID = :OLD_' + - 'ID);' + 'E_NETO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' IGNORAR_CONTABIL' + + 'IDAD = :IGNORAR_CONTABILIDAD'#10' WHERE'#10' (ID = :OLD_ID);'#10 StatementType = stSQL ColumnMappings = <> end> @@ -1537,6 +1465,10 @@ object srvFacturasCliente: TsrvFacturasCliente Name = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR' DataType = datString Size = 255 + end + item + Name = 'FacturasCliente_IGNORAR_CONTABILIDAD' + DataType = datSmallInt end> Left = 150 Top = 22 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index d226b9bf..6706959a 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -71,6 +71,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited pgPaginas: TPageControl Width = 788 Height = 317 + ActivePage = pagContenido OnChanging = pgPaginasChanging ExplicitWidth = 788 ExplicitHeight = 317 @@ -212,40 +213,40 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 202 - ExplicitLeft = 202 + Left = 217 + ExplicitLeft = 217 end inherited ToolButton13: TToolButton - Left = 219 - ExplicitLeft = 219 + Left = 234 + ExplicitLeft = 234 end inherited ToolButton6: TToolButton - Left = 227 - ExplicitLeft = 227 + Left = 242 + ExplicitLeft = 242 end inherited ToolButton7: TToolButton - Left = 261 - ExplicitLeft = 261 + Left = 276 + ExplicitLeft = 276 end inherited ToolButton8: TToolButton - Left = 295 - ExplicitLeft = 295 + Left = 310 + ExplicitLeft = 310 end inherited ToolButton12: TToolButton - Left = 329 - ExplicitLeft = 329 + Left = 344 + ExplicitLeft = 344 end inherited ToolButton9: TToolButton - Left = 337 - ExplicitLeft = 337 + Left = 352 + ExplicitLeft = 352 end inherited ToolButton10: TToolButton - Left = 371 - ExplicitLeft = 371 + Left = 386 + ExplicitLeft = 386 end inherited ToolButton11: TToolButton - Left = 405 - ExplicitLeft = 405 + Left = 420 + ExplicitLeft = 420 end end inherited cxGrid: TcxGrid @@ -263,6 +264,33 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end end + object pagContabilidad: TTabSheet + Caption = 'Contabilidad' + ImageIndex = 2 + object cbIgnorarContabilidad: TcxDBCheckBox + Left = 16 + Top = 12 + Caption = 'Ignorar en contabilidad' + DataBinding.DataField = 'IGNORAR_CONTABILIDAD' + DataBinding.DataSource = dsDataTable + Properties.NullStyle = nssUnchecked + Properties.ValueChecked = 1 + Properties.ValueUnchecked = 0 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 0 + Width = 300 + end + end end inherited StatusBar: TJvStatusBar Top = 556 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index bd6b429c..2dd7a283 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -16,7 +16,8 @@ uses uIEditorFacturaCliente, uFacturasClienteController, uViewDetallesBase, uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces, - cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids; + cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids, + cxCheckBox; type @@ -24,6 +25,8 @@ type frViewFacturaCliente1: TfrViewFacturaCliente; frViewTotales1: TfrViewTotales; frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente; + pagContabilidad: TTabSheet; + cbIgnorarContabilidad: TcxDBCheckBox; procedure FormShow(Sender: TObject); procedure frViewClienteFactura1edtlNombrePropertiesEditValueChanged(Sender: TObject); procedure dsDataTableDataChange(Sender: TObject; Field: TField); @@ -176,10 +179,17 @@ procedure TfEditorFacturaCliente.frViewTotales1cbRecargoEquivalenciaPropertiesEd Sender: TObject); begin inherited; - if frViewTotales1.cbRecargoEquivalencia.Checked then - Factura.RECARGO_EQUIVALENCIA := 1 - else - Factura.RECARGO_EQUIVALENCIA := 0; + + if assigned(Factura) then + begin + if not Factura.datatable.Editing then + Factura.datatable.Edit; + + if frViewTotales1.cbRecargoEquivalencia.Checked then + Factura.RECARGO_EQUIVALENCIA := 1 + else + Factura.RECARGO_EQUIVALENCIA := 0; + end; end; procedure TfEditorFacturaCliente.frViewTotales1edtDescuentoPropertiesValidate( @@ -196,7 +206,7 @@ procedure TfEditorFacturaCliente.frViewTotales1eIVAPropertiesValidate( begin inherited; Factura.Edit; - Factura.ID_TIPO_IVA := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).ID; + Factura.ID_TIPO_IVA := FTiposIVA.ID; // ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).ID; end; procedure TfEditorFacturaCliente.frViewTotales1ePorteEditing(Sender: TObject; @@ -391,7 +401,7 @@ begin if Assigned(FFactura) then begin dsDataTable.DataTable := FFactura.DataTable; -// frViewTotales1.DADataSource.DataTable := FFactura.DataTable; + frViewTotales1.DADataSource.DataTable := FFactura.DataTable; FTiposIVA := FTiposIVAController.BuscarTodos; frViewTotales1.dsTiposIVA.DataTable := FTiposIVA.DataTable; diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 9b0e2198..5a2a287e 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -56,8 +56,6 @@ uses uRptPresupuestosCliente_Server in '..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas' {RptPresupuestosCliente}, schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', - schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', - schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', srvRecibosProveedor_Impl in '..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas' {srvRecibosProveedor: TDataAbstractService}, @@ -99,10 +97,12 @@ uses schEjerciciosServer_Intf in '..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas', schEjerciciosClient_Intf in '..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas', srvContabilidad_Impl in '..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas' {srvContabilidad: TDataAbstractService}, - schContabilidadClient_Intf in '..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas', - schContabilidadServer_Intf in '..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas'; + schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', + schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', + schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', + schContabilidadClient_Intf in '..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas', + schContabilidadServer_Intf in '..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 139dcd67..f45e3b0d 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -30,6 +30,14 @@ FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 + + + + + + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration FactuGES_Server.dpr