diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk
index 85ff7b45..2400cb64 100644
--- a/Source/ApplicationBase/ApplicationBase.dpk
+++ b/Source/ApplicationBase/ApplicationBase.dpk
@@ -50,8 +50,8 @@ contains
uIEditorDatosBancarioEmpresa in 'Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas',
uIEditorEmpresa in 'Empresas\Controller\View\uIEditorEmpresa.pas',
uViewEmpresa in 'Empresas\Views\uViewEmpresa.pas' {frViewEmpresa: TFrame},
- uEditorDatosBancariosEmpresa in 'Empresas\Views\uEditorDatosBancariosEmpresa.pas',
- uEditorEmpresa in 'Empresas\Views\uEditorEmpresa.pas',
+ uEditorDatosBancariosEmpresa in 'Empresas\Views\uEditorDatosBancariosEmpresa.pas' {fEditorUsuarios: TForm},
+ uEditorEmpresa in 'Empresas\Views\uEditorEmpresa.pas' {fEditorEmpresas: TForm},
uEmpresasViewRegister in 'Empresas\Views\uEmpresasViewRegister.pas',
uViewDatosBancarios in 'Empresas\Views\uViewDatosBancarios.pas' {frViewDatosBancarios: TFrame},
uBizUsuarios in 'Usuarios\Model\uBizUsuarios.pas',
@@ -68,7 +68,7 @@ contains
uViewPerfilUsuario in 'Usuarios\Views\uViewPerfilUsuario.pas' {frViewPerfilUsuario: TFrame},
uIEditorPerfilesUsuario in 'Usuarios\Controller\View\uIEditorPerfilesUsuario.pas',
uIEditorPerfilUsuario in 'Usuarios\Controller\View\uIEditorPerfilUsuario.pas',
- uEditorUsuarios in 'Usuarios\Views\uEditorUsuarios.pas' {fEditorUsuarios},
+ uEditorUsuarios in 'Usuarios\Views\uEditorUsuarios.pas' {fEditorUsuarios: TForm},
uViewUsuarios in 'Usuarios\Views\uViewUsuarios.pas' {frViewUsuarios: TFrame},
uEditorUsuario in 'Usuarios\Views\uEditorUsuario.pas' {fEditorUsuario: TFrame},
uViewUsuario in 'Usuarios\Views\uViewUsuario.pas' {frViewUsuario: TFrame},
diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index cd6d6caf..82f5ea20 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -55,10 +55,6 @@
MainSource
-
-
-
-
@@ -67,13 +63,23 @@
+
+
+
+
-
-
+
+
+ TForm
+
+
+
+ TForm
+
@@ -122,6 +128,7 @@
+ T
diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
index 25f0bc44..01fba3b7 100644
--- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
+++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
@@ -24,6 +24,11 @@ type
function ToStringList(AEmpresa : IBizEmpresa) : TStringList;
function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList;
+
+ 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)
@@ -49,12 +54,17 @@ type
function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual;
function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList;
+
+ function DarListaFormasPago: TStringList;
+ function DarListaTiposIVA: TStringList;
+ Procedure AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
+ Procedure AsignarIDTipoIVA(AEmpresa: IBizEmpresa; const IDTipoIVA: Variant);
end;
implementation
uses
- uEditorRegistryUtils, cxControls, DB, uFactuGES_App, uStringsUtils,
+ uEditorRegistryUtils, cxControls, DB, uFactuGES_App, uStringsUtils,
uDataModuleEmpresas, uIEditorEmpresa, uBizEmpresasDatosBancarios;
{ TEmpresasController }
@@ -64,6 +74,40 @@ 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)
@@ -145,6 +189,26 @@ begin
end;
end;
+function TEmpresasController.DarListaFormasPago: TStringList;
+begin
+ ShowHourglassCursor;
+ try
+ Result := FDataModule.DarListaFormasPago;
+ finally
+ HideHourglassCursor;
+ end;
+end;
+
+function TEmpresasController.DarListaTiposIVA: TStringList;
+begin
+ ShowHourglassCursor;
+ try
+ Result := FDataModule.DarListaTiposIVA;
+ finally
+ HideHourglassCursor;
+ end;
+end;
+
procedure TEmpresasController.DescartarCambios(AEmpresa: IBizEmpresa);
begin
if not Assigned(AEmpresa) then
diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm
index f1907d2a..3955d128 100644
--- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm
+++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm
@@ -180,11 +180,6 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
DisplayLabel = 'Registro mercantil'
DictionaryEntry = 'Empresas_REGISTRO_MERCANTIL'
end
- item
- Name = 'IVA'
- DataType = datFloat
- DictionaryEntry = 'Empresas_IVA'
- end
item
Name = 'PARAM_TIEMPO'
DataType = datCurrency
@@ -192,6 +187,14 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
item
Name = 'PARAM_MARGEN'
DataType = datFloat
+ end
+ item
+ 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 9b5ae873..640b9ccb 100644
--- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas
+++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas
@@ -26,6 +26,9 @@ type
function GetItem(const ID : Integer) : IBizEmpresa;
function NewItem : IBizEmpresa;
function GetItems : IBizEmpresa;
+
+ function DarListaFormasPago: TStringList;
+ function DarListaTiposIVA: TStringList;
end;
implementation
@@ -33,7 +36,7 @@ implementation
{$R *.DFM}
uses
- uDataModuleConexion, uDataTableUtils, Dialogs,
+ uDataModuleConexion, uDataTableUtils, Dialogs, uROTypes,
FactuGES_Intf, schEmpresasClient_Intf, cxControls;
procedure TDataModuleEmpresas.DAClientDataModuleCreate(Sender: TObject);
@@ -42,6 +45,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.GetItem(const ID: Integer): IBizEmpresa;
begin
ShowHourglassCursor;
diff --git a/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas b/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas
index e87571fa..a9fd14d2 100644
--- a/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas
+++ b/Source/ApplicationBase/Empresas/Model/Data/uIDataModuleEmpresas.pas
@@ -12,6 +12,9 @@ type
function GetItem(const ID : Integer) : IBizEmpresa;
function NewItem : IBizEmpresa;
function GetItems : IBizEmpresa;
+
+ 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 ec60f78e..f5ab21b8 100644
--- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
+++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
@@ -9,8 +9,8 @@ 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_Empresas = '{9B1E99A5-EF96-4942-8C46-7505F5501BB3}';
- RID_EmpresasDatosBanco = '{58EF2E5E-97CA-4654-87BD-C6DA7A2F911C}';
+ RID_Empresas = '{79714FFE-2D2C-486D-B2CD-5329B3FD9852}';
+ RID_EmpresasDatosBanco = '{871CEF95-5EFE-43A0-8F23-299CB80E4C3C}';
{ Data table names }
nme_Empresas = 'Empresas';
@@ -39,9 +39,10 @@ const
fld_EmpresasUSUARIO = 'USUARIO';
fld_EmpresasLOGOTIPO = 'LOGOTIPO';
fld_EmpresasREGISTRO_MERCANTIL = 'REGISTRO_MERCANTIL';
- fld_EmpresasIVA = 'IVA';
fld_EmpresasPARAM_TIEMPO = 'PARAM_TIEMPO';
fld_EmpresasPARAM_MARGEN = 'PARAM_MARGEN';
+ fld_EmpresasID_TIPO_IVA = 'ID_TIPO_IVA';
+ fld_EmpresasID_FORMA_PAGO = 'ID_FORMA_PAGO';
{ Empresas field indexes }
idx_EmpresasID = 0;
@@ -66,9 +67,10 @@ const
idx_EmpresasUSUARIO = 19;
idx_EmpresasLOGOTIPO = 20;
idx_EmpresasREGISTRO_MERCANTIL = 21;
- idx_EmpresasIVA = 22;
- idx_EmpresasPARAM_TIEMPO = 23;
- idx_EmpresasPARAM_MARGEN = 24;
+ idx_EmpresasPARAM_TIEMPO = 22;
+ idx_EmpresasPARAM_MARGEN = 23;
+ idx_EmpresasID_TIPO_IVA = 24;
+ idx_EmpresasID_FORMA_PAGO = 25;
{ EmpresasDatosBanco fields }
fld_EmpresasDatosBancoID = 'ID';
@@ -99,7 +101,7 @@ const
type
{ IEmpresas }
IEmpresas = interface(IDAStronglyTypedDataTable)
- ['{FADCCB5A-1903-4E8D-B84C-A0C0CFDE28B9}']
+ ['{50A62753-ECEB-4BBA-8C2D-E76326014139}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -187,10 +189,6 @@ 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 GetPARAM_TIEMPOValue: Currency;
procedure SetPARAM_TIEMPOValue(const aValue: Currency);
function GetPARAM_TIEMPOIsNull: Boolean;
@@ -199,6 +197,14 @@ type
procedure SetPARAM_MARGENValue(const aValue: Float);
function GetPARAM_MARGENIsNull: Boolean;
procedure SetPARAM_MARGENIsNull(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 }
@@ -246,12 +252,14 @@ 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 PARAM_TIEMPO: Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue;
property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull;
property PARAM_MARGEN: Float read GetPARAM_MARGENValue write SetPARAM_MARGENValue;
property PARAM_MARGENIsNull: Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull;
+ 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 }
@@ -349,10 +357,6 @@ 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 GetPARAM_TIEMPOValue: Currency; virtual;
procedure SetPARAM_TIEMPOValue(const aValue: Currency); virtual;
function GetPARAM_TIEMPOIsNull: Boolean; virtual;
@@ -361,6 +365,14 @@ type
procedure SetPARAM_MARGENValue(const aValue: Float); virtual;
function GetPARAM_MARGENIsNull: Boolean; virtual;
procedure SetPARAM_MARGENIsNull(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;
@@ -407,12 +419,14 @@ 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 PARAM_TIEMPO: Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue;
property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull;
property PARAM_MARGEN: Float read GetPARAM_MARGENValue write SetPARAM_MARGENValue;
property PARAM_MARGENIsNull: Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull;
+ 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;
@@ -422,7 +436,7 @@ type
{ IEmpresasDatosBanco }
IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
- ['{AEE9C7D1-61B3-470C-A774-1DB77C111243}']
+ ['{9C06C77B-A062-4026-962C-ACF5CF7A7965}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1069,27 +1083,6 @@ begin
DataTable.Fields[idx_EmpresasREGISTRO_MERCANTIL].AsVariant := Null;
end;
-function TEmpresasDataTableRules.GetIVAValue: Float;
-begin
- result := DataTable.Fields[idx_EmpresasIVA].AsFloat;
-end;
-
-procedure TEmpresasDataTableRules.SetIVAValue(const aValue: Float);
-begin
- DataTable.Fields[idx_EmpresasIVA].AsFloat := aValue;
-end;
-
-function TEmpresasDataTableRules.GetIVAIsNull: boolean;
-begin
- result := DataTable.Fields[idx_EmpresasIVA].IsNull;
-end;
-
-procedure TEmpresasDataTableRules.SetIVAIsNull(const aValue: Boolean);
-begin
- if aValue then
- DataTable.Fields[idx_EmpresasIVA].AsVariant := Null;
-end;
-
function TEmpresasDataTableRules.GetPARAM_TIEMPOValue: Currency;
begin
result := DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsCurrency;
@@ -1132,6 +1125,48 @@ begin
DataTable.Fields[idx_EmpresasPARAM_MARGEN].AsVariant := Null;
end;
+function TEmpresasDataTableRules.GetID_TIPO_IVAValue: SmallInt;
+begin
+ result := DataTable.Fields[idx_EmpresasID_TIPO_IVA].AsSmallInt;
+end;
+
+procedure TEmpresasDataTableRules.SetID_TIPO_IVAValue(const aValue: SmallInt);
+begin
+ DataTable.Fields[idx_EmpresasID_TIPO_IVA].AsSmallInt := aValue;
+end;
+
+function TEmpresasDataTableRules.GetID_TIPO_IVAIsNull: boolean;
+begin
+ result := DataTable.Fields[idx_EmpresasID_TIPO_IVA].IsNull;
+end;
+
+procedure TEmpresasDataTableRules.SetID_TIPO_IVAIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ 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;
+
{ TEmpresasDatosBancoDataTableRules }
constructor TEmpresasDatosBancoDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
index 96318264..370831a3 100644
--- a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
+++ b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
@@ -9,13 +9,13 @@ 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_EmpresasDelta = '{BE38FBA7-1592-49D7-8ED6-C4C306CB7135}';
- RID_EmpresasDatosBancoDelta = '{8A887444-4C23-4E13-A100-30A02D336255}';
+ RID_EmpresasDelta = '{6E077CC5-C984-4BCB-BF62-FFF76FF50C8F}';
+ RID_EmpresasDatosBancoDelta = '{6451427E-E50D-4E52-BD96-58551144B783}';
type
{ IEmpresasDelta }
IEmpresasDelta = interface(IEmpresas)
- ['{BE38FBA7-1592-49D7-8ED6-C4C306CB7135}']
+ ['{6E077CC5-C984-4BCB-BF62-FFF76FF50C8F}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String;
@@ -39,9 +39,10 @@ type
function GetOldUSUARIOValue : String;
function GetOldLOGOTIPOValue : IROStream;
function GetOldREGISTRO_MERCANTILValue : String;
- function GetOldIVAValue : Float;
function GetOldPARAM_TIEMPOValue : Currency;
function GetOldPARAM_MARGENValue : Float;
+ function GetOldID_TIPO_IVAValue : SmallInt;
+ function GetOldID_FORMA_PAGOValue : SmallInt;
{ Properties }
property OldID : Integer read GetOldIDValue;
@@ -66,9 +67,10 @@ type
property OldUSUARIO : String read GetOldUSUARIOValue;
property OldLOGOTIPO : IROStream read GetOldLOGOTIPOValue;
property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue;
- property OldIVA : Float read GetOldIVAValue;
property OldPARAM_TIEMPO : Currency read GetOldPARAM_TIEMPOValue;
property OldPARAM_MARGEN : Float read GetOldPARAM_MARGENValue;
+ property OldID_TIPO_IVA : SmallInt read GetOldID_TIPO_IVAValue;
+ property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue;
end;
{ TEmpresasBusinessProcessorRules }
@@ -210,12 +212,6 @@ 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 GetPARAM_TIEMPOValue: Currency; virtual;
function GetPARAM_TIEMPOIsNull: Boolean; virtual;
function GetOldPARAM_TIEMPOValue: Currency; virtual;
@@ -228,6 +224,18 @@ type
function GetOldPARAM_MARGENIsNull: Boolean; virtual;
procedure SetPARAM_MARGENValue(const aValue: Float); virtual;
procedure SetPARAM_MARGENIsNull(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;
@@ -318,10 +326,6 @@ 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 PARAM_TIEMPO : Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue;
property PARAM_TIEMPOIsNull : Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull;
property OldPARAM_TIEMPO : Currency read GetOldPARAM_TIEMPOValue;
@@ -330,6 +334,14 @@ type
property PARAM_MARGENIsNull : Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull;
property OldPARAM_MARGEN : Float read GetOldPARAM_MARGENValue;
property OldPARAM_MARGENIsNull : Boolean read GetOldPARAM_MARGENIsNull;
+ 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;
@@ -339,7 +351,7 @@ type
{ IEmpresasDatosBancoDelta }
IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
- ['{8A887444-4C23-4E13-A100-30A02D336255}']
+ ['{6451427E-E50D-4E52-BD96-58551144B783}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -1208,37 +1220,6 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasREGISTRO_MERCANTIL] := Null;
end;
-function TEmpresasBusinessProcessorRules.GetIVAValue: Float;
-begin
- result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA];
-end;
-
-function TEmpresasBusinessProcessorRules.GetIVAIsNull: Boolean;
-begin
- result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA]);
-end;
-
-function TEmpresasBusinessProcessorRules.GetOldIVAValue: Float;
-begin
- result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasIVA];
-end;
-
-function TEmpresasBusinessProcessorRules.GetOldIVAIsNull: Boolean;
-begin
- result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasIVA]);
-end;
-
-procedure TEmpresasBusinessProcessorRules.SetIVAValue(const aValue: Float);
-begin
- BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA] := aValue;
-end;
-
-procedure TEmpresasBusinessProcessorRules.SetIVAIsNull(const aValue: Boolean);
-begin
- if aValue then
- BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasIVA] := Null;
-end;
-
function TEmpresasBusinessProcessorRules.GetPARAM_TIEMPOValue: Currency;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO];
@@ -1301,6 +1282,68 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN] := Null;
end;
+function TEmpresasBusinessProcessorRules.GetID_TIPO_IVAValue: SmallInt;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA];
+end;
+
+function TEmpresasBusinessProcessorRules.GetID_TIPO_IVAIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA]);
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldID_TIPO_IVAValue: SmallInt;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_TIPO_IVA];
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldID_TIPO_IVAIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_TIPO_IVA]);
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetID_TIPO_IVAValue(const aValue: SmallInt);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_TIPO_IVA] := aValue;
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetID_TIPO_IVAIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ 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;
+
{ TEmpresasDatosBancoBusinessProcessorRules }
constructor TEmpresasDatosBancoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
index acb8253e..48a0c97e 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
@@ -114,10 +114,6 @@ object srvEmpresas: TsrvEmpresas
DatasetField = 'REGISTRO_MERCANTIL'
TableField = 'REGISTRO_MERCANTIL'
end
- item
- DatasetField = 'IVA'
- TableField = 'IVA'
- end
item
DatasetField = 'PARAM_TIEMPO'
TableField = 'PARAM_TIEMPO'
@@ -125,6 +121,14 @@ object srvEmpresas: TsrvEmpresas
item
DatasetField = 'PARAM_MARGEN'
TableField = 'PARAM_MARGEN'
+ end
+ item
+ DatasetField = 'ID_TIPO_IVA'
+ TableField = 'ID_TIPO_IVA'
+ end
+ item
+ DatasetField = 'ID_FORMA_PAGO'
+ TableField = 'ID_FORMA_PAGO'
end>
end>
Name = 'Empresas'
@@ -260,11 +264,6 @@ object srvEmpresas: TsrvEmpresas
Size = 255
DictionaryEntry = 'Empresas_REGISTRO_MERCANTIL'
end
- item
- Name = 'IVA'
- DataType = datFloat
- DictionaryEntry = 'Empresas_IVA'
- end
item
Name = 'PARAM_TIEMPO'
DataType = datCurrency
@@ -272,6 +271,14 @@ object srvEmpresas: TsrvEmpresas
item
Name = 'PARAM_MARGEN'
DataType = datFloat
+ end
+ item
+ 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 f74a24af..9308087d 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
@@ -32,9 +32,10 @@ type
procedure DataAbstractServiceBeforeGetDatasetData(aSender: TObject;
const aDataset: IDADataset; const aIncludeSchema: Boolean;
const aMaxRecords: Integer);
- private
protected
- function DarDatosEmpresa(const EmpresaID: Integer; AEmpresaDataSet: IDADataset): Boolean;
+ function DarDatosEmpresa(const EmpresaID: Integer; AEmpresaDataSet: IDADataset): Boolean;
+ function DarListaFormasPago: Binary;
+ function DarListaTiposIVA: Binary;
end;
function RecuperarEmpresa(const AID: Integer; AEmpresaDataSet: IDADataset): Boolean;
@@ -46,7 +47,8 @@ uses
{Generated:} FactuGES_Invk, uDataModuleServer, uRORemoteDataModule,
uDatabaseUtils, Dialogs, Variants, uROStreamSerializer, uROBinaryHelpers,
uSesionesUtils, schEmpresasClient_Intf, uUsersManager,
- uRestriccionesUsuarioUtils, uROClasses, uBizEmpresasServer;
+ uRestriccionesUsuarioUtils, uROClasses, uBizEmpresasServer,
+ srvFormasPago_Impl, srvTiposIva_Impl;
procedure Create_srvEmpresas(out anInstance : IUnknown);
begin
@@ -121,6 +123,30 @@ begin
bpEmpresas.BusinessRulesID := BIZ_SERVER_EMPRESAS;
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;
+
procedure TsrvEmpresas.DataAbstractServiceBeforeAcquireConnection(
aSender: TObject; var aConnectionName: string);
begin
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
index b8eb6259..a4527545 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
@@ -16,9 +16,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
Caption = 'Empresa'
ExplicitWidth = 674
inherited Image1: TImage
- Left = 647
+ Left = 541
ExplicitLeft = 607
end
+ inherited lblDesbloquear: TcxLabel
+ Left = 576
+ ExplicitLeft = 576
+ end
end
inherited TBXDock: TTBXDock
Width = 674
@@ -119,107 +123,157 @@ inherited fEditorEmpresa: TfEditorEmpresa
ExplicitTop = 267
end
inherited eCalle: TcxDBTextEdit
- Top = 240
- ExplicitTop = 240
+ Top = 267
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 267
ExplicitWidth = 234
Width = 234
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 278
- Top = 267
- ExplicitLeft = 278
- ExplicitTop = 267
+ Top = 294
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 294
end
inherited ePaginaWeb: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 216
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 216
ExplicitWidth = 164
Width = 164
end
inherited eMailParticular: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 189
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 189
ExplicitWidth = 164
Width = 164
end
inherited eMailTrabajo: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 162
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 162
ExplicitWidth = 164
Width = 164
end
inherited cxDBMemo1: TcxDBMemo
- Top = 345
- ExplicitTop = 345
+ Top = 372
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 372
ExplicitWidth = 329
ExplicitHeight = 64
Height = 64
Width = 329
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 57
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 57
ExplicitWidth = 164
Width = 164
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 30
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 30
ExplicitWidth = 164
Width = 164
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 84
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 84
ExplicitWidth = 164
Width = 164
end
inherited eFax: TcxDBTextEdit
- Left = 474
+ Left = 508
Top = 111
- ExplicitLeft = 474
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 508
ExplicitTop = 111
ExplicitWidth = 164
Width = 164
end
inherited eNombre: TcxDBTextEdit
Top = 30
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 30
ExplicitWidth = 234
Width = 234
end
inherited eNIFCIF: TcxDBTextEdit
Top = 57
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 57
ExplicitWidth = 234
Width = 234
end
inherited memRegistroMercantil: TcxDBMemo
Top = 84
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 84
ExplicitWidth = 234
Width = 234
end
- inherited cxDBSpinEdit1: TcxDBSpinEdit
- Top = 138
- ExplicitTop = 138
- end
inherited cxDBImage1: TcxDBImage
- Left = 379
+ Left = 413
Top = 267
- ExplicitLeft = 379
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 413
ExplicitTop = 267
ExplicitWidth = 230
ExplicitHeight = 142
@@ -227,26 +281,62 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 230
end
inherited eParamMargen: TcxDBSpinEdit
- Top = 189
- ExplicitTop = 189
+ Top = 216
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 216
end
inherited eParamTiempo: TcxDBCurrencyEdit
- Top = 189
- ExplicitTop = 189
+ Top = 216
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 216
end
inherited cbProvincia: TcxDBComboBox
- Top = 267
- ExplicitTop = 267
+ Top = 294
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 294
ExplicitWidth = 91
Width = 91
end
inherited cbPoblacion: TcxDBComboBox
- Top = 294
+ Top = 321
Properties.OnInitPopup = nil
- ExplicitTop = 294
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 321
ExplicitWidth = 234
Width = 234
end
+ inherited cbFormaPago: TcxComboBox
+ Top = 165
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 165
+ ExplicitWidth = 202
+ Width = 202
+ end
+ inherited cbTipoIVA: TcxComboBox
+ Top = 138
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 138
+ ExplicitWidth = 202
+ Width = 202
+ end
end
end
end
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
index 239997a7..4bf25c86 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
@@ -13,7 +13,7 @@ uses
JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
uViewEmpresa, uIEditorEmpresa, uEmpresasController, dxLayoutLookAndFeels,
JvExComCtrls, JvStatusBar, uViewDetallesGenerico, uViewDatosBancarios,
- uDAInterfaces;
+ uDAInterfaces, cxControls, cxContainer, cxEdit, cxLabel;
type
TfEditorEmpresa = class(TfEditorDBItem, IEditorEmpresa)
@@ -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);
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
index 9b5875e8..cf5b5350 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
@@ -1,6 +1,7 @@
inherited frViewEmpresa: TfrViewEmpresa
Width = 734
Height = 548
+ OnShow = CustomViewShow
ExplicitWidth = 734
ExplicitHeight = 548
object dxLayoutControl1: TdxLayoutControl
@@ -13,6 +14,9 @@ inherited frViewEmpresa: TfrViewEmpresa
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
+ DesignSize = (
+ 734
+ 548)
object PngSpeedButton1: TPngSpeedButton
Left = 689
Top = 305
@@ -30,8 +34,8 @@ inherited frViewEmpresa: TfrViewEmpresa
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object eCalle: TcxDBTextEdit
- Left = 117
- Top = 250
+ Left = 162
+ Top = 277
DataBinding.DataField = 'CALLE'
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
@@ -48,12 +52,12 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 6
+ TabOrder = 7
Width = 223
end
object eCodigoPostal: TcxDBTextEdit
- Left = 267
- Top = 277
+ Left = 312
+ Top = 304
DataBinding.DataField = 'CODIGO_POSTAL'
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
@@ -70,11 +74,11 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 8
+ TabOrder = 9
Width = 73
end
object ePaginaWeb: TcxDBTextEdit
- Left = 465
+ Left = 510
Top = 220
DataBinding.DataField = 'PAGINA_WEB'
DataBinding.DataSource = DADataSource
@@ -92,13 +96,35 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 18
+ Width = 247
+ end
+ object eMailParticular: TcxDBTextEdit
+ Left = 510
+ Top = 193
+ DataBinding.DataField = 'EMAIL_2'
+ 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
+ StyleHot.LookAndFeel.SkinName = ''
TabOrder = 17
Width = 247
end
- object eMailParticular: TcxDBTextEdit
- Left = 465
- Top = 193
- DataBinding.DataField = 'EMAIL_2'
+ object eMailTrabajo: TcxDBTextEdit
+ Left = 510
+ Top = 166
+ DataBinding.DataField = 'EMAIL_1'
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
@@ -117,31 +143,9 @@ inherited frViewEmpresa: TfrViewEmpresa
TabOrder = 16
Width = 247
end
- object eMailTrabajo: TcxDBTextEdit
- Left = 465
- Top = 166
- DataBinding.DataField = 'EMAIL_1'
- 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
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 15
- Width = 247
- end
object cxDBMemo1: TcxDBMemo
Left = 22
- Top = 361
+ Top = 388
DataBinding.DataField = 'NOTAS'
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
@@ -158,12 +162,12 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 10
+ TabOrder = 11
Height = 75
Width = 318
end
object eTlfParticular: TcxDBTextEdit
- Left = 465
+ Left = 510
Top = 55
DataBinding.DataField = 'TELEFONO_2'
DataBinding.DataSource = DADataSource
@@ -181,57 +185,35 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 12
- Width = 247
- end
- object eTlfTrabajo: TcxDBTextEdit
- Left = 465
- Top = 28
- DataBinding.DataField = 'TELEFONO_1'
- 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
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 11
- Width = 247
- end
- object eTlfMovil: TcxDBTextEdit
- Left = 465
- Top = 82
- DataBinding.DataField = 'MOVIL_1'
- 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
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13
Width = 247
end
- object eFax: TcxDBTextEdit
- Left = 465
- Top = 109
- DataBinding.DataField = 'FAX'
+ object eTlfTrabajo: TcxDBTextEdit
+ Left = 510
+ Top = 28
+ DataBinding.DataField = 'TELEFONO_1'
+ 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
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 12
+ Width = 247
+ end
+ object eTlfMovil: TcxDBTextEdit
+ Left = 510
+ Top = 82
+ DataBinding.DataField = 'MOVIL_1'
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
@@ -250,8 +232,30 @@ inherited frViewEmpresa: TfrViewEmpresa
TabOrder = 14
Width = 247
end
+ object eFax: TcxDBTextEdit
+ Left = 510
+ Top = 109
+ DataBinding.DataField = 'FAX'
+ 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
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 15
+ Width = 247
+ end
object eNombre: TcxDBTextEdit
- Left = 117
+ Left = 162
Top = 28
DataBinding.DataField = 'NOMBRE'
DataBinding.DataSource = DADataSource
@@ -274,7 +278,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 223
end
object eNIFCIF: TcxDBTextEdit
- Left = 117
+ Left = 162
Top = 55
DataBinding.DataField = 'NIF_CIF'
DataBinding.DataSource = DADataSource
@@ -297,7 +301,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 223
end
object memRegistroMercantil: TcxDBMemo
- Left = 117
+ Left = 162
Top = 82
DataBinding.DataField = 'REGISTRO_MERCANTIL'
DataBinding.DataSource = DADataSource
@@ -320,32 +324,8 @@ inherited frViewEmpresa: TfrViewEmpresa
Height = 48
Width = 223
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.LookAndFeel.SkinName = ''
- Style.ButtonStyle = bts3D
- 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 = 60
- end
object cxDBImage1: TcxDBImage
- Left = 370
+ Left = 415
Top = 277
DataBinding.DataField = 'LOGOTIPO'
DataBinding.DataSource = DADataSource
@@ -361,13 +341,13 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 18
+ TabOrder = 19
Height = 249
Width = 313
end
object eParamMargen: TcxDBSpinEdit
- Left = 117
- Top = 193
+ Left = 162
+ Top = 220
DataBinding.DataField = 'PARAM_MARGEN'
DataBinding.DataSource = DADataSource
Properties.OnValidate = eParamMargenPropertiesValidate
@@ -387,12 +367,12 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 4
+ TabOrder = 5
Width = 60
end
object eParamTiempo: TcxDBCurrencyEdit
- Left = 240
- Top = 193
+ Left = 285
+ Top = 220
DataBinding.DataField = 'PARAM_TIEMPO'
DataBinding.DataSource = DADataSource
Properties.Alignment.Horz = taRightJustify
@@ -412,12 +392,12 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 5
+ TabOrder = 6
Width = 100
end
object cbProvincia: TcxDBComboBox
- Left = 117
- Top = 277
+ Left = 162
+ Top = 304
DataBinding.DataField = 'PROVINCIA'
DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True
@@ -441,12 +421,12 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 7
+ TabOrder = 8
Width = 80
end
object cbPoblacion: TcxDBComboBox
- Left = 117
- Top = 304
+ Left = 162
+ Top = 331
DataBinding.DataField = 'POBLACION'
DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True
@@ -470,9 +450,63 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
+ TabOrder = 10
Width = 223
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 = 202
+ 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
@@ -505,9 +539,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 dxLayoutControl1Item2: 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 ceca730f..b2d3d891 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,
- cxCurrencyEdit, cxGraphics, cxDropDownEdit;
+ cxCurrencyEdit, 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)
@@ -60,8 +63,6 @@ type
dxLayoutControl1Group10: TdxLayoutGroup;
dxLayoutControl1Group9: TdxLayoutGroup;
dxLayoutControl1Group11: TdxLayoutGroup;
- cxDBSpinEdit1: TcxDBSpinEdit;
- dxLayoutControl1Item16: TdxLayoutItem;
ActionList1: TActionList;
actAnadir: TAction;
actEliminar: TAction;
@@ -85,6 +86,10 @@ type
cbPoblacion: TcxDBComboBox;
dxLayoutControl1Group8: TdxLayoutGroup;
dxLayoutControl1Group15: TdxLayoutGroup;
+ dxLayoutControl1Item2: TdxLayoutItem;
+ cbFormaPago: TcxComboBox;
+ dxLayoutControl1Item16: TdxLayoutItem;
+ cbTipoIVA: TcxComboBox;
procedure actAnadirExecute(Sender: TObject);
procedure actEliminarExecute(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject);
@@ -95,17 +100,26 @@ type
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
+ procedure FormaPagoEditValueChanged(Sender: TObject);
+ procedure TipoIVAEditValueChanged(Sender: TObject);
+ procedure CustomViewShow(Sender: TObject);
private
FEmpresa: IBizEmpresa;
+ FController : IEmpresasController;
FProvincias : TStringList;
FPoblaciones : TStringList;
+ FFormasPago: TStringList;
+ FTiposIVA: TStringList;
procedure CargarProvincias;
procedure CargarPoblaciones;
- protected
function GetEmpresa: IBizEmpresa;
procedure SetEmpresa(const Value: IBizEmpresa);
+ function GetController : IEmpresasController;
+ procedure SetController (const Value : IEmpresasController);
+
public
bModificarCatalogo: Boolean;
+ property Controller : IEmpresasController read GetController write SetController;
constructor Create(AOwner : TComponent); override;
destructor Destroy; override;
end;
@@ -255,8 +269,39 @@ begin
bModificarCatalogo := False;
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
+ FController := Nil;
+
+ if Assigned(FTiposIVA) then
+ FreeANDNIL(FTiposIVA);
+
+ if Assigned(FFormasPago) then
+ FreeANDNIL(FFormasPago);
+
if Assigned(FProvincias) then
FreeANDNIL(FProvincias);
@@ -288,11 +333,65 @@ begin
DisplayValue := eParamTiempo.Value;
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;
@@ -302,6 +401,17 @@ begin
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
RegisterClass(TfrViewEmpresa);
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas
index ff6a65f9..b0943aee 100644
--- a/Source/Modulos/Contactos/Model/uBizContactos.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactos.pas
@@ -698,6 +698,8 @@ begin
BLOQUEADO := 0;
RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA;
REGIMEN_IVA := CLIENTE_REGIMEN_IVA;
+ ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO;
+ ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
end;
{ TBizProveedor }
@@ -757,7 +759,9 @@ begin
inherited;
ID_CATEGORIA := CATEGORIA_PROVEEDOR;
REGIMEN_IVA := PROVEEDOR_REGIMEN_IVA;
- VENCIMIENTO_FACTURAS_1 := PROVEEDOR_DIAS_VENCIMIENTO;
+ VENCIMIENTO_FACTURAS_1 := PROVEEDOR_DIAS_VENCIMIENTO;
+ ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO;
+ ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
end;
function TBizProveedor.GetCERTIFICACIONValue: String;
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
index 0b9ca10a..330b8a61 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
@@ -253,7 +253,8 @@ 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;
end;
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 37e84d00..bdc26d27 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
@@ -252,15 +252,27 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitHeight = 316
inherited ToolBar1: TToolBar
Width = 798
- Height = 51
+ Height = 46
ExplicitWidth = 798
- ExplicitHeight = 51
- inherited ToolButton14: TToolButton
+ ExplicitHeight = 46
+ inherited ToolButton3: TToolButton
Wrap = False
end
- inherited FontName: TJvFontComboBox
- Left = 399
+ inherited ToolButton4: TToolButton
+ Left = 278
Top = 0
+ Wrap = True
+ ExplicitLeft = 278
+ ExplicitTop = 0
+ end
+ inherited ToolButton14: TToolButton
+ Left = 0
+ Wrap = False
+ ExplicitLeft = 0
+ end
+ inherited FontName: TJvFontComboBox
+ Left = 65
+ Top = 22
ExplicitLeft = 399
ExplicitTop = 0
end
@@ -272,7 +284,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 0
ExplicitWidth = 168
end
- inherited ToolButton13: TToolButton [7]
+ inherited UpDown1: TUpDown
+ Left = 712
+ Top = 0
+ ExplicitLeft = 712
+ ExplicitTop = 0
+ end
+ inherited ToolButton13: TToolButton
Left = 0
Top = 0
Wrap = True
@@ -280,54 +298,46 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 0
ExplicitHeight = 27
end
- inherited UpDown1: TUpDown [8]
+ inherited ToolButton6: TToolButton
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
- inherited ToolButton6: TToolButton
- Left = 17
- Top = 27
- ExplicitLeft = 17
- ExplicitTop = 27
- end
inherited ToolButton7: TToolButton
- Left = 83
+ Left = 66
Top = 27
- ExplicitLeft = 83
+ ExplicitLeft = 66
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
- Left = 150
+ Left = 133
Top = 27
- ExplicitLeft = 150
+ ExplicitLeft = 133
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
- Left = 233
+ Left = 216
Top = 27
- Wrap = False
- ExplicitLeft = 233
+ ExplicitLeft = 216
ExplicitTop = 27
- ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
- Left = 241
+ Left = 224
Top = 27
- ExplicitLeft = 241
+ ExplicitLeft = 224
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
- Left = 386
+ Left = 369
Top = 27
- ExplicitLeft = 386
+ ExplicitLeft = 369
ExplicitTop = 27
end
inherited ToolButton11: TToolButton
- Left = 511
+ Left = 494
Top = 27
- ExplicitLeft = 511
+ ExplicitLeft = 494
ExplicitTop = 27
end
end
diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
index edaf86a7..8b1f859e 100644
--- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
+++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
@@ -263,7 +263,8 @@ 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;
end;
diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
index f437d985..639d9c59 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,39 @@ object srvFormasPago: TsrvFormasPago
DataDictionary = DataDictionary
Diagrams = Diagrams
Datasets = <
+ item
+ Params = <>
+ Statements = <
+ item
+ Connection = 'IBX'
+ ConnectionType = 'Interbase'
+ Default = True
+ TargetTable = 'FORMAS_PAGO'
+ 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..0cf6e35b 100644
--- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas
+++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas
@@ -30,8 +30,8 @@ type
procedure DARemoteServiceCreate(Sender: TObject);
procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
var aConnectionName: string);
- private
- protected
+ public
+ function DarListaFormasPago: Binary;
end;
implementation
@@ -39,7 +39,7 @@ implementation
{$R *.dfm}
uses
{Generated:} FactuGES_Invk, uDataModuleServer,
- uDatabaseUtils;
+ uDatabaseUtils, uDAInterfaces, uROClasses;
procedure Create_srvFormasPago(out anInstance : IUnknown);
begin
@@ -52,6 +52,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/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..45009983 100644
--- a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas
+++ b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas
@@ -28,15 +28,16 @@ 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 +50,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 c970f792..dbe1398c 100644
--- a/Source/Servicios/FactuGES.RODL
+++ b/Source/Servicios/FactuGES.RODL
@@ -93,6 +93,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas
index 5f82e7de..73267ae6 100644
--- a/Source/Servicios/FactuGES_Intf.pas
+++ b/Source/Servicios/FactuGES_Intf.pas
@@ -284,6 +284,8 @@ type
{ IsrvEmpresas }
IsrvEmpresas = interface(IDataAbstractService)
['{590F06D1-26B4-435B-B636-50CB8FFE6353}']
+ function DarListaFormasPago: Binary;
+ function DarListaTiposIVA: Binary;
end;
{ CosrvEmpresas }
@@ -296,6 +298,8 @@ type
protected
function __GetInterfaceName:string; override;
+ function DarListaFormasPago: Binary;
+ function DarListaTiposIVA: Binary;
end;
{ IsrvConfiguracion }
@@ -1390,11 +1394,45 @@ begin
result := TsrvEmpresas_Proxy.Create(aMessage, aTransportChannel);
end;
+{ TsrvEmpresas_Proxy }
+
function TsrvEmpresas_Proxy.__GetInterfaceName:string;
begin
result := 'srvEmpresas';
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 89ba32e6..f8b4f662 100644
--- a/Source/Servicios/FactuGES_Invk.pas
+++ b/Source/Servicios/FactuGES_Invk.pas
@@ -55,6 +55,8 @@ type
private
protected
published
+ 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)
@@ -408,6 +410,58 @@ begin
end;
end;
+{ TsrvEmpresas_Invoker }
+
+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 af6afac3..3b31fe7b 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 04bac6b2..11d01f8c 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 60956b53..8fbaa1d2 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -110,8 +110,6 @@ uses
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schHistoricoMovimientosClient_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas',
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas',
- schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
- schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
@@ -132,7 +130,9 @@ uses
uRptFacturasProveedor_Server in '..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas' {RptFacturasProveedor: TDataModule},
uRptRecibosProveedor_Server in '..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas' {RptRecibosProveedor: TDataModule},
schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
- schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas';
+ schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
+ schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
+ schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 91c34285..6a98ca97 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,323 +1,323 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
- vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
- True
- True
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
-
-
- Delphi.Personality
-
-
-FalseTrueFalse/standaloneTrueFalse1460FalseFalseFalseFalseFalse308212521.4.6.01.4.6.0martes, 11 de noviembre de 2008 20:02FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDARemoteService
-
-
-
- TDataModule
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+ vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+ True
+ True
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalse/standaloneTrueFalse1460FalseFalseFalseFalseFalse308212521.4.6.01.4.6.0martes, 11 de noviembre de 2008 20:02FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TDataModule
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+