AcotaCocinas/AlonsoYSal_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cambio para ordenar las formas de pago y el redondeo en el calculo de los detalles para que no descuadre cuando son cantidades grandes y resultado con muchos decimales

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AlonsoYSal_FactuGES2/trunk@27 40301925-124e-1c4e-b97d-170ad7a8785b
This commit is contained in:
roberto 2021-07-26 15:25:35 +00:00
parent b3a08ad5b4
commit 6958e045e7
12 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

98
Source/Base/Base.dproj
View File

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

4
Source/Base/Utiles/uCalculosUtils.pas
View File

@ -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

BIN
Source/Lib/ApplicationBase.dcp
View File

Binary file not shown.

BIN
Source/Lib/Base.dcp
View File

Binary file not shown.

BIN
Source/Lib/GUIBase.dcp
View File

Binary file not shown.

2
Source/Modulos/Formas de pago/Data/FormasPago_data.dproj
View File

@ -41,7 +41,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">FormasPago_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">FormasPago_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>

12
Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas
View File

@ -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);

12
Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas
View File

@ -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;

10
Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
View File

@ -14,8 +14,8 @@ object srvFormasPago: TsrvFormasPago
DiagramData =
'<Diagrams>'#13#10' <Diagram Name="New Diagram" Left="200" Top="200" W' +
'idth="400" Height="300">'#13#10' <Entity Name="FormasPago" Left="0,' +
'00" Top="0,00" />'#13#10' <Entity Name="FormasPagoPlazos" Left="392' +
',00" Top="96,00" />'#13#10' </Diagram>'#13#10'</Diagrams>'#13#10
'00" Top="0,00" />'#13#10' <Entity Name="FormasPagoPlazos" Left="391' +
',00" Top="95,00" />'#13#10' </Diagram>'#13#10'</Diagrams>'#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'

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -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}

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.