diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas index 479bb2ba..d471509c 100644 --- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas @@ -29,6 +29,11 @@ type function GetTiendasController : ITiendasEmpresaController; property TiendasController : ITiendasEmpresaController read GetTiendasController; + + function DarListaFormasPago: TStringList; + function DarListaTiposIVA: TStringList; + Procedure AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant); + Procedure AsignarIDTipoIVA(AEmpresa: IBizEmpresa; const IDTipoIVA: Variant); end; TEmpresasController = class(TControllerBase, IEmpresasController) @@ -57,6 +62,10 @@ type function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList; function DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda; + function DarListaFormasPago: TStringList; + function DarListaTiposIVA: TStringList; + Procedure AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant); + Procedure AsignarIDTipoIVA(AEmpresa: IBizEmpresa; const IDTipoIVA: Variant); property TiendasController : ITiendasEmpresaController read GetTiendasController; end; @@ -65,7 +74,7 @@ implementation uses uEditorRegistryUtils, cxControls, DB, uFactuGES_App, - uDataModuleEmpresas, uIEditorEmpresa; + uDataModuleEmpresas, uIEditorEmpresa, uStringsUtils; { TEmpresasController } @@ -74,6 +83,39 @@ begin AEmpresa.Insert; end; +procedure TEmpresasController.AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant); +begin + if Assigned(AEmpresa) then + begin + if not AEmpresa.DataTable.Editing then + AEmpresa.DataTable.Edit; + + if EsCadenaVacia(IDFormaPago) then + AEmpresa.ID_FORMA_PAGOIsNull := true + else + AEmpresa.ID_FORMA_PAGO := IDFormaPago; + + AEmpresa.DataTable.Post; + end; +end; + +procedure TEmpresasController.AsignarIDTipoIVA(AEmpresa: IBizEmpresa; + const IDTipoIVA: Variant); +begin + if Assigned(AEmpresa) then + begin + if not AEmpresa.DataTable.Editing then + AEmpresa.DataTable.Edit; + + if EsCadenaVacia(IDTipoIVA) then + AEmpresa.ID_TIPO_IVAIsNull := true + else + AEmpresa.ID_TIPO_IVA := IDTipoIVA; + + AEmpresa.DataTable.Post; + end; +end; + function TEmpresasController.Buscar(const ID: Integer): IBizEmpresa; begin Result := FDataModule.GetItem(ID) @@ -91,6 +133,16 @@ begin FTiendasController := TTiendasEmpresaController.Create; end; +function TEmpresasController.DarListaFormasPago: TStringList; +begin + ShowHourglassCursor; + try + Result := FDataModule.DarListaFormasPago; + finally + HideHourglassCursor; + end; +end; + function TEmpresasController.DarListaTiendas( AEmpresa: IBizEmpresa): TStringList; var @@ -120,6 +172,16 @@ begin end; end; +function TEmpresasController.DarListaTiposIVA: TStringList; +begin + ShowHourglassCursor; + try + Result := FDataModule.DarListaTiposIVA; + finally + HideHourglassCursor; + end; +end; + function TEmpresasController.DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda; var AIDTienda : Integer; diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm index 53a567d2..287246f9 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm @@ -181,9 +181,12 @@ inherited DataModuleEmpresas: TDataModuleEmpresas DictionaryEntry = 'Empresas_REGISTRO_MERCANTIL' end item - Name = 'IVA' - DataType = datFloat - DictionaryEntry = 'Empresas_IVA' + Name = 'ID_TIPO_IVA' + DataType = datSmallInt + end + item + Name = 'ID_FORMA_PAGO' + DataType = datSmallInt end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas index 576e396d..b041967a 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas @@ -34,6 +34,9 @@ type function NewTienda : IBizEmpresaTienda; function GetTiendas : IBizEmpresaTienda; function GetTienda(const ID : Integer) : IBizEmpresaTienda; + + function DarListaFormasPago: TStringList; + function DarListaTiposIVA: TStringList; end; implementation @@ -41,7 +44,7 @@ implementation {$R *.DFM} uses - uDataModuleConexion, uDataTableUtils, Dialogs, + uDataModuleConexion, uDataTableUtils, Dialogs, uROTypes, FactuGES_Intf, schEmpresasClient_Intf, cxControls; procedure TDataModuleEmpresas.DAClientDataModuleCreate(Sender: TObject); @@ -50,6 +53,24 @@ begin RORemoteService.Message := dmConexion.Message; end; +function TDataModuleEmpresas.DarListaFormasPago: TStringList; +var + ABinary : Binary; +begin + ABinary := (RORemoteService as IsrvEmpresas).DarListaFormasPago; + Result := TStringList.Create; + Result.LoadFromStream(ABinary); +end; + +function TDataModuleEmpresas.DarListaTiposIVA: TStringList; +var + ABinary : Binary; +begin + ABinary := (RORemoteService as IsrvEmpresas).DarListaTiposIVA; + Result := TStringList.Create; + Result.LoadFromStream(ABinary); +end; + function TDataModuleEmpresas.DarTiendaUsuario(const ID_EMPRESA, ID_USUARIO: Integer): Integer; begin diff --git a/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas b/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas index 2e8daf85..5fcd711a 100644 --- a/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas +++ b/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas @@ -17,6 +17,8 @@ type function GetTiendas : IBizEmpresaTienda; function DarTiendaUsuario(const ID_EMPRESA: Integer; const ID_USUARIO: Integer): Integer; + function DarListaFormasPago: TStringList; + function DarListaTiposIVA: TStringList; end; implementation diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas index c4aa9034..09974713 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas @@ -9,9 +9,9 @@ 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_EmpresasTiendas = '{7691DBC8-C1A5-4495-B66F-FADD68AF373A}'; - RID_Empresas = '{591782AE-DFE0-4EF5-9F14-6C24F113B6C6}'; - RID_EmpresasDatosBanco = '{770FD731-3914-4222-8C72-DE644036A8FD}'; + RID_EmpresasTiendas = '{DE2F56B7-FF02-42DD-81B1-9CAE8180FB62}'; + RID_Empresas = '{548CF5B0-8BA0-4404-8921-5B9A812E898A}'; + RID_EmpresasDatosBanco = '{2FB999FE-08AA-4D00-90BA-17B16C1A09F3}'; { Data table names } nme_EmpresasTiendas = 'EmpresasTiendas'; @@ -77,7 +77,8 @@ const fld_EmpresasUSUARIO = 'USUARIO'; fld_EmpresasLOGOTIPO = 'LOGOTIPO'; fld_EmpresasREGISTRO_MERCANTIL = 'REGISTRO_MERCANTIL'; - fld_EmpresasIVA = 'IVA'; + fld_EmpresasID_TIPO_IVA = 'ID_TIPO_IVA'; + fld_EmpresasID_FORMA_PAGO = 'ID_FORMA_PAGO'; { Empresas field indexes } idx_EmpresasID = 0; @@ -102,7 +103,8 @@ const idx_EmpresasUSUARIO = 19; idx_EmpresasLOGOTIPO = 20; idx_EmpresasREGISTRO_MERCANTIL = 21; - idx_EmpresasIVA = 22; + idx_EmpresasID_TIPO_IVA = 22; + idx_EmpresasID_FORMA_PAGO = 23; { EmpresasDatosBanco fields } fld_EmpresasDatosBancoID = 'ID'; @@ -129,7 +131,7 @@ const type { IEmpresasTiendas } IEmpresasTiendas = interface(IDAStronglyTypedDataTable) - ['{5AB99CD0-0101-4D3C-B829-F8FA2D78ABA0}'] + ['{FC8CABB4-BBDD-4DBC-80E9-A06BB22A7D5D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -344,7 +346,7 @@ type { IEmpresas } IEmpresas = interface(IDAStronglyTypedDataTable) - ['{A5EABBE6-C793-4CBD-B0D7-E460BACC895D}'] + ['{8A1D6090-A739-40B1-8D56-B2C0247C5CA4}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -432,10 +434,14 @@ type procedure SetREGISTRO_MERCANTILValue(const aValue: String); function GetREGISTRO_MERCANTILIsNull: Boolean; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); - function GetIVAValue: Float; - procedure SetIVAValue(const aValue: Float); - function GetIVAIsNull: Boolean; - procedure SetIVAIsNull(const aValue: Boolean); + function GetID_TIPO_IVAValue: SmallInt; + procedure SetID_TIPO_IVAValue(const aValue: SmallInt); + function GetID_TIPO_IVAIsNull: Boolean; + procedure SetID_TIPO_IVAIsNull(const aValue: Boolean); + function GetID_FORMA_PAGOValue: SmallInt; + procedure SetID_FORMA_PAGOValue(const aValue: SmallInt); + function GetID_FORMA_PAGOIsNull: Boolean; + procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); { Properties } @@ -483,8 +489,10 @@ type property LOGOTIPOIsNull: Boolean read GetLOGOTIPOIsNull write SetLOGOTIPOIsNull; property REGISTRO_MERCANTIL: String read GetREGISTRO_MERCANTILValue write SetREGISTRO_MERCANTILValue; property REGISTRO_MERCANTILIsNull: Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; - property IVA: Float read GetIVAValue write SetIVAValue; - property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; + property ID_TIPO_IVA: SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; + property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; + property ID_FORMA_PAGO: SmallInt read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; + property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; end; { TEmpresasDataTableRules } @@ -582,10 +590,14 @@ type procedure SetREGISTRO_MERCANTILValue(const aValue: String); virtual; function GetREGISTRO_MERCANTILIsNull: Boolean; virtual; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); virtual; - function GetIVAValue: Float; virtual; - procedure SetIVAValue(const aValue: Float); virtual; - function GetIVAIsNull: Boolean; virtual; - procedure SetIVAIsNull(const aValue: Boolean); virtual; + function GetID_TIPO_IVAValue: SmallInt; virtual; + procedure SetID_TIPO_IVAValue(const aValue: SmallInt); virtual; + function GetID_TIPO_IVAIsNull: Boolean; virtual; + procedure SetID_TIPO_IVAIsNull(const aValue: Boolean); virtual; + function GetID_FORMA_PAGOValue: SmallInt; virtual; + procedure SetID_FORMA_PAGOValue(const aValue: SmallInt); virtual; + function GetID_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -632,8 +644,10 @@ type property LOGOTIPOIsNull: Boolean read GetLOGOTIPOIsNull write SetLOGOTIPOIsNull; property REGISTRO_MERCANTIL: String read GetREGISTRO_MERCANTILValue write SetREGISTRO_MERCANTILValue; property REGISTRO_MERCANTILIsNull: Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; - property IVA: Float read GetIVAValue write SetIVAValue; - property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; + property ID_TIPO_IVA: SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; + property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; + property ID_FORMA_PAGO: SmallInt read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; + property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -643,7 +657,7 @@ type { IEmpresasDatosBanco } IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable) - ['{CE9EA55E-D8DD-458D-99E0-65D68127E258}'] + ['{097616F3-E8C0-400E-AB29-23A93A6D79B1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1621,25 +1635,46 @@ begin DataTable.Fields[idx_EmpresasREGISTRO_MERCANTIL].AsVariant := Null; end; -function TEmpresasDataTableRules.GetIVAValue: Float; +function TEmpresasDataTableRules.GetID_TIPO_IVAValue: SmallInt; begin - result := DataTable.Fields[idx_EmpresasIVA].AsFloat; + result := DataTable.Fields[idx_EmpresasID_TIPO_IVA].AsSmallInt; end; -procedure TEmpresasDataTableRules.SetIVAValue(const aValue: Float); +procedure TEmpresasDataTableRules.SetID_TIPO_IVAValue(const aValue: SmallInt); begin - DataTable.Fields[idx_EmpresasIVA].AsFloat := aValue; + DataTable.Fields[idx_EmpresasID_TIPO_IVA].AsSmallInt := aValue; end; -function TEmpresasDataTableRules.GetIVAIsNull: boolean; +function TEmpresasDataTableRules.GetID_TIPO_IVAIsNull: boolean; begin - result := DataTable.Fields[idx_EmpresasIVA].IsNull; + result := DataTable.Fields[idx_EmpresasID_TIPO_IVA].IsNull; end; -procedure TEmpresasDataTableRules.SetIVAIsNull(const aValue: Boolean); +procedure TEmpresasDataTableRules.SetID_TIPO_IVAIsNull(const aValue: Boolean); begin if aValue then - DataTable.Fields[idx_EmpresasIVA].AsVariant := Null; + DataTable.Fields[idx_EmpresasID_TIPO_IVA].AsVariant := Null; +end; + +function TEmpresasDataTableRules.GetID_FORMA_PAGOValue: SmallInt; +begin + result := DataTable.Fields[idx_EmpresasID_FORMA_PAGO].AsSmallInt; +end; + +procedure TEmpresasDataTableRules.SetID_FORMA_PAGOValue(const aValue: SmallInt); +begin + DataTable.Fields[idx_EmpresasID_FORMA_PAGO].AsSmallInt := aValue; +end; + +function TEmpresasDataTableRules.GetID_FORMA_PAGOIsNull: boolean; +begin + result := DataTable.Fields[idx_EmpresasID_FORMA_PAGO].IsNull; +end; + +procedure TEmpresasDataTableRules.SetID_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_EmpresasID_FORMA_PAGO].AsVariant := Null; end; diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas index c6e49c85..782f8310 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_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_EmpresasTiendasDelta = '{DCB989E4-D085-4440-B7AA-43454431AB6E}'; - RID_EmpresasDelta = '{FE56DEB0-3242-4852-8C8C-68B235BBB329}'; - RID_EmpresasDatosBancoDelta = '{89B3E6FF-5C24-4695-ADBD-2899BCA0879D}'; + RID_EmpresasTiendasDelta = '{E92D2312-CB08-4084-81FE-BD86F002599A}'; + RID_EmpresasDelta = '{1E6C02A3-0E3A-4BF4-BE56-C4C03528B23F}'; + RID_EmpresasDatosBancoDelta = '{59FD85FC-B04A-4FAB-BC2A-193DEF12B97F}'; type { IEmpresasTiendasDelta } IEmpresasTiendasDelta = interface(IEmpresasTiendas) - ['{DCB989E4-D085-4440-B7AA-43454431AB6E}'] + ['{E92D2312-CB08-4084-81FE-BD86F002599A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -231,7 +231,7 @@ type { IEmpresasDelta } IEmpresasDelta = interface(IEmpresas) - ['{FE56DEB0-3242-4852-8C8C-68B235BBB329}'] + ['{1E6C02A3-0E3A-4BF4-BE56-C4C03528B23F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -255,7 +255,8 @@ type function GetOldUSUARIOValue : String; function GetOldLOGOTIPOValue : IROStream; function GetOldREGISTRO_MERCANTILValue : String; - function GetOldIVAValue : Float; + function GetOldID_TIPO_IVAValue : SmallInt; + function GetOldID_FORMA_PAGOValue : SmallInt; { Properties } property OldID : Integer read GetOldIDValue; @@ -280,7 +281,8 @@ type property OldUSUARIO : String read GetOldUSUARIOValue; property OldLOGOTIPO : IROStream read GetOldLOGOTIPOValue; property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue; - property OldIVA : Float read GetOldIVAValue; + property OldID_TIPO_IVA : SmallInt read GetOldID_TIPO_IVAValue; + property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue; end; { TEmpresasBusinessProcessorRules } @@ -422,12 +424,18 @@ type function GetOldREGISTRO_MERCANTILIsNull: Boolean; virtual; procedure SetREGISTRO_MERCANTILValue(const aValue: String); virtual; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); virtual; - function GetIVAValue: Float; virtual; - function GetIVAIsNull: Boolean; virtual; - function GetOldIVAValue: Float; virtual; - function GetOldIVAIsNull: Boolean; virtual; - procedure SetIVAValue(const aValue: Float); virtual; - procedure SetIVAIsNull(const aValue: Boolean); virtual; + function GetID_TIPO_IVAValue: SmallInt; virtual; + function GetID_TIPO_IVAIsNull: Boolean; virtual; + function GetOldID_TIPO_IVAValue: SmallInt; virtual; + function GetOldID_TIPO_IVAIsNull: Boolean; virtual; + procedure SetID_TIPO_IVAValue(const aValue: SmallInt); virtual; + procedure SetID_TIPO_IVAIsNull(const aValue: Boolean); virtual; + function GetID_FORMA_PAGOValue: SmallInt; virtual; + function GetID_FORMA_PAGOIsNull: Boolean; virtual; + function GetOldID_FORMA_PAGOValue: SmallInt; virtual; + function GetOldID_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetID_FORMA_PAGOValue(const aValue: SmallInt); virtual; + procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -518,10 +526,14 @@ type property REGISTRO_MERCANTILIsNull : Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue; property OldREGISTRO_MERCANTILIsNull : Boolean read GetOldREGISTRO_MERCANTILIsNull; - property IVA : Float read GetIVAValue write SetIVAValue; - property IVAIsNull : Boolean read GetIVAIsNull write SetIVAIsNull; - property OldIVA : Float read GetOldIVAValue; - property OldIVAIsNull : Boolean read GetOldIVAIsNull; + property ID_TIPO_IVA : SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; + property ID_TIPO_IVAIsNull : Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; + property OldID_TIPO_IVA : SmallInt read GetOldID_TIPO_IVAValue; + property OldID_TIPO_IVAIsNull : Boolean read GetOldID_TIPO_IVAIsNull; + property ID_FORMA_PAGO : SmallInt read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; + property ID_FORMA_PAGOIsNull : Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; + property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue; + property OldID_FORMA_PAGOIsNull : Boolean read GetOldID_FORMA_PAGOIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -531,7 +543,7 @@ type { IEmpresasDatosBancoDelta } IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco) - ['{89B3E6FF-5C24-4695-ADBD-2899BCA0879D}'] + ['{59FD85FC-B04A-4FAB-BC2A-193DEF12B97F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -1892,35 +1904,66 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasREGISTRO_MERCANTIL] := Null; end; -function TEmpresasBusinessProcessorRules.GetIVAValue: Float; +function TEmpresasBusinessProcessorRules.GetID_TIPO_IVAValue: SmallInt; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA]; end; -function TEmpresasBusinessProcessorRules.GetIVAIsNull: Boolean; +function TEmpresasBusinessProcessorRules.GetID_TIPO_IVAIsNull: Boolean; begin - result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA]); + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA]); end; -function TEmpresasBusinessProcessorRules.GetOldIVAValue: Float; +function TEmpresasBusinessProcessorRules.GetOldID_TIPO_IVAValue: SmallInt; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasIVA]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_TIPO_IVA]; end; -function TEmpresasBusinessProcessorRules.GetOldIVAIsNull: Boolean; +function TEmpresasBusinessProcessorRules.GetOldID_TIPO_IVAIsNull: Boolean; begin - result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasIVA]); + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_TIPO_IVA]); end; -procedure TEmpresasBusinessProcessorRules.SetIVAValue(const aValue: Float); +procedure TEmpresasBusinessProcessorRules.SetID_TIPO_IVAValue(const aValue: SmallInt); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA] := aValue; end; -procedure TEmpresasBusinessProcessorRules.SetIVAIsNull(const aValue: Boolean); +procedure TEmpresasBusinessProcessorRules.SetID_TIPO_IVAIsNull(const aValue: Boolean); begin if aValue then - BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA] := Null; + BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA] := Null; +end; + +function TEmpresasBusinessProcessorRules.GetID_FORMA_PAGOValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO]; +end; + +function TEmpresasBusinessProcessorRules.GetID_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO]); +end; + +function TEmpresasBusinessProcessorRules.GetOldID_FORMA_PAGOValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_FORMA_PAGO]; +end; + +function TEmpresasBusinessProcessorRules.GetOldID_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_FORMA_PAGO]); +end; + +procedure TEmpresasBusinessProcessorRules.SetID_FORMA_PAGOValue(const aValue: SmallInt); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO] := aValue; +end; + +procedure TEmpresasBusinessProcessorRules.SetID_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO] := Null; end; diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm index d961e190..053ad4e6 100644 --- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm +++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm @@ -286,8 +286,12 @@ object srvEmpresas: TsrvEmpresas TableField = 'REGISTRO_MERCANTIL' end item - DatasetField = 'IVA' - TableField = 'IVA' + DatasetField = 'ID_TIPO_IVA' + TableField = 'ID_TIPO_IVA' + end + item + DatasetField = 'ID_FORMA_PAGO' + TableField = 'ID_FORMA_PAGO' end> end> Name = 'Empresas' @@ -424,9 +428,12 @@ object srvEmpresas: TsrvEmpresas DictionaryEntry = 'Empresas_REGISTRO_MERCANTIL' end item - Name = 'IVA' - DataType = datFloat - DictionaryEntry = 'Empresas_IVA' + Name = 'ID_TIPO_IVA' + DataType = datSmallInt + end + item + Name = 'ID_FORMA_PAGO' + DataType = datSmallInt end> end item diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas index 48514023..d2c40a23 100644 --- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas +++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas @@ -33,6 +33,8 @@ type private protected function DarTiendaUsuario(const ID_EMPRESA: Integer; const ID_USUARIO: Integer): Integer; + function DarListaFormasPago: Binary; + function DarListaTiposIVA: Binary; end; implementation @@ -42,7 +44,7 @@ uses {Generated:} FactuGES_Invk, uDataModuleServer, uRORemoteDataModule, uDatabaseUtils, Dialogs, Variants, uROStreamSerializer, uROBinaryHelpers, uSesionesUtils, schEmpresasClient_Intf, uUsersManager, - uRestriccionesUsuarioUtils; + uRestriccionesUsuarioUtils, srvFormasPago_Impl, srvTiposIva_Impl; procedure Create_srvEmpresas(out anInstance : IUnknown); begin @@ -55,6 +57,30 @@ begin SessionManager := dmServer.SessionManager; end; +function TsrvEmpresas.DarListaFormasPago: Binary; +var + AFormasPagoServer : TsrvFormasPago; +begin + AFormasPagoServer := TsrvFormasPago.Create(nil); + try + Result := AFormasPagoServer.DarListaFormasPago; + finally + FreeAndNIL(AFormasPagoServer); + end; +end; + +function TsrvEmpresas.DarListaTiposIVA: Binary; +var + ATiposIVAServer : TsrvTiposIVA; +begin + ATiposIVAServer := TsrvTiposIVA.Create(nil); + try + Result := ATiposIVAServer.DarListaTiposIVA; + finally + FreeAndNIL(ATiposIVAServer); + end; +end; + function TsrvEmpresas.DarTiendaUsuario(const ID_EMPRESA, ID_USUARIO: Integer): Integer; var AContactosService : IsrvContactos; diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index f5c4e40b..e079b8b9 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -122,54 +122,86 @@ inherited fEditorEmpresa: TfEditorEmpresa end inherited eCalle: TcxDBTextEdit Top = 189 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 189 ExplicitWidth = 84 Width = 84 end inherited cbProvincia: TcxDBComboBox Top = 216 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 216 ExplicitWidth = 106 Width = 106 end inherited cbPoblacion: TcxDBComboBox Top = 243 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 243 ExplicitWidth = 100 Width = 100 end inherited eCodigoPostal: TcxDBTextEdit - Left = 289 + Left = 345 Top = 216 - ExplicitLeft = 289 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 345 ExplicitTop = 216 end inherited ePaginaWeb: TcxDBTextEdit - Left = 477 + Left = 533 Top = 216 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 216 ExplicitWidth = 165 Width = 165 end inherited eMailParticular: TcxDBTextEdit - Left = 477 + Left = 533 Top = 189 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 189 ExplicitWidth = 165 Width = 165 end inherited eMailTrabajo: TcxDBTextEdit - Left = 477 + Left = 533 Top = 162 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 162 ExplicitWidth = 129 Width = 129 end inherited cxDBMemo1: TcxDBMemo Top = 294 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 294 ExplicitWidth = 107 ExplicitHeight = 234 @@ -177,69 +209,107 @@ inherited fEditorEmpresa: TfEditorEmpresa Width = 107 end inherited eTlfParticular: TcxDBTextEdit - Left = 477 + Left = 533 Top = 57 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 57 ExplicitWidth = 91 Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 477 + Left = 533 Top = 30 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 30 ExplicitWidth = 127 Width = 127 end inherited eTlfMovil: TcxDBTextEdit - Left = 477 + Left = 533 Top = 84 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 84 ExplicitWidth = 155 Width = 155 end inherited eFax: TcxDBTextEdit - Left = 477 + Left = 533 Top = 111 - ExplicitLeft = 477 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 533 ExplicitTop = 111 ExplicitWidth = 121 Width = 121 end inherited eNombre: TcxDBTextEdit Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 108 Width = 108 end inherited eNIFCIF: TcxDBTextEdit Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 108 Width = 108 end inherited memRegistroMercantil: TcxDBMemo Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 76 Width = 76 end - inherited cxDBSpinEdit1: TcxDBSpinEdit - Top = 138 - ExplicitTop = 138 - end inherited cxDBImage1: TcxDBImage - Left = 382 + Left = 438 Top = 267 - ExplicitLeft = 382 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 438 ExplicitTop = 267 ExplicitWidth = 140 ExplicitHeight = 100 Height = 100 Width = 140 end + inherited cbFormaPago: TcxComboBox + Top = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 138 + ExplicitWidth = 359 + Width = 359 + end end end end @@ -319,6 +389,18 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited ToolBar1: TToolBar Width = 660 ExplicitWidth = 660 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas index 63f10b5c..efd6f321 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas @@ -121,6 +121,8 @@ end; procedure TfEditorEmpresa.SetController(const Value: IEmpresasController); begin FController := Value; + if Assigned(FController) then + ViewEmpresa.Controller := FController; end; procedure TfEditorEmpresa.SetViewEmpresa(const Value: IViewEmpresa); @@ -143,6 +145,7 @@ begin Empresa.DataTable.Active := True; pgPaginas.ActivePage := pagGeneral; +// frViewEmpresa1.cbFormaPago.Properties.OnEditValueChanged := frViewEmpresa1.FormaPagoEditValueChanged; FViewEmpresa.SetFocus; end; diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm index f8f34f38..1478411f 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm @@ -1,6 +1,7 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 590 Height = 385 + OnShow = CustomViewShow ExplicitWidth = 590 ExplicitHeight = 385 object dxLayoutControl1: TdxLayoutControl @@ -11,7 +12,11 @@ inherited frViewEmpresa: TfrViewEmpresa Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] + DesignSize = ( + 590 + 385) object PngSpeedButton1: TPngSpeedButton Left = 545 Top = 305 @@ -29,26 +34,30 @@ inherited frViewEmpresa: TfrViewEmpresa PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object eCalle: TcxDBTextEdit - Left = 117 - Top = 193 + Left = 162 + Top = 220 DataBinding.DataField = 'CALLE' DataBinding.DataSource = DADataSource Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 4 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 5 Width = 84 end object cbProvincia: TcxDBComboBox - Left = 117 - Top = 220 + Left = 162 + Top = 247 DataBinding.DataField = 'PROVINCIA' DataBinding.DataSource = DADataSource Properties.OnInitPopup = eProvinciaPropertiesInitPopup @@ -56,18 +65,24 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 5 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 6 Width = 106 end object cbPoblacion: TcxDBComboBox - Left = 117 - Top = 247 + Left = 162 + Top = 274 DataBinding.DataField = 'POBLACION' DataBinding.DataSource = DADataSource Properties.OnInitPopup = ePoblacionPropertiesInitPopup @@ -75,35 +90,45 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 8 Width = 100 end object eCodigoPostal: TcxDBTextEdit - Left = 248 - Top = 220 + Left = 299 + Top = 247 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = DADataSource Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 7 Width = 65 end object ePaginaWeb: TcxDBTextEdit - Left = 438 + Left = 489 Top = 220 DataBinding.DataField = 'PAGINA_WEB' DataBinding.DataSource = DADataSource @@ -111,17 +136,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 15 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 16 Width = 165 end object eMailParticular: TcxDBTextEdit - Left = 438 + Left = 489 Top = 193 DataBinding.DataField = 'EMAIL_2' DataBinding.DataSource = DADataSource @@ -129,17 +158,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 14 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 15 Width = 165 end object eMailTrabajo: TcxDBTextEdit - Left = 438 + Left = 489 Top = 166 DataBinding.DataField = 'EMAIL_1' DataBinding.DataSource = DADataSource @@ -147,36 +180,44 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 13 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 14 Width = 129 end object cxDBMemo1: TcxDBMemo Left = 22 - Top = 304 + Top = 331 DataBinding.DataField = 'NOTAS' DataBinding.DataSource = DADataSource Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 9 Height = 234 Width = 107 end object eTlfParticular: TcxDBTextEdit - Left = 438 + Left = 489 Top = 55 DataBinding.DataField = 'TELEFONO_2' DataBinding.DataSource = DADataSource @@ -184,17 +225,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 11 Width = 91 end object eTlfTrabajo: TcxDBTextEdit - Left = 438 + Left = 489 Top = 28 DataBinding.DataField = 'TELEFONO_1' DataBinding.DataSource = DADataSource @@ -202,17 +247,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 10 Width = 127 end object eTlfMovil: TcxDBTextEdit - Left = 438 + Left = 489 Top = 82 DataBinding.DataField = 'MOVIL_1' DataBinding.DataSource = DADataSource @@ -220,17 +269,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 12 Width = 155 end object eFax: TcxDBTextEdit - Left = 438 + Left = 489 Top = 109 DataBinding.DataField = 'FAX' DataBinding.DataSource = DADataSource @@ -238,17 +291,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 13 Width = 121 end object eNombre: TcxDBTextEdit - Left = 117 + Left = 162 Top = 28 DataBinding.DataField = 'NOMBRE' DataBinding.DataSource = DADataSource @@ -257,17 +314,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 108 end object eNIFCIF: TcxDBTextEdit - Left = 117 + Left = 162 Top = 55 DataBinding.DataField = 'NIF_CIF' DataBinding.DataSource = DADataSource @@ -276,17 +337,21 @@ inherited frViewEmpresa: TfrViewEmpresa Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 108 end object memRegistroMercantil: TcxDBMemo - Left = 117 + Left = 162 Top = 82 DataBinding.DataField = 'REGISTRO_MERCANTIL' DataBinding.DataSource = DADataSource @@ -295,38 +360,22 @@ inherited frViewEmpresa: TfrViewEmpresa Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 Height = 48 Width = 76 end - object cxDBSpinEdit1: TcxDBSpinEdit - Left = 117 - Top = 136 - DataBinding.DataField = 'IVA' - DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - 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 = 3 - Width = 60 - end object cxDBImage1: TcxDBImage - Left = 343 + Left = 394 Top = 277 DataBinding.DataSource = DADataSource Properties.Stretch = True @@ -334,13 +383,71 @@ inherited frViewEmpresa: TfrViewEmpresa Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 16 + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 17 Height = 100 Width = 140 end + object cbFormaPago: TcxComboBox + Left = 162 + Top = 163 + Anchors = [akLeft, akTop, akRight] + Properties.DropDownListStyle = lsEditFixedList + Properties.DropDownRows = 25 + Properties.ImmediatePost = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 4 + Width = 359 + end + object cbTipoIVA: TcxComboBox + Left = 162 + Top = 136 + Anchors = [akLeft, akTop, akRight] + Properties.DropDownListStyle = lsEditFixedList + Properties.DropDownRows = 25 + Properties.ImmediatePost = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 3 + Width = 202 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -374,9 +481,13 @@ inherited frViewEmpresa: TfrViewEmpresa ControlOptions.ShowBorder = False end object dxLayoutControl1Item16: TdxLayoutItem - AutoAligns = [aaVertical] Caption = 'IVA por defecto:' - Control = cxDBSpinEdit1 + Control = cbTipoIVA + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item18: TdxLayoutItem + Caption = 'Forma de pago por defecto:' + Control = cbFormaPago ControlOptions.ShowBorder = False end end diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas index 17f4355f..46f2f449 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas @@ -10,7 +10,7 @@ uses cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxMaskEdit, cxSpinEdit, cxImage, JvExControls, JvBitmapButton, ActnList, ImgList, PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, PngSpeedButton, uDAInterfaces, - cxGraphics, cxDropDownEdit; + cxGraphics, cxDropDownEdit, uEmpresasController; type IViewEmpresa = interface(IViewBase) @@ -18,6 +18,9 @@ type function GetEmpresa: IBizEmpresa; procedure SetEmpresa(const Value: IBizEmpresa); property Empresa: IBizEmpresa read GetEmpresa write SetEmpresa; + function GetController : IEmpresasController; + procedure SetController (const Value : IEmpresasController); + property Controller : IEmpresasController read GetController write SetController; end; TfrViewEmpresa = class(TfrViewBase, IViewEmpresa) @@ -64,8 +67,6 @@ type dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group9: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup; - cxDBSpinEdit1: TcxDBSpinEdit; - dxLayoutControl1Item16: TdxLayoutItem; ActionList1: TActionList; actAnadir: TAction; actEliminar: TAction; @@ -79,22 +80,36 @@ type dxLayoutControl1Item20: TdxLayoutItem; dxLayoutControl1Group12: TdxLayoutGroup; dxLayoutControl1Group13: TdxLayoutGroup; + dxLayoutControl1Item18: TdxLayoutItem; + cbFormaPago: TcxComboBox; + dxLayoutControl1Item16: TdxLayoutItem; + cbTipoIVA: TcxComboBox; procedure actAnadirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); procedure actEliminarUpdate(Sender: TObject); procedure actAnadirUpdate(Sender: TObject); procedure eProvinciaPropertiesInitPopup(Sender: TObject); procedure ePoblacionPropertiesInitPopup(Sender: TObject); + procedure FormaPagoEditValueChanged(Sender: TObject); + procedure TipoIVAEditValueChanged(Sender: TObject); + procedure CustomViewShow(Sender: TObject); + private FEmpresa: IBizEmpresa; + FController : IEmpresasController; FProvincias : TStringList; FPoblaciones : TStringList; - procedure CargarProvincias; - procedure CargarPoblaciones; - protected + FFormasPago: TStringList; + FTiposIVA: TStringList; function GetEmpresa: IBizEmpresa; procedure SetEmpresa(const Value: IBizEmpresa); + function GetController : IEmpresasController; + procedure SetController (const Value : IEmpresasController); + procedure CargarProvincias; + procedure CargarPoblaciones; + public + property Controller : IEmpresasController read GetController write SetController; constructor Create(AOwner : TComponent); override; destructor Destroy; override; end; @@ -218,9 +233,40 @@ begin FPoblaciones := NIL; end; +procedure TfrViewEmpresa.CustomViewShow(Sender: TObject); +var + i: Integer; +begin + inherited; + + //Activamos la forma de pago que tenga la empresa + cbFormaPago.ItemIndex := 0; + for i := 0 to FFormasPago.Count - 1 do + if IntToStr(FEmpresa.ID_FORMA_PAGO) = FFormasPago.Values[FFormasPago.Names[i]] then + cbFormaPago.ItemIndex := i; + + cbFormaPago.Properties.OnEditValueChanged := FormaPagoEditValueChanged; + + //Activamos el tipo iva que tenga la empresa + cbTipoIVA.ItemIndex := 0; + for i := 0 to FTiposIVA.Count - 1 do + if IntToStr(FEmpresa.ID_TIPO_IVA) = FTiposIVA.Values[FTiposIVA.Names[i]] then + cbTipoIVA.ItemIndex := i; + + cbTipoIVA.Properties.OnEditValueChanged := TipoIVAEditValueChanged; +end; + destructor TfrViewEmpresa.Destroy; begin - if Assigned(FProvincias) then + FController := Nil; + + if Assigned(FTiposIVA) then + FreeANDNIL(FTiposIVA); + + if Assigned(FFormasPago) then + FreeANDNIL(FFormasPago); + + if Assigned(FProvincias) then FreeANDNIL(FProvincias); if Assigned(FPoblaciones) then @@ -254,18 +300,83 @@ begin end; end; +procedure TfrViewEmpresa.FormaPagoEditValueChanged(Sender: TObject); +var + IDFormaPago: String; +begin + IDFormaPago := ''; + if Assigned(FFormasPago) then + IDFormaPago := FFormasPago.Values[cbFormaPago.EditValue]; + + Controller.AsignarIDFormaPago(FEmpresa, IDFormaPago); +end; + +function TfrViewEmpresa.GetController: IEmpresasController; +begin + Result := FController; +end; + function TfrViewEmpresa.GetEmpresa: IBizEmpresa; begin Result := FEmpresa; end; +procedure TfrViewEmpresa.SetController(const Value: IEmpresasController); +var + i: Integer; +begin + FController := Value; + + if Assigned(FController) then + begin + FFormasPago := FController.DarListaFormasPago; + if Assigned(FFormasPago) then + with cbFormaPago.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to FFormasPago.Count - 1 do + Add(FFormasPago.Names[i]); + finally + EndUpdate; + end; + end; + + FTiposIVA := FController.DarListaTiposIVA; + if Assigned(FTiposIVA) then + with cbTipoIVA.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to FTiposIVA.Count - 1 do + Add(FTiposIVA.Names[i]); + finally + EndUpdate; + end; + end; + end; +end; + procedure TfrViewEmpresa.SetEmpresa(const Value: IBizEmpresa); begin FEmpresa := Value; if Assigned(FEmpresa) then DADataSource.DataTable := FEmpresa.DataTable else - DADataSource.DataTable := NIL; + DADataSource.DataTable := NIL; +end; + +procedure TfrViewEmpresa.TipoIVAEditValueChanged(Sender: TObject); +var + IDTipoIVA: String; +begin + IDTipoIVA := ''; + if Assigned(FTiposIVA) then + IDTipoIVA := FTiposIVA.Values[cbTipoIVA.EditValue]; + + Controller.AsignarIDTipoIVA(FEmpresa, IDTipoIVA); end; initialization diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index 11dfa9c6..e956899b 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -16,7 +16,7 @@ const CATEGORIA_CLIENTE = 1; CATEGORIA_PROVEEDOR = 2; CATEGORIA_VENDEDOR = 3; - CATEGORIA_INSTALADOR = 4; + CATEGORIA_INSTALADOR = 4; type IBizContacto = interface (IContactos) @@ -383,8 +383,7 @@ implementation uses uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App, - uBizEmpresasTiendas, uTiposIVAController, uBizTiposIVA, - uFormasPagoController, uBizFormasPago; + uBizEmpresasTiendas, uBizTiposIVA, uBizFormasPago; const PROVEEDOR_REGIMEN_IVA = 'General'; @@ -647,9 +646,6 @@ begin end; procedure TBizCliente.IniciarValoresContactoNuevo; -var - AFormaPagoController: IFormasPagoController; - ATiposIVAController: ITiposIVAController; begin inherited; ID_CATEGORIA := CATEGORIA_CLIENTE; @@ -665,19 +661,8 @@ begin IGNORAR_CONTABILIDAD := 1; TIENE_SUBCUENTA := 0; - AFormaPagoController := TFormasPagoController.Create; - try - ID_FORMA_PAGO := AFormaPagoController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Clientes.FormaPago')) - finally - AFormaPagoController := NIL; - end; - - ATiposIVAController := TTiposIVAController.Create; - try - ID_TIPO_IVA := ATiposIVAController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Clientes.TipoIVA')) - finally - ATiposIVAController := NIL; - end; + ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; + ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; end; @@ -734,9 +719,6 @@ begin end; procedure TBizProveedor.IniciarValoresContactoNuevo; -var - AFormaPagoController: IFormasPagoController; - ATiposIVAController: ITiposIVAController; begin inherited; ID_CATEGORIA := CATEGORIA_PROVEEDOR; @@ -750,19 +732,8 @@ begin TIENE_SUBCUENTA := 0; ES_ACREEDOR := 0; - AFormaPagoController := TFormasPagoController.Create; - try - ID_FORMA_PAGO := AFormaPagoController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Proveedores.FormaPago')) - finally - AFormaPagoController := NIL; - end; - - ATiposIVAController := TTiposIVAController.Create; - try - ID_TIPO_IVA := ATiposIVAController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Proveedores.TipoIVA')) - finally - ATiposIVAController := NIL; - end; + ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; + ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; end; constructor TBizProveedor.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 19295191..f58cffc8 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -651,16 +651,18 @@ begin if (AFactura.IGNORAR_CONTABILIDAD = 0) and (AFactura.Cliente.SubCuentas.ID < 1) then raise Exception.Create('Para que la factura pueda pasar la parte contable es necesario que el proveedor tenga asignada una subcuenta'); - { Esta validación puede saltar cuando se generan facturas automáticamente - por albaranes o pedidos y el cliente no tiene Tipo de IVA puesto. } -{ if (AFactura.ID_TIPO_IVA = 0) then - raise Exception.Create('Debe indicar un tipo de IVA para esta factura');} - - //En caso de ser un Abono no podra tener un importe total positivo + //En caso de ser un Abono no podra tener un importe total positivo if (AFactura.TIPO = CTE_TIPO_ABONO) then if (AFactura.IMPORTE_TOTAL > 0) then raise Exception.Create('Un abono nunca no puede tener un importe positivo, asegurese que las cantidades sean negativas'); + { Esta validación puede saltar cuando se generan facturas automáticamente + por albaranes o pedidos y el cliente no tiene Tipo de IVA puesto, se cambia, + para signar automáticamente por defecto a la factura la primera forma de pago, + e iva disponible (CONTADO, IVA16), en la clase de negocio } +{ if (AFactura.ID_TIPO_IVA = 0) then + raise Exception.Create('Debe indicar un tipo de IVA para esta factura');} + { Asegurarse de valores en campos "automáticos" tanto en MODIFICACIÓN como en INSERCIÓN. } AFactura.Edit; diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index d005810e..562e3212 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -255,12 +255,20 @@ begin FECHA_FACTURA := DateOf(Now); TIPO := CTE_TIPO_FACTURA; ID_CLIENTE := ID_NULO; - IVA := AppFactuGES.EmpresaActiva.IVA; + + ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; + ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; + RE := 0; SITUACION := CTE_PENDIENTE; ID_TIENDA := AppFactuGES.TiendaActiva.ID; TIENDA := AppFactuGES.TiendaActiva.NOMBRE; - IGNORAR_CONTABILIDAD := 0; + + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else + IGNORAR_CONTABILIDAD := 1; end; procedure TBizFacturaCliente.IVAOnChange(Sender: TDACustomField); diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index 5ab6a158..0ac19973 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -454,14 +454,13 @@ begin end; {$IFDEF CONTABILIDAD} - frViewListaSubCuentas1.eContabilizar.EditValue := FFactura.IGNORAR_CONTABILIDAD; - frViewListaSubCuentas1.ElegirSubCuenta(FFactura.ID_SUBCUENTA); +// frViewListaSubCuentas1.eContabilizar.EditValue := FFactura.IGNORAR_CONTABILIDAD; +// frViewListaSubCuentas1.ElegirSubCuenta(FFactura.ID_SUBCUENTA); {$ENDIF} end else begin frViewFacturaCliente1.frViewClienteFactura1.OnClienteChanged := NIL; - frViewFacturaCliente1.frViewClienteFactura1.Cliente := NIL; dsDataTable.DataTable := NIL; frViewTotales1.DADataSource.DataTable := NIL; frViewTotales1.dsTiposIVA.DataTable := NIL; diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index 8e20c331..d856f8aa 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -261,7 +261,10 @@ begin FECHA_FACTURA := DateOf(Now); ID_PROVEEDOR := ID_NULO; TIPO := CTE_TIPO_FACTURA; - IVA := AppFactuGES.EmpresaActiva.IVA; + + ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; + ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; + RE := 0; SITUACION := CTE_PENDIENTE; ID_TIENDA := AppFactuGES.TiendaActiva.ID; diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm index f437d985..71af1d7e 100644 --- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm +++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm @@ -13,9 +13,9 @@ object srvFormasPago: TsrvFormasPago Top = 90 DiagramData = ''#13#10' '#13#10' '#13#10' '#13#10' '#13#10''#13#10 + 'idth="400" Height="300">'#13#10' '#13#10' '#13#10' '#13#10''#13#10 end object DataDictionary: TDADataDictionary Fields = < @@ -100,6 +100,38 @@ object srvFormasPago: TsrvFormasPago DataDictionary = DataDictionary Diagrams = Diagrams Datasets = < + item + Params = <> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + Name = 'IBX' + SQL = 'Select ID, DESCRIPCION'#10'from FORMAS_PAGO'#10'order by DESCRIPCION'#10 + StatementType = stSQL + ColumnMappings = < + item + DatasetField = 'ID' + TableField = 'ID' + end + item + DatasetField = 'DESCRIPCION' + TableField = 'DESCRIPCION' + end> + end> + Name = 'ListaFormasPago' + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end> + end item Params = <> Statements = < diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas index 650618ef..bab0013d 100644 --- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas +++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas @@ -28,10 +28,11 @@ type schFormasPago: TDASchema; DataDictionary: TDADataDictionary; procedure DARemoteServiceCreate(Sender: TObject); - procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject; - var aConnectionName: string); - private - protected + procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject; var aConnectionName: string); + + public + function DarListaFormasPago: Binary; + end; implementation @@ -39,7 +40,7 @@ implementation {$R *.dfm} uses {Generated:} FactuGES_Invk, uDataModuleServer, - uDatabaseUtils; + uDatabaseUtils, uDAInterfaces, uROClasses; procedure Create_srvFormasPago(out anInstance : IUnknown); begin @@ -52,6 +53,41 @@ begin SessionManager := dmServer.SessionManager; end; +function TsrvFormasPago.DarListaFormasPago: Binary; +var + ASchema : TDASchema; + AConn : IDAConnection; + dsData: IDADataset; + ALista : TStringList; +begin + Result := Binary.Create; + + ASchema := schFormasPago; + AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName); + + try + dsData := ASchema.NewDataset(AConn, 'ListaFormasPago'); + except + RaiseError('No existe la tabla FORMAS_PAGO'); + end; + + ALista := TStringList.Create; + try + dsData.Active := True; + while not dsData.EOF do + begin + ALista.Add(Format('%s=%d', [dsData.Fields[1].AsString, dsData.Fields[0].AsInteger])); + dsData.Next; + end; + + ALista.SaveToStream(Result); + finally + FreeANDNIL(ALista); + dsData := NIL; + AConn := NIL; + end; +end; + procedure TsrvFormasPago.DataAbstractServiceBeforeAcquireConnection( aSender: TObject; var aConnectionName: string); begin diff --git a/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc b/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc index 25042e25..ffb17dfd 100644 --- a/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc +++ b/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo Acana\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf5F.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3BC.tmp */ diff --git a/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc b/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc index 1ab1968c..6c0d8430 100644 --- a/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc +++ b/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo Acana\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */ /* C:\Codigo Acana\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf5D.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3BA.tmp */ diff --git a/Source/Modulos/Recibos de cliente/Model/uBizPagosCliente.pas b/Source/Modulos/Recibos de cliente/Model/uBizPagosCliente.pas index 01feb1aa..8f32f9c5 100644 --- a/Source/Modulos/Recibos de cliente/Model/uBizPagosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Model/uBizPagosCliente.pas @@ -50,7 +50,7 @@ type implementation uses - DB; + DB, uFactuGES_App; { TBizPagosCliente } @@ -66,7 +66,11 @@ end; procedure TBizPagosCliente.IniciarValoresIBizPagosClienteNuevo; begin - IGNORAR_CONTABILIDAD := 0; + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else + IGNORAR_CONTABILIDAD := 1; end; procedure TBizPagosCliente.OnNewRecord(Sender: TDADataTable); diff --git a/Source/Modulos/Recibos de proveedor/Model/uBizPagosProveedor.pas b/Source/Modulos/Recibos de proveedor/Model/uBizPagosProveedor.pas index 3d72aecf..b1df7d1b 100644 --- a/Source/Modulos/Recibos de proveedor/Model/uBizPagosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Model/uBizPagosProveedor.pas @@ -50,7 +50,7 @@ type implementation uses - DB; + DB, uFactuGES_App; { TBizPagosProveedor } @@ -66,7 +66,11 @@ end; procedure TBizPagosProveedor.IniciarValoresPagosProveedorNuevo; begin - IGNORAR_CONTABILIDAD := 0; + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else + IGNORAR_CONTABILIDAD := 1; end; procedure TBizPagosProveedor.OnNewRecord(Sender: TDADataTable); diff --git a/Source/Modulos/Remesas de cliente/Model/schRemesasClienteClient_Intf.pas b/Source/Modulos/Remesas de cliente/Model/schRemesasClienteClient_Intf.pas index e749ecca..5bfe67ac 100644 --- a/Source/Modulos/Remesas de cliente/Model/schRemesasClienteClient_Intf.pas +++ b/Source/Modulos/Remesas de cliente/Model/schRemesasClienteClient_Intf.pas @@ -9,7 +9,7 @@ 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_RemesasCliente = '{A346376B-965B-4865-A253-9DDF4D88E9C5}'; + RID_RemesasCliente = '{DE6CB3E1-9C21-44E9-827D-18877E6C8E67}'; { Data table names } nme_RemesasCliente = 'RemesasCliente'; @@ -57,7 +57,7 @@ const type { IRemesasCliente } IRemesasCliente = interface(IDAStronglyTypedDataTable) - ['{FDEB4748-8F61-4BFF-BED3-8A4904D1F593}'] + ['{2D9ED2DE-5E2C-4014-BFC9-C7D6A770217A}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Remesas de cliente/Model/schRemesasClienteServer_Intf.pas b/Source/Modulos/Remesas de cliente/Model/schRemesasClienteServer_Intf.pas index cf123246..11564063 100644 --- a/Source/Modulos/Remesas de cliente/Model/schRemesasClienteServer_Intf.pas +++ b/Source/Modulos/Remesas de cliente/Model/schRemesasClienteServer_Intf.pas @@ -9,12 +9,12 @@ 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_RemesasClienteDelta = '{F8C1BED7-3DDB-4A8B-9E23-7ACFF1822443}'; + RID_RemesasClienteDelta = '{7503D9C6-5E94-46CA-BFCA-2C514AA6E464}'; type { IRemesasClienteDelta } IRemesasClienteDelta = interface(IRemesasCliente) - ['{F8C1BED7-3DDB-4A8B-9E23-7ACFF1822443}'] + ['{7503D9C6-5E94-46CA-BFCA-2C514AA6E464}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; diff --git a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm index f1931b92..dc637b57 100644 --- a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm +++ b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm @@ -55,6 +55,39 @@ object srvTiposIVA: TsrvTiposIVA DataDictionary = DataDictionary Diagrams = Diagrams Datasets = < + item + Params = <> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + TargetTable = 'TIPOS_IVA' + Name = 'IBX' + SQL = 'Select ID, DESCRIPCION'#10'from TIPOS_IVA'#10'order by DESCRIPCION'#10 + StatementType = stSQL + ColumnMappings = < + item + DatasetField = 'ID' + TableField = 'ID' + end + item + DatasetField = 'DESCRIPCION' + TableField = 'DESCRIPCION' + end> + end> + Name = 'ListaTiposIVA' + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end> + end item Params = <> Statements = < diff --git a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas index 888e5d5b..27232112 100644 --- a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas +++ b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas @@ -28,15 +28,15 @@ type procedure DARemoteServiceCreate(Sender: TObject); procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject; var aConnectionName: string); - private - protected + public + function DarListaTiposIVA: Binary; end; implementation {$R *.dfm} uses - {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils; + {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils, uROClasses; procedure Create_srvTiposIVA(out anInstance : IUnknown); begin @@ -49,6 +49,41 @@ begin SessionManager := dmServer.SessionManager; end; +function TsrvTiposIVA.DarListaTiposIVA: Binary; +var + ASchema : TDASchema; + AConn : IDAConnection; + dsData: IDADataset; + ALista : TStringList; +begin + Result := Binary.Create; + + ASchema := schTiposIVA; + AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName); + + try + dsData := ASchema.NewDataset(AConn, 'ListaTiposIVA'); + except + RaiseError('No existe la tabla TIPOS_IVA'); + end; + + ALista := TStringList.Create; + try + dsData.Active := True; + while not dsData.EOF do + begin + ALista.Add(Format('%s=%d', [dsData.Fields[1].AsString, dsData.Fields[0].AsInteger])); + dsData.Next; + end; + + ALista.SaveToStream(Result); + finally + FreeANDNIL(ALista); + dsData := NIL; + AConn := NIL; + end; +end; + procedure TsrvTiposIVA.DataAbstractServiceBeforeAcquireConnection( aSender: TObject; var aConnectionName: string); begin diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL index 2e8f8d2c..92e69993 100644 --- a/Source/Servicios/FactuGES.RODL +++ b/Source/Servicios/FactuGES.RODL @@ -103,6 +103,18 @@ + + + + + + + + + + + + diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas index 3b80262c..2de5f7de 100644 --- a/Source/Servicios/FactuGES_Intf.pas +++ b/Source/Servicios/FactuGES_Intf.pas @@ -285,6 +285,8 @@ type IsrvEmpresas = interface(IDataAbstractService) ['{590F06D1-26B4-435B-B636-50CB8FFE6353}'] function DarTiendaUsuario(const ID_EMPRESA: Integer; const ID_USUARIO: Integer): Integer; + function DarListaFormasPago: Binary; + function DarListaTiposIVA: Binary; end; { CosrvEmpresas } @@ -298,6 +300,8 @@ type function __GetInterfaceName:string; override; function DarTiendaUsuario(const ID_EMPRESA: Integer; const ID_USUARIO: Integer): Integer; + function DarListaFormasPago: Binary; + function DarListaTiposIVA: Binary; end; { IsrvConfiguracion } @@ -1418,6 +1422,38 @@ begin end end; +function TsrvEmpresas_Proxy.DarListaFormasPago: Binary; +begin + try + result := nil; + __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaFormasPago'); + __Message.Finalize; + + __TransportChannel.Dispatch(__Message); + + __Message.Read('Result', TypeInfo(Binary), result, []); + finally + __Message.UnsetAttributes(__TransportChannel); + __Message.FreeStream; + end +end; + +function TsrvEmpresas_Proxy.DarListaTiposIVA: Binary; +begin + try + result := nil; + __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaTiposIVA'); + __Message.Finalize; + + __TransportChannel.Dispatch(__Message); + + __Message.Read('Result', TypeInfo(Binary), result, []); + finally + __Message.UnsetAttributes(__TransportChannel); + __Message.FreeStream; + end +end; + { CosrvConfiguracion } class function CosrvConfiguracion.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvConfiguracion; diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas index 8e3cfa57..dac52056 100644 --- a/Source/Servicios/FactuGES_Invk.pas +++ b/Source/Servicios/FactuGES_Invk.pas @@ -55,6 +55,8 @@ type protected published procedure Invoke_DarTiendaUsuario(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); + procedure Invoke_DarListaFormasPago(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); + procedure Invoke_DarListaTiposIVA(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); end; TsrvConfiguracion_Invoker = class(TDataAbstractService_Invoker) @@ -416,6 +418,56 @@ begin end; end; +procedure TsrvEmpresas_Invoker.Invoke_DarListaFormasPago(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); +{ function DarListaFormasPago: Binary; } +var + lResult: Binary; + __lObjectDisposer: TROObjectDisposer; +begin + lResult := nil; + try + lResult := (__Instance as IsrvEmpresas).DarListaFormasPago; + + __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvEmpresas', 'DarListaFormasPagoResponse'); + __Message.Write('Result', TypeInfo(Binary), lResult, []); + __Message.Finalize; + __Message.UnsetAttributes(__Transport); + + finally + __lObjectDisposer := TROObjectDisposer.Create(__Instance); + try + __lObjectDisposer.Add(lResult); + finally + __lObjectDisposer.Free(); + end; + end; +end; + +procedure TsrvEmpresas_Invoker.Invoke_DarListaTiposIVA(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); +{ function DarListaTiposIVA: Binary; } +var + lResult: Binary; + __lObjectDisposer: TROObjectDisposer; +begin + lResult := nil; + try + lResult := (__Instance as IsrvEmpresas).DarListaTiposIVA; + + __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvEmpresas', 'DarListaTiposIVAResponse'); + __Message.Write('Result', TypeInfo(Binary), lResult, []); + __Message.Finalize; + __Message.UnsetAttributes(__Transport); + + finally + __lObjectDisposer := TROObjectDisposer.Create(__Instance); + try + __lObjectDisposer.Add(lResult); + finally + __lObjectDisposer.Free(); + end; + end; +end; + { TsrvConfiguracion_Invoker } procedure TsrvConfiguracion_Invoker.Invoke_darValor(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res index c2f7be36..1cfda716 100644 Binary files a/Source/Servicios/RODLFILE.res and b/Source/Servicios/RODLFILE.res differ diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 32de883e..59663465 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index f14ededc..1169b6e2 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -73,8 +73,6 @@ uses uBizEjerciciosServer in '..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas', srvContabilidad_Impl in '..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas' {srvContabilidad: TDataAbstractService}, uBizPagosClienteServer in '..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas', - schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas', - schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas', uBizRemesasClienteServer in '..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas', uBizRemesasProveedorServer in '..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas', schRemesasProveedorClient_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas', @@ -114,8 +112,6 @@ uses schComisionesServer_Intf in '..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas', uRptComisiones_Server in '..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas' {RptComisiones: TDataModule}, srvProvinciasPoblaciones_Impl in '..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas' {srvProvinciasPoblaciones: TRORemoteDataModule}, - schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', - schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', schEjerciciosClient_Intf in '..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas', schEjerciciosServer_Intf in '..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas', schUsuariosClient_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas', @@ -131,7 +127,11 @@ uses schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', + schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', + schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', + schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas', + schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 17af303d..c63e0121 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "2.2.4.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductVersion", "2.2.4.0\0" - VALUE "CompileDate", "jueves, 20 de noviembre de 2008 12:46\0" + VALUE "CompileDate", "jueves, 20 de noviembre de 2008 20:19\0" END END BLOCK "VarFileInfo"