Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se activa y adaptan los recibos compensados, y se arregla informe de contratos de cliente para que salga la empresa activa

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@29 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2012-01-17 17:50:09 +00:00
parent 962cf41e08
commit 5dd712f6f6
22 changed files with 171 additions and 135 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.

3
Database/scripts/factuges_sysdata_plan_general_contable_Abeto.sql
View File

@ -1,5 +1,6 @@
INSERT INTO CONT_EJERCICIOS (ID, ID_EMPRESA, NOMBRE, FECHA_INICIO, FECHA_FIN, ESTADO, LONG_SUB_CUENTA, ID_ASIENTO_APERTURA, ID_ASIENTO_PERYGAN, ID_ASIENTO_CIERRE, ACTIVO) VALUES (3, 1, 'Ejercicio 2012', '2012-01-01', '2012-12-31', 'ABIERTO', NULL, NULL, NULL, NULL, 1); INSERT INTO CONT_EJERCICIOS (ID, ID_EMPRESA, NOMBRE, FECHA_INICIO, FECHA_FIN, ESTADO, LONG_SUB_CUENTA, ID_ASIENTO_APERTURA, ID_ASIENTO_PERYGAN, ID_ASIENTO_CIERRE, ACTIVO) VALUES (3, 1, 'Ejercicio 2012', '2012-01-01', '2012-12-31', 'ABIERTO', NULL, NULL, NULL, NULL, 1);
INSERT INTO CONT_EJERCICIOS (ID, ID_EMPRESA, NOMBRE, FECHA_INICIO, FECHA_FIN, ESTADO, LONG_SUB_CUENTA, ID_ASIENTO_APERTURA, ID_ASIENTO_PERYGAN, ID_ASIENTO_CIERRE, ACTIVO) VALUES (2, 2, 'Ejercicio 2011', '2011-01-01', '2011-12-31', 'ABIERTO', NULL, NULL, NULL, NULL, 1); INSERT INTO CONT_EJERCICIOS (ID, ID_EMPRESA, NOMBRE, FECHA_INICIO, FECHA_FIN, ESTADO, LONG_SUB_CUENTA, ID_ASIENTO_APERTURA, ID_ASIENTO_PERYGAN, ID_ASIENTO_CIERRE, ACTIVO) VALUES (2, 2, 'Ejercicio 2012', '2012-01-01', '2012-12-31', 'ABIERTO', NULL, NULL, NULL, NULL, 1);
INSERT INTO CONT_EJERCICIOS (ID, ID_EMPRESA, NOMBRE, FECHA_INICIO, FECHA_FIN, ESTADO, LONG_SUB_CUENTA, ID_ASIENTO_APERTURA, ID_ASIENTO_PERYGAN, ID_ASIENTO_CIERRE, ACTIVO) VALUES (4, 3, 'Ejercicio 2012', '2012-01-01', '2012-12-31', 'ABIERTO', NULL, NULL, NULL, NULL, 1);
COMMIT WORK; COMMIT WORK;

5
Source/ApplicationBase/ApplicationBase.dpk
View File

@ -59,7 +59,10 @@ requires
dxCoreD11, dxCoreD11,
cxEditorsD11, cxEditorsD11,
cxDataD11, cxDataD11,
cxExtEditorsD11; cxExtEditorsD11,
PngComponentsD10,
PNG_D10,
PluginSDK_D11R;
contains contains
uFactuGES_App in 'uFactuGES_App.pas', uFactuGES_App in 'uFactuGES_App.pas',

79
Source/ApplicationBase/ApplicationBase.dproj
View File

@ -46,6 +46,9 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<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><Excluded_Packages> <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><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SQLiteDriver_D11.bpl">RemObjects Data Abstract - SQLite Driver</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SQLiteDriver_D11.bpl">RemObjects Data Abstract - SQLite Driver</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@ -58,48 +61,17 @@
</DelphiCompile> </DelphiCompile>
<DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" /> <DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" />
<DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" /> <DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
<DCCReference Include="Configuracion\Views\adortl.dcp" />
<DCCReference Include="Configuracion\Views\Base.dcp" />
<DCCReference Include="Configuracion\Views\ccpackD11.dcp" />
<DCCReference Include="Configuracion\Views\cfpack_d11.dcp" />
<DCCReference Include="Configuracion\Views\cxDataD11.dcp" />
<DCCReference Include="Configuracion\Views\cxEditorsD11.dcp" />
<DCCReference Include="Configuracion\Views\cxExtEditorsD11.dcp" />
<DCCReference Include="Configuracion\Views\cxLibraryD11.dcp" />
<DCCReference Include="Configuracion\Views\DataAbstract_Core_D11.dcp" />
<DCCReference Include="Configuracion\Views\dbrtl.dcp" />
<DCCReference Include="Configuracion\Views\designide.dcp" />
<DCCReference Include="Configuracion\Views\dsnap.dcp" />
<DCCReference Include="Configuracion\Views\dxCoreD11.dcp" />
<DCCReference Include="Configuracion\Views\dxGDIPlusD11.dcp" />
<DCCReference Include="Configuracion\Views\dxNavBarD11.dcp" />
<DCCReference Include="Configuracion\Views\dxThemeD11.dcp" />
<DCCReference Include="Configuracion\Views\GUIBase.dcp" />
<DCCReference Include="Configuracion\Views\GUISDK_D11R.dcp" />
<DCCReference Include="Configuracion\Views\Jcl.dcp" />
<DCCReference Include="Configuracion\Views\JclVcl.dcp" />
<DCCReference Include="Configuracion\Views\JvCoreD11R.dcp" />
<DCCReference Include="Configuracion\Views\JvCtrlsD11R.dcp" />
<DCCReference Include="Configuracion\Views\JvJansD11R.dcp" />
<DCCReference Include="Configuracion\Views\JvMMD11R.dcp" />
<DCCReference Include="Configuracion\Views\JvStdCtrlsD11R.dcp" />
<DCCReference Include="Configuracion\Views\JvSystemD11R.dcp" />
<DCCReference Include="Configuracion\Views\RemObjects_Core_D11.dcp" />
<DCCReference Include="Configuracion\Views\rtl.dcp" />
<DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas"> <DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">
<Form>fConfiguracionEditor</Form> <Form>fConfiguracionEditor</Form>
</DCCReference> </DCCReference>
<DCCReference Include="Configuracion\Views\uViewConfiguracionBase.pas" /> <DCCReference Include="Configuracion\Views\uViewConfiguracionBase.pas">
<Form>frViewConfiguracionBase</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="Configuracion\Views\uViewConfiguracionGeneral.pas"> <DCCReference Include="Configuracion\Views\uViewConfiguracionGeneral.pas">
<Form>frViewConfiguracionGeneral</Form> <Form>frViewConfiguracionGeneral</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="Configuracion\Views\vcl.dcp" />
<DCCReference Include="Configuracion\Views\vclactnband.dcp" />
<DCCReference Include="Configuracion\Views\vcldb.dcp" />
<DCCReference Include="Configuracion\Views\vcljpg.dcp" />
<DCCReference Include="Configuracion\Views\vclx.dcp" />
<DCCReference Include="Configuracion\Views\xmlrtl.dcp" />
<DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" /> <DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
<DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" /> <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
<DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" /> <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
@ -111,6 +83,43 @@
<DCCReference Include="Ejercicios\Model\schEjerciciosClient_Intf.pas" /> <DCCReference Include="Ejercicios\Model\schEjerciciosClient_Intf.pas" />
<DCCReference Include="Ejercicios\Model\schEjerciciosServer_Intf.pas" /> <DCCReference Include="Ejercicios\Model\schEjerciciosServer_Intf.pas" />
<DCCReference Include="Ejercicios\Model\uBizEjercicios.pas" /> <DCCReference Include="Ejercicios\Model\uBizEjercicios.pas" />
<DCCReference Include="Ejercicios\Plugin\adortl.dcp" />
<DCCReference Include="Ejercicios\Plugin\Base.dcp" />
<DCCReference Include="Ejercicios\Plugin\ccpackD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cfpack_d11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxDataD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxEditorsD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxExtEditorsD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxLibraryD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\DataAbstract_Core_D11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dbrtl.dcp" />
<DCCReference Include="Ejercicios\Plugin\designide.dcp" />
<DCCReference Include="Ejercicios\Plugin\dsnap.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxCoreD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxGDIPlusD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxNavBarD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxThemeD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\GUIBase.dcp" />
<DCCReference Include="Ejercicios\Plugin\GUISDK_D11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\Jcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\JclVcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvCoreD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvCtrlsD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvJansD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvMMD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvStdCtrlsD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvSystemD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\PluginSDK_D11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\PngComponentsD10.dcp" />
<DCCReference Include="Ejercicios\Plugin\PNG_D10.dcp" />
<DCCReference Include="Ejercicios\Plugin\RemObjects_Core_D11.dcp" />
<DCCReference Include="Ejercicios\Plugin\rtl.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\vclactnband.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcldb.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcljpg.dcp" />
<DCCReference Include="Ejercicios\Plugin\vclx.dcp" />
<DCCReference Include="Ejercicios\Plugin\xmlrtl.dcp" />
<DCCReference Include="Ejercicios\Views\uEditorEjercicio.pas"> <DCCReference Include="Ejercicios\Views\uEditorEjercicio.pas">
<Form>fEditorEjercicio</Form> <Form>fEditorEjercicio</Form>
<DesignClass>TCustomEditor</DesignClass> <DesignClass>TCustomEditor</DesignClass>

103
Source/Base/Base.dproj
View File

@ -44,6 +44,13 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<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="PackageDescription">Libreria base de FactuGES</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><Excluded_Packages> <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="PackageDescription">Libreria base de FactuGES</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><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages> <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@ -58,54 +65,54 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Facturas de proveedor\adortl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\designide.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dsnap.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\GUISDK_D11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\Jcl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PluginSDK_D11R.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

BIN
Source/Base/Base.res
View File

Binary file not shown.

BIN
Source/GUIBase/GUIBase.res
View File

Binary file not shown.

6
Source/Informes/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.pas
View File

@ -61,7 +61,7 @@ implementation
{$R *.DFM} {$R *.DFM}
uses uses
cxControls, FactuGES_Intf, uDataModuleConexion, Dialogs, DataAbstract4_Intf, cxControls, FactuGES_Intf, uFactuGES_App, uDataModuleConexion, Dialogs, DataAbstract4_Intf,
uDataTableUtils, schContratosClienteClient_Intf, uBizContactos; uDataTableUtils, schContratosClienteClient_Intf, uBizContactos;
{ TdmContratosCliente } { TdmContratosCliente }
@ -84,7 +84,7 @@ begin
AParam := TIntegerArray.Create; AParam := TIntegerArray.Create;
try try
AParam.Add(AID); AParam.Add(AID);
Result := (RORemoteService as IsrvContratosCliente).GenerarInformeEnPDF(AParam, VerLogotipo) Result := (RORemoteService as IsrvContratosCliente).GenerarInformeEnPDF(AParam, AppFactuGES.EmpresaActiva.RAZON_SOCIAL, VerLogotipo)
finally finally
FreeANDNIL(AParam) FreeANDNIL(AParam)
end; end;
@ -96,7 +96,7 @@ var
begin begin
AParam := AListaID.ToIntegerArray; AParam := AListaID.ToIntegerArray;
try try
Result := (RORemoteService as IsrvContratosCliente).GenerarInforme(AParam, VerLogotipo) Result := (RORemoteService as IsrvContratosCliente).GenerarInforme(AParam, AppFactuGES.EmpresaActiva.RAZON_SOCIAL, VerLogotipo)
finally finally
FreeANDNIL(AParam) FreeANDNIL(AParam)
end; end;

2
Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm
View File

@ -837,7 +837,7 @@ object RptContratosCliente: TRptContratosCliente
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 40420.450887569440000000 ReportOptions.LastChange = 40925.778794479160000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ShowProgress = False ShowProgress = False
StoreInDFM = False StoreInDFM = False

16
Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas
View File

@ -64,11 +64,11 @@ type
cabeceraPOBLACION: TIBStringField; cabeceraPOBLACION: TIBStringField;
cabeceraPROVINCIA: TIBStringField; cabeceraPROVINCIA: TIBStringField;
cabeceraCODIGO_POSTAL: TIBStringField; cabeceraCODIGO_POSTAL: TIBStringField;
schReport: TDASchema;
DataDictionary: TDADataDictionary;
frxDBCondiciones: TfrxDBDataset; frxDBCondiciones: TfrxDBDataset;
DADSCondiciones: TDADataSource; DADSCondiciones: TDADataSource;
tbl_Condiciones: TDAMemDataTable; tbl_Condiciones: TDAMemDataTable;
schReport: TDASchema;
DataDictionary: TDADataDictionary;
procedure DataModuleCreate(Sender: TObject); procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject); procedure DataModuleDestroy(Sender: TObject);
function frxReportUserFunction(const MethodName: string; function frxReportUserFunction(const MethodName: string;
@ -83,6 +83,7 @@ type
FImporteMinimo: Currency; FImporteMinimo: Currency;
FDesglosado : Boolean; FDesglosado : Boolean;
FVerLogotipo : Boolean; FVerLogotipo : Boolean;
FNombreEmpresa: String;
procedure _GenerarContrato(const AID : Integer); procedure _GenerarContrato(const AID : Integer);
@ -93,8 +94,8 @@ type
procedure IniciarParametrosInforme; procedure IniciarParametrosInforme;
procedure RecuperarNombresClientes; procedure RecuperarNombresClientes;
public public
function GenerarContrato(const ListaID : TIntegerArray; const VerLogotipo: Boolean = True): Binary; function GenerarContrato(const ListaID : TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean = True): Binary;
function GenerarContratoEnPDF(const ListaID : TIntegerArray; const VerLogotipo: Boolean = True): Binary; function GenerarContratoEnPDF(const ListaID : TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean = True): Binary;
function GenerarInformeListadoContratos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeListadoContratos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
end; end;
@ -142,7 +143,7 @@ begin
end; end;
end; end;
function TRptContratosCliente.GenerarContratoEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean = True): Binary; function TRptContratosCliente.GenerarContratoEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean = True): Binary;
var var
i: Integer; i: Integer;
begin begin
@ -150,6 +151,7 @@ begin
try try
//Inicializamos parametros //Inicializamos parametros
FVerLogotipo := VerLogotipo; FVerLogotipo := VerLogotipo;
FNombreEmpresa := NombreEmpresa;
//Vamos generando todos y cada uno de los Contratos recibidos //Vamos generando todos y cada uno de los Contratos recibidos
for i := 0 to ListaID.Count - 1 do for i := 0 to ListaID.Count - 1 do
@ -482,7 +484,7 @@ begin
end; end;
end; end;
function TRptContratosCliente.GenerarContrato(const ListaID: TIntegerArray; const VerLogotipo: Boolean = True): Binary; function TRptContratosCliente.GenerarContrato(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean = True): Binary;
var var
i: Integer; i: Integer;
begin begin
@ -490,6 +492,7 @@ begin
try try
//Inicializamos parametros //Inicializamos parametros
FVerLogotipo := VerLogotipo; FVerLogotipo := VerLogotipo;
FNombreEmpresa := NombreEmpresa;
//Vamos generando todos y cada uno de los Contratos recibidos //Vamos generando todos y cada uno de los Contratos recibidos
for i := 0 to ListaID.Count - 1 do for i := 0 to ListaID.Count - 1 do
@ -546,6 +549,7 @@ begin
frxReport.LoadFromFile(AInforme, True); frxReport.LoadFromFile(AInforme, True);
frxReport.Variables.Variables['VerLogotipo'] := FVerLogotipo; frxReport.Variables.Variables['VerLogotipo'] := FVerLogotipo;
frxReport.Variables.Variables['NombreEmpresa'] := ''''+FNombreEmpresa+'''';
frxReport.AddFunction('function PONERJUSTIFICACIONCOMPLETA(ARTFText : String): String', 'User Function',''); frxReport.AddFunction('function PONERJUSTIFICACIONCOMPLETA(ARTFText : String): String', 'User Function','');
frxReport.ReportOptions.Name := 'Contrato ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString; frxReport.ReportOptions.Name := 'Contrato ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString;
frxReport.PrepareReport(False); frxReport.PrepareReport(False);

13
Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.pas
View File

@ -33,8 +33,9 @@ type
procedure DARemoteServiceCreate(Sender: TObject); procedure DARemoteServiceCreate(Sender: TObject);
protected protected
{ IsrvContratosCliente methods } { IsrvContratosCliente methods }
function GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
end; end;
implementation implementation
@ -77,25 +78,25 @@ begin
ConnectionName := dmServer.ConnectionName; ConnectionName := dmServer.ConnectionName;
end; end;
function TsrvContratosCliente.GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function TsrvContratosCliente.GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
var var
AReportGenerator : TRptContratosCliente; AReportGenerator : TRptContratosCliente;
begin begin
AReportGenerator := TRptContratosCliente.Create(nil); AReportGenerator := TRptContratosCliente.Create(nil);
try try
Result := AReportGenerator.GenerarContrato(ListaID, VerLogotipo); Result := AReportGenerator.GenerarContrato(ListaID, NombreEmpresa, VerLogotipo);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;
end; end;
function TsrvContratosCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function TsrvContratosCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
var var
AReportGenerator : TRptContratosCliente; AReportGenerator : TRptContratosCliente;
begin begin
AReportGenerator := TRptContratosCliente.Create(nil); AReportGenerator := TRptContratosCliente.Create(nil);
try try
Result := AReportGenerator.GenerarContratoEnPDF(ListaID, VerLogotipo); Result := AReportGenerator.GenerarContratoEnPDF(ListaID, NombreEmpresa, VerLogotipo);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;

4
Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas
View File

@ -260,7 +260,7 @@ begin
with Result.DataTable.DynamicWhere do with Result.DataTable.DynamicWhere do
begin begin
//No podrá compensarse un recibo a si mismo //No podrá compensarse un recibo a si mismo
Condicion := NewBinaryExpression(NewField('', fld_RecibosClienteID), NewConstant(Recibo.ID, datInteger), dboNotEqual); Condicion := NewBinaryExpression(NewField('V_RECIBOS_CLIENTE', fld_RecibosClienteID), NewConstant(Recibo.ID, datInteger), dboNotEqual);
if IsEmpty then if IsEmpty then
Expression := Condicion Expression := Condicion
@ -647,7 +647,7 @@ begin
begin begin
ShowHourglassCursor; ShowHourglassCursor;
try try
DuplicarRegistros(ARecibosACompensar.DataTable, ARecibo.RecibosCompensados.DataTable, mdrTodos, True, True, False); DuplicarRegistros(ARecibosACompensar.DataTable, ARecibo.RecibosCompensados.DataTable, mdrTodos, True, True, True);
Result := True; Result := True;
finally finally
HideHourglassCursor; HideHourglassCursor;

14
Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm
View File

@ -61,7 +61,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 879 Width = 879
Height = 331 Height = 331
ActivePage = pagPagos ActivePage = pagCompensados
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 879 ExplicitWidth = 879
ExplicitHeight = 331 ExplicitHeight = 331
@ -405,18 +405,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 871 Width = 871
ExplicitWidth = 871 ExplicitWidth = 871
inherited ToolButton1: TToolButton
ExplicitWidth = 113
end
inherited ToolButton4: TToolButton
ExplicitWidth = 113
end
inherited ToolButton2: TToolButton
ExplicitWidth = 113
end
inherited ToolButton7: TToolButton
ExplicitWidth = 113
end
inherited ToolButton3: TToolButton inherited ToolButton3: TToolButton
ExplicitWidth = 98 ExplicitWidth = 98
end end

13
Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas
View File

@ -65,7 +65,7 @@ type
procedure PonerTitulos(const ATitulo: string = ''); override; procedure PonerTitulos(const ATitulo: string = ''); override;
procedure OnClienteChanged(Sender: TObject); procedure OnClienteChanged(Sender: TObject);
function PuedoImprimir: Boolean; override; function PuedoImprimir: Boolean; override;
public public
property Recibo: IBizRecibosCliente read GetRecibo write SetRecibo; property Recibo: IBizRecibosCliente read GetRecibo write SetRecibo;
@ -89,7 +89,11 @@ begin
if not VarIsNull(frViewRecibosCliCompensados1.cxGridView.DataController.Summary.FooterSummaryValues[0]) then if not VarIsNull(frViewRecibosCliCompensados1.cxGridView.DataController.Summary.FooterSummaryValues[0]) then
ImporteAux := frViewRecibosCliCompensados1.cxGridView.DataController.Summary.FooterSummaryValues[0]; ImporteAux := frViewRecibosCliCompensados1.cxGridView.DataController.Summary.FooterSummaryValues[0];
frViewReciboCliImportes1.eImporteTotalRecibo.Value := frViewReciboCliImportes1.eImporte.Value + frViewReciboCliImportes1.eOtrosGastos.Value + ImporteAux; frViewReciboCliImportes1.eImporteTotalRecibo.Value := frViewReciboCliImportes1.eImporte.Value + frViewReciboCliImportes1.eOtrosGastos.Value; // + ImporteAux;
if (ImporteAux > frViewReciboCliImportes1.eImporteTotalRecibo.Value) then
raise Exception.Create ('El importe de los recibos compensados es superior al importe del recibo');
end; end;
constructor TfEditorReciboCliente.Create(AOwner: TComponent); constructor TfEditorReciboCliente.Create(AOwner: TComponent);
@ -98,8 +102,6 @@ begin
FImporteRestante := 0; FImporteRestante := 0;
pgPaginas.ActivePageIndex := 0; pgPaginas.ActivePageIndex := 0;
//RECIBOS COMPENSADOS DESHABILITADOS
pagCompensados.TabVisible := False;
ViewRecibo := frViewReciboCliente1; ViewRecibo := frViewReciboCliente1;
end; end;
@ -107,6 +109,9 @@ procedure TfEditorReciboCliente.CustomEditorClose(Sender: TObject;
var Action: TCloseAction); var Action: TCloseAction);
begin begin
inherited; inherited;
frViewRecibosCliCompensados1.cxGridView.DataController.Summary.OnAfterSummary := Nil;
frViewReciboCliImportes1.eImporte.Properties.OnEditValueChanged := NIL;
dsDataTable.DataTable := NIL; dsDataTable.DataTable := NIL;
FViewRecibo := NIL; FViewRecibo := NIL;
FRecibo := NIL; FRecibo := NIL;

3
Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
View File

@ -125,6 +125,9 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
Kind = skSum Kind = skSum
Column = frViewRecibosCliente1.cxGridViewOTROS_GASTOS Column = frViewRecibosCliente1.cxGridViewOTROS_GASTOS
end> end>
inherited cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn
Visible = True
end
end end
end end
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase

4
Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.dfm
View File

@ -29,9 +29,13 @@ inherited frViewRecibosCliCompensados: TfrViewRecibosCliCompensados
DataBinding.FieldName = 'RecId' DataBinding.FieldName = 'RecId'
Visible = False Visible = False
end end
inherited cxGridViewID: TcxGridDBColumn
VisibleForCustomization = False
end
object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn
DataBinding.FieldName = 'ID_RECIBO_COMPENSADO' DataBinding.FieldName = 'ID_RECIBO_COMPENSADO'
Visible = False Visible = False
VisibleForCustomization = False
end end
object cxGridViewREFERENCIA: TcxGridDBColumn object cxGridViewREFERENCIA: TcxGridDBColumn
Caption = 'Referencia' Caption = 'Referencia'

5
Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.pas
View File

@ -83,7 +83,7 @@ uses
procedure TfrViewRecibosCliCompensados.actAnadirUpdate(Sender: TObject); procedure TfrViewRecibosCliCompensados.actAnadirUpdate(Sender: TObject);
begin begin
inherited; inherited;
(Sender as TAction).Enabled := (ReciboCliente.SITUACION <> CTE_COBRADO); (Sender as TAction).Enabled := not (ReciboCliente.ID_RECIBO_COMPENSADO > 0); //(ReciboCliente.SITUACION <> CTE_COBRADO);
end; end;
procedure TfrViewRecibosCliCompensados.actContraerExecute(Sender: TObject); procedure TfrViewRecibosCliCompensados.actContraerExecute(Sender: TObject);
@ -103,7 +103,8 @@ begin
inherited; inherited;
(Sender as TAction).Enabled := ((cxGridView.Controller.SelectedRowCount > 0) (Sender as TAction).Enabled := ((cxGridView.Controller.SelectedRowCount > 0)
and (cxGridView.Controller.SelectedRows[0].HasCells) and (cxGridView.Controller.SelectedRows[0].HasCells)
and (ReciboCliente.SITUACION <> CTE_COBRADO)); and not (ReciboCliente.ID_RECIBO_COMPENSADO > 0));
// and (ReciboCliente.SITUACION <> CTE_COBRADO));
end; end;
procedure TfrViewRecibosCliCompensados.actExpandirExecute(Sender: TObject); procedure TfrViewRecibosCliCompensados.actExpandirExecute(Sender: TObject);

4
Source/Servicios/FactuGES.RODL
View File

@ -887,6 +887,8 @@
</Parameter> </Parameter>
<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" > <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
</Parameter> </Parameter>
<Parameter Name="NombreEmpresa" DataType="AnsiString" Flag="In" >
</Parameter>
<Parameter Name="VerLogotipo" DataType="Boolean" Flag="In" > <Parameter Name="VerLogotipo" DataType="Boolean" Flag="In" >
</Parameter> </Parameter>
</Parameters> </Parameters>
@ -897,6 +899,8 @@
</Parameter> </Parameter>
<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" > <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
</Parameter> </Parameter>
<Parameter Name="NombreEmpresa" DataType="AnsiString" Flag="In" >
</Parameter>
<Parameter Name="VerLogotipo" DataType="Boolean" Flag="In" > <Parameter Name="VerLogotipo" DataType="Boolean" Flag="In" >
</Parameter> </Parameter>
</Parameters> </Parameters>

14
Source/Servicios/FactuGES_Intf.pas
View File

@ -851,8 +851,8 @@ type
{ IsrvContratosCliente } { IsrvContratosCliente }
IsrvContratosCliente = interface(IDataAbstractService) IsrvContratosCliente = interface(IDataAbstractService)
['{ADBF1627-F507-4A0F-818E-38BAE28579B6}'] ['{ADBF1627-F507-4A0F-818E-38BAE28579B6}']
function GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
end; end;
{ CosrvContratosCliente } { CosrvContratosCliente }
@ -865,8 +865,8 @@ type
protected protected
function __GetInterfaceName:string; override; function __GetInterfaceName:string; override;
function GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
end; end;
implementation implementation
@ -2701,12 +2701,13 @@ begin
result := 'srvContratosCliente'; result := 'srvContratosCliente';
end; end;
function TsrvContratosCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function TsrvContratosCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
begin begin
try try
result := nil; result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme'); __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('NombreEmpresa', TypeInfo(AnsiString), NombreEmpresa, []);
__Message.Write('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []); __Message.Write('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []);
__Message.Finalize; __Message.Finalize;
@ -2719,12 +2720,13 @@ begin
end end
end; end;
function TsrvContratosCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; function TsrvContratosCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary;
begin begin
try try
result := nil; result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF'); __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('NombreEmpresa', TypeInfo(AnsiString), NombreEmpresa, []);
__Message.Write('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []); __Message.Write('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []);
__Message.Finalize; __Message.Finalize;

12
Source/Servicios/FactuGES_Invk.pas
View File

@ -2167,9 +2167,10 @@ begin
end; end;
procedure TsrvContratosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); procedure TsrvContratosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInforme(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; } { function GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary; }
var var
ListaID: FactuGES_Intf.TIntegerArray; ListaID: FactuGES_Intf.TIntegerArray;
NombreEmpresa: AnsiString;
VerLogotipo: Boolean; VerLogotipo: Boolean;
lResult: Binary; lResult: Binary;
__lObjectDisposer: TROObjectDisposer; __lObjectDisposer: TROObjectDisposer;
@ -2178,9 +2179,10 @@ begin
lResult := nil; lResult := nil;
try try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Read('NombreEmpresa', TypeInfo(AnsiString), NombreEmpresa, []);
__Message.Read('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []); __Message.Read('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []);
lResult := (__Instance as IsrvContratosCliente).GenerarInforme(ListaID, VerLogotipo); lResult := (__Instance as IsrvContratosCliente).GenerarInforme(ListaID, NombreEmpresa, VerLogotipo);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeResponse'); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []); __Message.Write('Result', TypeInfo(Binary), lResult, []);
@ -2199,9 +2201,10 @@ begin
end; end;
procedure TsrvContratosCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); procedure TsrvContratosCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerLogotipo: Boolean): Binary; } { function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean): Binary; }
var var
ListaID: FactuGES_Intf.TIntegerArray; ListaID: FactuGES_Intf.TIntegerArray;
NombreEmpresa: AnsiString;
VerLogotipo: Boolean; VerLogotipo: Boolean;
lResult: Binary; lResult: Binary;
__lObjectDisposer: TROObjectDisposer; __lObjectDisposer: TROObjectDisposer;
@ -2210,9 +2213,10 @@ begin
lResult := nil; lResult := nil;
try try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Read('NombreEmpresa', TypeInfo(AnsiString), NombreEmpresa, []);
__Message.Read('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []); __Message.Read('VerLogotipo', TypeInfo(Boolean), VerLogotipo, []);
lResult := (__Instance as IsrvContratosCliente).GenerarInformeEnPDF(ListaID, VerLogotipo); lResult := (__Instance as IsrvContratosCliente).GenerarInformeEnPDF(ListaID, NombreEmpresa, VerLogotipo);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeEnPDFResponse'); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeEnPDFResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []); __Message.Write('Result', TypeInfo(Binary), lResult, []);

BIN
Source/Servicios/RODLFile.res
View File

Binary file not shown.