diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 57eacf8..8f114a4 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index b36e2e2..e0eaa0f 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -65,55 +65,55 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Base/Utiles/uCalculosUtils.pas b/Source/Base/Utiles/uCalculosUtils.pas
index c7a713f..d738afc 100644
--- a/Source/Base/Utiles/uCalculosUtils.pas
+++ b/Source/Base/Utiles/uCalculosUtils.pas
@@ -29,7 +29,7 @@ const
implementation
uses
- SysUtils, DB, Variants, cxControls;
+ SysUtils, DB, Variants, cxControls, uNumUtils;
function CalcularLineaConcepto (const ADataTable : TDADataTable): Double;
var
@@ -40,7 +40,7 @@ begin
if (VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat
else
- ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat - (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat * (FieldByName(CAMPO_DESCUENTO).AsFloat/100)));
+ ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * RoundCurrency((FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat - (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat * (FieldByName(CAMPO_DESCUENTO).AsFloat/100))));
if (VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
ImporteTotal := ImporteTotal
diff --git a/Source/Lib/ApplicationBase.dcp b/Source/Lib/ApplicationBase.dcp
index 039f863..9a132de 100644
Binary files a/Source/Lib/ApplicationBase.dcp and b/Source/Lib/ApplicationBase.dcp differ
diff --git a/Source/Lib/Base.dcp b/Source/Lib/Base.dcp
index d44ec6f..41cff28 100644
Binary files a/Source/Lib/Base.dcp and b/Source/Lib/Base.dcp differ
diff --git a/Source/Lib/GUIBase.dcp b/Source/Lib/GUIBase.dcp
index 9f550ce..83042bf 100644
Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ
diff --git a/Source/Modulos/Formas de pago/Data/FormasPago_data.dproj b/Source/Modulos/Formas de pago/Data/FormasPago_data.dproj
index 4227de3..bc314c3 100644
--- a/Source/Modulos/Formas de pago/Data/FormasPago_data.dproj
+++ b/Source/Modulos/Formas de pago/Data/FormasPago_data.dproj
@@ -41,7 +41,7 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FormasPago_data.dpk
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FormasPago_data.dpk
@@ -545,4 +545,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
Count mtInvalidEmailMsg=1
mtInvalidEmailMsg0="Invalid email."
TextsCollection=English
-EurekaLog Last Line -->
\ No newline at end of file
+EurekaLog Last Line -->
diff --git a/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas b/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas
index d13f69d..99bfc67 100644
--- a/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas
+++ b/Source/Modulos/Formas de pago/Model/schFormasPagoClient_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_ListaFormasPago = '{2B3ABE15-A405-4394-A2E1-ABE8557CC213}';
- RID_FormasPago = '{5691CFDF-40DA-4B7E-A1BB-0F3742347583}';
- RID_FormasPagoPlazos = '{807478A5-FF90-416D-822E-280382B76115}';
+ RID_ListaFormasPago = '{824B2F0C-39AD-40A3-8DA8-85826D5C96DB}';
+ RID_FormasPago = '{46AD86BF-663D-4863-964A-C7220A2B0CAA}';
+ RID_FormasPagoPlazos = '{78B941A6-C324-40AF-A7BA-B259E59319BD}';
{ Data table names }
nme_ListaFormasPago = 'ListaFormasPago';
@@ -65,7 +65,7 @@ const
type
{ IListaFormasPago }
IListaFormasPago = interface(IDAStronglyTypedDataTable)
- ['{2C5FADC5-48E4-4697-A72D-1B93FF2068F1}']
+ ['{13F3D5F0-9A69-4323-BE7B-CB60655C5261}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -112,7 +112,7 @@ type
{ IFormasPago }
IFormasPago = interface(IDAStronglyTypedDataTable)
- ['{58C39D48-70C7-46A4-B465-9EA5F97DB50D}']
+ ['{B67F449B-D7C2-4F02-949E-B9EFC6007BDA}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -255,7 +255,7 @@ type
{ IFormasPagoPlazos }
IFormasPagoPlazos = interface(IDAStronglyTypedDataTable)
- ['{61EB507B-9EA5-4E9C-8D3D-DEAE5F1073BD}']
+ ['{45CB4AE6-CD18-485F-A0A6-A9809AF74BCF}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
diff --git a/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas b/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas
index 8c4bd77..5c9a674 100644
--- a/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas
+++ b/Source/Modulos/Formas de pago/Model/schFormasPagoServer_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_ListaFormasPagoDelta = '{BD6D4DED-0109-4CD2-B6D9-99208EA6157D}';
- RID_FormasPagoDelta = '{257D7005-3F68-4FA7-94BD-4EDB95ED361F}';
- RID_FormasPagoPlazosDelta = '{46BB2583-A6D4-4A62-BB44-BAC8789FD0A2}';
+ RID_ListaFormasPagoDelta = '{5FB02CCF-2885-4955-A77B-2B126B0017AD}';
+ RID_FormasPagoDelta = '{D4F7F328-908C-4366-8083-E4C04F8E9C8B}';
+ RID_FormasPagoPlazosDelta = '{3A182922-EB6C-40D6-BDFC-0A8BE0FE97C6}';
type
{ IListaFormasPagoDelta }
IListaFormasPagoDelta = interface(IListaFormasPago)
- ['{BD6D4DED-0109-4CD2-B6D9-99208EA6157D}']
+ ['{5FB02CCF-2885-4955-A77B-2B126B0017AD}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@@ -62,7 +62,7 @@ type
{ IFormasPagoDelta }
IFormasPagoDelta = interface(IFormasPago)
- ['{257D7005-3F68-4FA7-94BD-4EDB95ED361F}']
+ ['{D4F7F328-908C-4366-8083-E4C04F8E9C8B}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String;
@@ -204,7 +204,7 @@ type
{ IFormasPagoPlazosDelta }
IFormasPagoPlazosDelta = interface(IFormasPagoPlazos)
- ['{46BB2583-A6D4-4A62-BB44-BAC8789FD0A2}']
+ ['{3A182922-EB6C-40D6-BDFC-0A8BE0FE97C6}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FORMA_PAGOValue : Integer;
diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
index 4643618..852c663 100644
--- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
+++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
@@ -14,8 +14,8 @@ object srvFormasPago: TsrvFormasPago
DiagramData =
''#13#10' '#13#10' '#13#10' '#13#10' '#13#10''#13#10
+ '00" Top="0,00" />'#13#10' '#13#10' '#13#10''#13#10
end
object DataDictionary: TDADataDictionary
Fields = <
@@ -138,7 +138,11 @@ object srvFormasPago: TsrvFormasPago
item
Connection = 'IBX'
TargetTable = 'FORMAS_PAGO'
- StatementType = stAutoSQL
+ SQL =
+ 'SELECT '#10' ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCUR' +
+ 'SAL, '#10' DC, CUENTA, ID_SUBCUENTA, IGNORAR_CONTABILIDAD'#10' FROM'#10 +
+ ' FORMAS_PAGO'#10' WHERE {Where}'#10' order by 2'#10
+ StatementType = stSQL
ColumnMappings = <
item
DatasetField = 'ID'
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index dafe7af..4a495e5 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -121,8 +121,6 @@ uses
uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
- schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas',
- schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
@@ -138,7 +136,9 @@ uses
schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
- schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas';
+ schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
+ schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas',
+ schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index b77ca13..066202b 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ