Presupuestos OK a falta de RitchEdit e informe

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@90 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm

@@ -1,7 +1,5 @@
 inherited DataModuleEmpresas: TDataModuleEmpresas
-  OldCreateOrder = True
   OnCreate = DAClientDataModuleCreate
-  OnDestroy = DataModuleDestroy
   Height = 267
   Width = 402
   object RORemoteService: TRORemoteService
@@ -194,6 +192,7 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Empresas'
+    IndexDefs = <>
     Left = 176
     Top = 96
   end
@@ -281,6 +280,7 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'EmpresasDatosBanco'
+    IndexDefs = <>
     Left = 288
     Top = 96
   end

Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas

@@ -20,7 +20,6 @@ type
     tbl_EmpresasDatosBanco: TDAMemDataTable;
     ds_EmpresasDatosBanco: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
-    procedure DataModuleDestroy(Sender: TObject);
   private
     function _GetDatosBancarios : IBizEmpresasDatosBancarios;
   public
@@ -43,11 +42,6 @@ begin
   RORemoteService.Message := dmConexion.Message;
 end;
 
-procedure TDataModuleEmpresas.DataModuleDestroy(Sender: TObject);
-begin
-  ShowMessage('TDataModuleEmpresas.Destroy');
-end;
-
 function TDataModuleEmpresas.GetItem(const ID: Integer): IBizEmpresa;
 begin
   ShowHourglassCursor;

Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas

@@ -59,7 +59,6 @@ end;
 destructor TBizEmpresa.Destroy;
 begin
 Beep;
-//showmessage('Destruyendo');
   FDatosBancarios := NIL;
   FDatosBancariosLink.Free;
   inherited;

Source/Base/Base.dproj

@@ -44,6 +44,20 @@
     <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="PackageDescription">Libreria base de FactuGES</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><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\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -58,57 +72,57 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\adortl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxDataD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxEditorsD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxExportD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxExtEditorsD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxGridD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxIntl5D10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxIntlPrintSys3D10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxLibraryD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\cxPageControlD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\dbrtl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\dclIndyCore.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\designide.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\dsnap.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\dxPSCoreD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\dxThemeD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\GUISDK_D11.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\IndyCore.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\IndyProtocols.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\IndySystem.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\Jcl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JclVcl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JSDialog100.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvCmpD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvMMD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvNetD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\pckMD5.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\PNG_D10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\rtl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\TB2k_D10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\vcl.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\vclactnband.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\vcldb.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\vcljpg.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\VclSmp.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\vclx.dcp" />
+    <DCCReference Include="..\..\Output\Debug\Servidor\Informes\xmlrtl.dcp" />
     <DCCReference Include="..\Cliente\DataAbstract_Core_D10.dcp" />
     <DCCReference Include="..\Cliente\RemObjects_Core_D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxDataD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxEditorsD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxExportD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxExtEditorsD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxGridD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxIntl5D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxIntlPrintSys3D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxLibraryD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxPageControlD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dxPSCoreD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dxThemeD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -633,4 +647,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->

Source/Base/Utiles/uDataTableUtils.pas

@@ -113,7 +113,7 @@ begin
   DesconectarTabla(ATarget);
   try
     ASource.SaveToStream(AStream);
-    ShowMessage(AStream.ToReadableString);
+//    ShowMessage(AStream.ToReadableString);
     ATarget.LoadFromStream(AStream.Clone);
   finally
     FreeAndNil(AStream);

Source/Cliente/FactuGES.dpr

@@ -1,6 +1,7 @@
 program FactuGES;
 
 uses
+  ExceptionLog,
   Forms,
   Windows,
   SysUtils,

Source/Cliente/FactuGES.dproj

@@ -45,7 +45,7 @@
     <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
   </PropertyGroup>
@@ -59,16 +59,6 @@
       
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       
       
       
@@ -109,7 +99,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
@@ -588,4 +578,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=
-EurekaLog Last Line -->
+EurekaLog Last Line -->

Source/Cliente/FactuGES.drc

@@ -12,10 +12,11 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
+/* C:\Archivos de programa\EurekaLog 6\Delphi11\DIALOG.RES */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
 /* C:\Codigo Tecsitel\Lib\JVCL\JvXPCore.res */
 /* C:\Codigo Tecsitel\Source\Cliente\uSplash.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\uAcercaDe.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\uPantallaPrincipal.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfF0.tmp */
+/* C:\Codigo Tecsitel\Source\Cliente\FactuGES.drf */

Source/GUIBase/GUIBase.dproj

@@ -57,22 +57,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Base.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxBarD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxBarD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxBarExtItemsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxBarExtItemsD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxLayoutControlD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxPScxCommonD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxPsPrVwAdvD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPsPrVwAdvD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\frx10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\frx10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\frxe10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\frxe10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\fs10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\fs10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/GUIBase.drc

@@ -35,4 +35,4 @@ END
 /* C:\Codigo Tecsitel\Source\GUIBase\uDialogBase.dfm */
 /* C:\Codigo Tecsitel\Source\GUIBase\uViewGrid.dfm */
 /* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf88.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf17B.tmp */

Source/GUIBase/uEditorPreview.pas

@@ -105,9 +105,11 @@ type
     function GetReport: TfrxReport; virtual;
   public
     constructor Create(AOwner: TComponent); override;
+
+
     property Report: TfrxReport read GetReport;
     procedure Print;
-    procedure Preview;    
+    procedure Preview;
     procedure LoadFromStream(AStream : TStream);
     function ExportToFile : String;
   end;
@@ -209,7 +211,7 @@ end;
 procedure TfEditorPreview.FormDestroy(Sender: TObject);
 begin
   inherited;
-  FPreview.Free;
+  FreeAndNil(FPreview);
 end;
 
 procedure TfEditorPreview.FormResize(Sender: TObject);

Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj

@@ -41,57 +41,17 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
+<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">AlbaranesCliente_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-      <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">AlbaranesCliente_controller.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="AlbaranesCliente_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\AlbaranesCliente_data.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Model\AlbaranesCliente_data.dcp" />
-    <DCCReference Include="..\..\Lib\AlbaranesCliente_model.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Model\AlbaranesCliente_model.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Model\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Model\Contactos_controller.dcp" />
     <DCCReference Include="uAlbaranesClienteController.pas" />
     <DCCReference Include="uAlbaranesClienteReportController.pas" />
     <DCCReference Include="uArticulosAlbaranClienteController.pas" />
@@ -106,7 +66,6 @@
     <DCCReference Include="View\uIEditorElegirArticulosAlbaranesCliente.pas" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfDC.tmp */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.drf */

Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas

@@ -78,7 +78,6 @@ type
     procedure RecuperarObjetos(AAlbaran: IBizAlbaranCliente); virtual;
 
     procedure RecibirAviso(ASujeto: ISujeto; ADataTable: IDAStronglyTypedDataTable); override;
-//    procedure AsignarID(AAlbaran: IBizAlbaranCliente; const IDNuevo : Integer);
     function CreateEditor(const AName : String; const IID: TGUID; out Intf): Boolean;
     procedure FiltrarEmpresa(AAlbaran: IBizAlbaranCliente);
     function _Vacio : IBizAlbaranCliente;
@@ -182,30 +181,6 @@ begin
   FDataModule := TDataModuleAlbaranesCliente.Create(Nil);
 end;
 
-{
-procedure TAlbaranesClienteController.AsignarID(AAlbaran: IBizAlbaranCliente; const IDNuevo : Integer);
-begin
-  if not Assigned(AAlbaran) then
-    raise Exception.Create ('Albarán no asignado');
-
-  if not Assigned(AAlbaran.Detalles) then
-    raise Exception.Create ('Detalles de albarán no asignados');
-
-  if not Assigned(FDetallesController) then
-    raise Exception.Create ('Controller detalles no asignado');
-
-  { Los detalles siempre hay que comprobarlos }
-{  FDetallesController.AsignarID(AAlbaran.Detalles, IDNuevo, AAlbaran.EsNuevo);
-
-  if AAlbaran.EsNuevo then
-  begin
-    AAlbaran.Edit;
-    AAlbaran.ID := IDNuevo;
-    AAlbaran.Post;
-  end;
-end;
-}
-
 function TAlbaranesClienteController.Buscar(const ID: Integer): IBizAlbaranCliente;
 begin
   Result := FDataModule.GetItem(ID);
@@ -217,6 +192,13 @@ begin
   ShowHourglassCursor;
   try
     Result := BuscarTodos;
+    with Result.DataTable.DynamicWhere do
+    begin
+      // (ID = :ID)
+      Expression := NewBinaryExpression(NewField('', fld_AlbaranesClienteIMPORTE_TOTAL),
+      NewConstant(0, datCurrency), dboLess);
+    end;
+{
     with Result.DataTable.Where do
     begin
       if NotEmpty then
@@ -225,6 +207,7 @@ begin
       AddCondition(fld_AlbaranesClienteIMPORTE_TOTAL, cLess, 0);
       CloseBraket;
     end;
+}
   finally
     HideHourglassCursor;
   end;
@@ -235,7 +218,14 @@ begin
   ShowHourglassCursor;
   try
     Result := BuscarTodos;
-    with Result.DataTable.Where do
+    with Result.DataTable.DynamicWhere do
+    begin
+      // (ID = :ID)
+      Expression := NewBinaryExpression(NewField('', fld_AlbaranesClienteIMPORTE_TOTAL),
+      NewConstant(0, datCurrency), dboGreaterOrEqual);
+    end;
+
+{    with Result.DataTable.Where do
     begin
       if NotEmpty then
         AddOperator(opAND);
@@ -243,6 +233,7 @@ begin
       AddCondition(fld_AlbaranesClienteIMPORTE_TOTAL, cMajorOrEqual, 0);
       CloseBraket;
     end;
+}
   finally
     HideHourglassCursor;
   end;
@@ -880,12 +871,6 @@ begin
     RecalcularImportes(AAlbaran);
 
     try
-//      if (AAlbaran.EsNuevo) then
-//        IDNuevo := FDataModule.GetNextID(AAlbaran.DataTable.LogicalName)
-//      else
-//       IDNuevo := AAlbaran.ID;
-
-//      AsignarID(AAlbaran, IDNuevo);
       AAlbaran.DataTable.ApplyUpdates;
       Result := True;
     finally

Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas

@@ -64,22 +64,25 @@ var
   AEditor : IEditorAlbaranesClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetEtiquetas(AID, withRefCliente);
     try
       CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TAlbaranesClienteReportController.EtiquetasPrint(const AID: integer; const withRefCliente: Boolean);
@@ -88,22 +91,25 @@ var
   AEditor : IEditorAlbaranesClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetEtiquetas(AID, withRefCliente);
     try
       CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Print
 end;
 
 procedure TAlbaranesClienteReportController.Preview(const AID : String);
@@ -112,22 +118,25 @@ var
   AEditor : IEditorAlbaranesClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetReport(AID); //Lista de seleccionados (Array de integers)
     try
       CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TAlbaranesClienteReportController.Print(const AID : String);
@@ -136,22 +145,25 @@ var
   AEditor : IEditorAlbaranesClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetReport(AID);
     try
       CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Print
 end;
 
 end.

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfDA.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1CD.tmp */

Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm

@@ -30,6 +30,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_ALBARANES_CLI_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'AlbaranesCliente_ID'
         InPrimaryKey = True
       end
@@ -61,6 +62,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         DataType = datString
         Size = 255
         DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
         DictionaryEntry = 'AlbaranesCliente_REFERENCIA'
       end
       item
@@ -280,13 +282,14 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'AlbaranesCliente'
-    Left = 176
+    IndexDefs = <>
-    Top = 96
+    Left = 208
+    Top = 104
   end
   object ds_AlbaranesCliente: TDADataSource
     DataSet = tbl_AlbaranesCliente.Dataset
     DataTable = tbl_AlbaranesCliente
-    Left = 176
+    Left = 208
     Top = 40
   end
   object tbl_AlbaranesCliente_Detalles: TDAMemDataTable
@@ -316,11 +319,6 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         Size = 10
         DictionaryEntry = 'AlbaranesCliente_Detalles_TIPO_DETALLE'
       end
-      item
-        Name = 'ID_ARTICULO'
-        DataType = datInteger
-        DictionaryEntry = 'AlbaranesCliente_Detalles_ID_ARTICULO'
-      end
       item
         Name = 'CONCEPTO'
         DataType = datString
@@ -368,12 +366,19 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         DictionaryEntry = 'AlbaranesCliente_Detalles_VISIBLE'
       end
       item
-        Name = 'FECHA_ALTA'
+        Name = 'ID_ARTICULO'
-        DataType = datDateTime
+        DataType = datInteger
+        DictionaryEntry = 'AlbaranesCliente_Detalles_ID_ARTICULO'
       end
       item
-        Name = 'FECHA_MODIFICACION'
+        Name = 'REFERENCIA'
-        DataType = datDateTime
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'REFERENCIA_PROVEEDOR'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     MasterMappingMode = mmWhere
@@ -385,13 +390,14 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'AlbaranesCliente_Detalles'
-    Left = 368
+    IndexDefs = <>
-    Top = 96
+    Left = 384
+    Top = 104
   end
   object ds_AlbaranesCliente_Detalles: TDADataSource
     DataSet = tbl_AlbaranesCliente_Detalles.Dataset
     DataTable = tbl_AlbaranesCliente_Detalles
-    Left = 368
+    Left = 384
     Top = 40
   end
 end

Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas

@@ -79,8 +79,7 @@ begin
     with ADetalles do
     begin
       BusinessRulesID := BIZ_CLIENT_DETALLES_ALBARAN_CLIENTE;
-      DetailOptions := DetailOptions -
+      DetailOptions := DetailOptions - [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
-        [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
     end;
     Result := (ADetalles as IBizDetallesAlbaranCliente);
   finally
@@ -98,7 +97,8 @@ begin
   ShowHourglassCursor;
   try
     Result := Self.GetItems;
-    with Result.DataTable.Where do
+//REVISAR    
+{    with Result.DataTable.Where do
     begin
       if NotEmpty then
          AddOperator(opAND);
@@ -106,6 +106,7 @@ begin
       AddText(fld_AlbaranesClienteID + ' = ' + IntToStr(ID));
       CloseBraket;
     end;
+}
   finally
     HideHourglassCursor;
   end;

Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfD8.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1CB.tmp */

Source/Modulos/Albaranes de cliente/Model/uBizAlbaranClienteServer.pas

@@ -3,8 +3,7 @@ unit uBizAlbaranClienteServer;
 interface
 
 uses
-  schAlbaranesClienteServer_Intf,
+  schAlbaranesClienteServer_Intf, uDAInterfaces, uDADelta,
-  uDAInterfaces,
   uDADataTable, uDABusinessProcessor;
 
 const
@@ -15,8 +14,7 @@ const
 type
   TBizAlbaranClienteServer = class(TAlbaranesClienteBusinessProcessorRules)
   protected
-//    procedure BeforeProcessChange(Sender: TDABusinessProcessor; aChangeType: TDAChangeType; aChange: TDADeltaChange;
+    procedure BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta); override;
-//      var ProcessChange: Boolean); override;
   end;
 
 implementation
@@ -25,12 +23,9 @@ uses
   Dialogs, SysUtils, Variants, uDataModuleServer, uDAClasses, DARemoteService_Impl,
   schAlbaranesClienteClient_Intf, uBusinessUtils, uReferenciasUtils, uROClasses;
 
-{ TBizAlbaranesClienteServer }
+{ TBizAlbaranClienteServer }
 
-{
+procedure TBizAlbaranClienteServer.BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta);
-procedure TBizAlbaranClienteServer.BeforeProcessChange(
-  Sender: TDABusinessProcessor; aChangeType: TDAChangeType;
-  aChange: TDADeltaChange; var ProcessChange: Boolean);
 var
   ASchema : TDASchema;
   ACurrentConn : IDAConnection;
@@ -40,24 +35,24 @@ var
 
 begin
   inherited;
-  case aChangeType of
+  case Sender.CurrentChange.ChangeType of
     ctInsert, ctUpdate: begin
       //Si la referencia no ha sido asignada le asignamos una nosotros
-      if (VarIsNull(aChange.NewValueByName[fld_AlbaranesClienteREFERENCIA]))
+      if (VarIsNull(Sender.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA]))
-      or (VarToStr(aChange.NewValueByName[fld_AlbaranesClienteREFERENCIA]) = '') then
+      or (VarToStr(Sender.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA]) = '') then
       begin
         ASchema := BusinessProcessor.Schema;
         ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
 
         try
           //Siempre va a estar rellena
-          Empresa := aChange.NewValueByName[fld_AlbaranesClienteID_EMPRESA];
+          Empresa := Sender.CurrentChange.NewValueByName[fld_AlbaranesClienteID_EMPRESA];
-          if (aChange.NewValueByName[fld_AlbaranesClienteIMPORTE_TOTAL] < 0) then
+          if (Sender.CurrentChange.NewValueByName[fld_AlbaranesClienteIMPORTE_TOTAL] < 0) then
              CodigoReferencia := REF_ALBARANES_DEV_CLIENTE
           else
              CodigoReferencia := REF_ALBARANES_CLIENTE;
 
-          dsData := ASchema.NewDataset(ACurrentConn, 'DarReferencia', ['CODIGO', 'ID_EMPRESA'], [CodigoReferencia, Empresa]);
+          dsData := ASchema.NewDataset(ACurrentConn, 'DarReferencia', ['CODIGO', 'EMPRESA'], [CodigoReferencia, Empresa]);
         except
           RaiseError('No existe la tabla REFERENCIAS');
         end;
@@ -70,7 +65,7 @@ begin
         REFERENCIA := dsData.FieldByName(fld_DarReferenciaVALOR).AsString;
 
         try
-          ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'ID_EMPRESA'], [CodigoReferencia, DarReferenciaSiguiente(REFERENCIA), Empresa]);
+          ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'EMPRESA'], [CodigoReferencia, DarReferenciaSiguiente(REFERENCIA), Empresa]);
         except
           RaiseError('Error al asignar la nueva ' + REFERENCIA + ' referencia en tabla');
         end;
@@ -79,7 +74,6 @@ begin
     end;
   end;
 end;
-}
 
 initialization
   RegisterBusinessProcessorRules(BIZ_SERVER_ALBARAN_CLIENTE, TBizAlbaranClienteServer);

Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas

@@ -74,8 +74,6 @@ type
     procedure OnNewRecord(Sender: TDADataTable); override;
     procedure IniciarValoresAlbaranNuevo;
 
-
-
   public
     function EsNuevo : Boolean;
     procedure CalcularImporteTotal;
@@ -214,7 +212,6 @@ end;
 procedure TBizAlbaranCliente.OnNewRecord(Sender: TDADataTable);
 begin
   inherited;
-  ID := GetRecNo; // -1, -2, -3...
   IniciarValoresAlbaranNuevo;
 end;
 

Source/Modulos/Albaranes de cliente/Model/uBizDetallesAlbaranCliente.pas

@@ -15,35 +15,12 @@ type
   end;
 
   TBizDetallesAlbaranCliente = class(TAlbaranesCliente_DetallesDataTableRules, IBizDetallesAlbaranCliente)
-  private
-    ContIdAux: Integer;
-  protected
-    procedure OnNewRecord(Sender: TDADataTable); override;
-  public
-    constructor Create(aDataTable: TDADataTable); override;
   end;
 
 implementation
 
 { TBizDetallesAlbaranCliente }
 
-uses
-  uDataTableUtils;
-
-
-constructor TBizDetallesAlbaranCliente.Create(aDataTable: TDADataTable);
-begin
-  inherited Create(aDataTable);
-  ContIdAux := -1;
-end;
-
-procedure TBizDetallesAlbaranCliente.OnNewRecord(Sender: TDADataTable);
-begin
-  inherited;
-  ID := ContIdAux; // -1, -2, -3...
-  Dec(ContIdAux);
-end;
-
 initialization
   RegisterDataTableRules(BIZ_CLIENT_DETALLES_ALBARAN_CLIENTE, TBizDetallesAlbaranCliente);
 

Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfEA.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DD.tmp */

Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas

@@ -15,8 +15,8 @@ uses
   {Ancestor Implementation:} DataAbstractService_Impl,
   {Used RODLs:} DataAbstract4_Intf,
   {Generated:} FactuGES_Intf, uDADataTable, uDABINAdapter, uDAClasses,
-  uDAScriptingProvider, uDABusinessProcessor, uDAInterfaces, uDADataStreamer,
+  uDAInterfaces, uDAScriptingProvider,
-  uDABin2DataStreamer;
+  uDABusinessProcessor, uDADataStreamer, uDABin2DataStreamer;
 {
   uDACDSDataTable, uDAInterfaces, DB,
   frxClass, frxDBSet,  frxDCtrl, frxDMPExport, frxGradient,
@@ -30,11 +30,11 @@ type
     Bin2DataStreamer: TDABin2DataStreamer;
     schAlbaranesCliente: TDASchema;
     DADataDictionary: TDADataDictionary;
+    procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
+      var aConnectionName: string);
     procedure DARemoteServiceBeforeGetDatasetData(const Dataset: IDADataset;
       const IncludeSchema: Boolean; const MaxRecords: Integer);
     procedure DARemoteServiceCreate(Sender: TObject);
-    procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
-      var aConnectionName: string);
   private
   protected
     { IsrvAlbaranesCliente methods }
@@ -46,7 +46,6 @@ implementation
 
 {$R *.dfm}
 uses
-  Dialogs,
   {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
   schAlbaranesClienteClient_Intf, uRestriccionesUsuarioUtils,
 //  uRptAlbaranesCliente_Server,

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc

@@ -27,4 +27,4 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE8.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DB.tmp */

Source/Modulos/Contactos/Controller/Contactos_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Controller\Contactos_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfAE.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A1.tmp */

Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas

@@ -57,22 +57,25 @@ var
   AEditor : IEditorEtiquetasContactosPreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(AContactosID);
+    AStream := FDataModule.GetReport(AContactosID);
     try
       CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TEtiquetasContactosReportController.Print(const AContactosID : String);
@@ -81,22 +84,25 @@ var
   AEditor : IEditorEtiquetasContactosPreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(AContactosID);
+    AStream := FDataModule.GetReport(AContactosID);
     try
       CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Print
 end;
 
 end.

Source/Modulos/Contactos/Data/Contactos_data.drc

@@ -17,4 +17,4 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleProveedores.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleEmpleados.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\Contactos_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfAC.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf19F.tmp */

Source/Modulos/Contactos/Model/Contactos_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Model\Contactos_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfAA.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf19D.tmp */

Source/Modulos/Contactos/Plugin/Contactos_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Plugin\uPluginContactos.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Plugin\Contactos_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfB2.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A5.tmp */

Source/Modulos/Contactos/Views/Contactos_view.drc

@@ -45,4 +45,4 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDatosYSeleccionProveedor.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDatosYSeleccionCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\Contactos_view.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfB0.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A3.tmp */

Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Controller\FacturasCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE2.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D5.tmp */

Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas

@@ -104,75 +104,6 @@ begin
   end;
 end;}
 
-{procedure TDetallesFacturaClienteController.AsignarID(
-  ADetalles: IBizDetallesFacturaCliente; IDCabecera: Integer;
-  EsNuevo: Boolean);
-begin
-  with ADetalles do
-  begin
-    DataTable.DisableControls;
-    try
-      if not DataTable.Active then
-        DataTable.Active := True;
-
-//        AuxPosicion := POSICION;
-
-      { ¡¡¡¡ OJO !!!!
-        Para asignar el ID en los detalles hay
-        que tener en cuenta una cosa:
-        Si se cambia el ID, ese detalle ya no
-        pertenece a esa cabecera porque ya no se
-        cumple la condición de la relacion:
-          Master.ID = Detail.ID_PRESUPUESTO.
-
-        Por esa razón no sirve hacer un recorrido
-        desde el principio hasta el final porque
-        las detalles van desapareciendo según asignamos
-        el valor al campo ID y nos mueve aleatoriamente
-        la posición del registro actual.
-
-        Es mejor hacer un bucle sencillo hasta que
-        "se gasten" todos los detalles. Cuando el
-        RecordCount llegue a 0 quiere decir que hemos
-        tratado todos los detalles.
-
-        El bucle cambia en el caso de ser llamada esta funcion desde modificar
-        un presupuesto ya que en ese caso si que hay que hacer un recorrido
-        total de las tuplas de detalle.
-      }
-
-{      if EsNuevo then
-      begin
-        while RecordCount > 0 do
-        begin
-          DataTable.First;
-          Edit;
-          ID := FDataModule.GetNextID(DataTable.LogicalName);
-          ID_FACTURA := IDCabecera;
-          Post
-        end
-      end
-      else
-      begin
-        DataTable.First;
-        while not DataTable.EOF do
-        begin
-          if ID < 0 then
-          begin
-            Edit;
-            ID := FDataModule.GetNextID(DataTable.LogicalName);
-            ID_FACTURA := IDCabecera;
-            Post
-          end;
-          DataTable.Next
-        end;
-      end;
-    finally
-      DataTable.EnableControls;
-    end;
-  end;
-end;}
-
 function TDetallesFacturaClienteController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
   Result := CalcularLineaConcepto(DataTable);

Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas

@@ -62,7 +62,6 @@ type
     function GetDetallesController: IDetallesFacturaClienteController;
     procedure SetDetallesController(const Value: IDetallesFacturaClienteController);
 
-//    procedure AsignarID(AFactura: IBizFacturaCliente; const IDNuevo : Integer);
     function CreateEditor(const AName : String; const IID: TGUID; out Intf): Boolean;
     function _Vacio : IBizFacturaCliente;
 
@@ -404,27 +403,6 @@ begin
   end;
 end;}
 
-{procedure TFacturasClienteController.AsignarID(AFactura: IBizFacturaCliente; const IDNuevo: Integer);
-begin
-  if not Assigned(AFactura) then
-    raise Exception.Create ('Factura no asignada');
-
-  if not Assigned(AFactura.Detalles) then
-    raise Exception.Create ('Detalles de factura no asignados');
-
-  if not Assigned(FDetallesController) then
-    raise Exception.Create ('Controller detalles no asignado');
-
-  { Los detalles siempre hay que comprobarlos }
-{  FDetallesController.AsignarID(AFactura.Detalles, IDNuevo, AFactura.EsNuevo);
-
-  if AFactura.EsNuevo then
-  begin
-    AFactura.Edit;
-    AFactura.ID := IDNuevo;
-    AFactura.Post;
-  end;
-end;}
 
 function TFacturasClienteController.Buscar(const ID: Integer): IBizFacturaCliente;
 begin
@@ -899,12 +877,6 @@ begin
     RecalcularImportes(AFactura);
 
     try
-//      if (AFactura.EsNuevo) then
-//        IDNuevo := FDataModule.GetNextID(AFactura.DataTable.LogicalName)
-//      else
-//        IDNuevo := AFactura.ID;
-
-//      AsignarID(AFactura, IDNuevo);
       AFactura.DataTable.ApplyUpdates;
 
       //Se generan los recibos automáticamente a partir de la forma de pago

Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas

@@ -60,22 +60,25 @@ var
   AEditor : IEditorFacturasClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(AFacturaID);
+    AStream := FDataModule.GetReport(AFacturaID);
     try
       CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;        
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TFacturasClienteReportController.Print(const AFacturaID : String);
@@ -84,22 +87,25 @@ var
   AEditor : IEditorFacturasClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(AFacturaID);
+    AStream := FDataModule.GetReport(AFacturaID);
     try
       CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Print
 end;
 
 end.

Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE0.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D3.tmp */

Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfDE.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D1.tmp */

Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfEE.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E1.tmp */

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc

@@ -22,4 +22,4 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfEC.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DF.tmp */

Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.dproj

@@ -49,11 +49,11 @@
     <DelphiCompile Include="PresupuestosCliente_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Articulos_controller.dcp" />
+    <DCCReference Include="..\Articulos_controller.dcp" />
-    <DCCReference Include="Contactos_controller.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="PresupuestosCliente_data.dcp" />
+    <DCCReference Include="..\PresupuestosCliente_data.dcp" />
-    <DCCReference Include="PresupuestosCliente_model.dcp" />
+    <DCCReference Include="..\PresupuestosCliente_model.dcp" />
     <DCCReference Include="uArticulosPresupuestoClienteController.pas" />
     <DCCReference Include="uDetallesPresupuestoClienteController.pas" />
     <DCCReference Include="uPresupuestosClienteController.pas" />
@@ -548,4 +548,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->

Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Controller\PresupuestosCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfD6.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C9.tmp */

Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas

@@ -725,7 +725,7 @@ begin
   try
    ID_Presupuestos := TStringList.Create;
 
-   //Si deseamos previsualizar todos los items del objeto albaran
+   //Si deseamos previsualizar todos los items del objeto presupuesto
    if AllItems then
    begin
      with APresupuesto.DataTable do
@@ -746,7 +746,7 @@ begin
 
   finally
     AReportController := NIL;
-    ID_Presupuestos.Free;
+    FreeAndNil(ID_Presupuestos);
   end;
 end;
 

Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas

@@ -59,22 +59,25 @@ var
   AEditor : IEditorPresupuestosClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetReport(AID);
     try
       CreateEditor('EditorPresupuestosClientePreview', IEditorPresupuestosClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TPresupuestosClienteReportController.Print(const AID : String);
@@ -83,22 +86,28 @@ var
   AEditor : IEditorPresupuestosClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(AID);
+    AStream := FDataModule.GetReport(AID);
     try
       CreateEditor('EditorPresupuestosClientePreview', IEditorPresupuestosClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
 
   if Assigned(AEditor) then
-    AEditor.Print
+
 end;
 
 end.

Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Data\uDataModulePresupuestosCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Data\PresupuestosCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfD4.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C7.tmp */

Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.pas

@@ -80,8 +80,7 @@ begin
     with ADetalles do
     begin
       BusinessRulesID := BIZ_CLIENT_DETALLES_PRESUPUESTO_CLIENTE;
-      DetailOptions := DetailOptions -
+      DetailOptions := DetailOptions - [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
-        [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
     end;
     Result := (ADetalles as IBizDetallesPresupuestoCliente);
   finally
@@ -121,10 +120,7 @@ begin
     AsignarClaseNegocio(APresupuesto);
 
     with TBizPresupuestoCliente(APresupuesto.BusinessEventsObj) do
-    begin
+         Detalles := _GetDetalles;
-      showmessage('Voy a asignar los detalles');
-      Detalles := _GetDetalles;
-    end;
 
     Result := (APresupuesto as IBizPresupuestoCliente);
   finally

Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Model\PresupuestosCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfD2.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C5.tmp */

Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_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_DarReferencia = '{54E7EE17-B5A5-4CA3-A697-84AB22C5B88F}';
+  RID_DarReferencia = '{0E25C9EE-290E-48B3-A135-C7C7128DF9B8}';
-  RID_PresupuestosCliente = '{66DE200E-0508-4CB0-890A-3CCC61E2C86C}';
+  RID_PresupuestosCliente = '{632FC123-90B6-4E44-A24C-D67715FFFA86}';
-  RID_PresupuestosCliente_Detalles = '{EE5CC98E-600B-4DB2-BC7A-A6E00DA2F287}';
+  RID_PresupuestosCliente_Detalles = '{4D48AE43-3E5E-4D41-A619-4D7873065407}';
 
   { Data table names }
   nme_DarReferencia = 'DarReferencia';
@@ -119,7 +119,7 @@ const
 type
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{D37FA18C-421C-4FE2-BCBF-ED8B75F165D3}']
+  ['{7779EF23-3D43-4609-8A92-378D0BC8126E}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -154,7 +154,7 @@ type
 
   { IPresupuestosCliente }
   IPresupuestosCliente = interface(IDAStronglyTypedDataTable)
-  ['{D125D439-2B20-4F99-BD79-E2AD460661CE}']
+  ['{BA5CD1DE-F008-446F-A424-67B2F318DB01}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -513,7 +513,7 @@ type
 
   { IPresupuestosCliente_Detalles }
   IPresupuestosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{4D3B13BE-62CC-428D-916B-A3D1D36852FE}']
+  ['{257BE485-4D3D-4312-ACF2-6047EFDB96D6}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);

Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_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_DarReferenciaDelta = '{A9243289-0553-4E9A-85B2-51E01EBDB18B}';
+  RID_DarReferenciaDelta = '{FC7E5FD9-9CC1-4026-BA08-1DF06F3D1D5E}';
-  RID_PresupuestosClienteDelta = '{367BB3F4-EC4E-49ED-ACF6-4A0F1A85E580}';
+  RID_PresupuestosClienteDelta = '{E2147326-69DE-4FBD-8CAE-8C01530544F7}';
-  RID_PresupuestosCliente_DetallesDelta = '{ED838F56-5DC9-4667-B2A2-F2ACC0A249B2}';
+  RID_PresupuestosCliente_DetallesDelta = '{AD363AEF-96FD-49CE-B096-8080CE467488}';
 
 type
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{A9243289-0553-4E9A-85B2-51E01EBDB18B}']
+  ['{FC7E5FD9-9CC1-4026-BA08-1DF06F3D1D5E}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IPresupuestosClienteDelta }
   IPresupuestosClienteDelta = interface(IPresupuestosCliente)
-  ['{367BB3F4-EC4E-49ED-ACF6-4A0F1A85E580}']
+  ['{E2147326-69DE-4FBD-8CAE-8C01530544F7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -412,7 +412,7 @@ type
 
   { IPresupuestosCliente_DetallesDelta }
   IPresupuestosCliente_DetallesDelta = interface(IPresupuestosCliente_Detalles)
-  ['{ED838F56-5DC9-4667-B2A2-F2ACC0A249B2}']
+  ['{AD363AEF-96FD-49CE-B096-8080CE467488}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PRESUPUESTOValue : Integer;

Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Plugin\uPluginPresupuestosCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Plugin\PresupuestosCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE6.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D9.tmp */

Source/Modulos/Presupuestos de cliente/Reports/uRptPedidosCliente_Server.dfm

@@ -1,60 +1,20 @@
-object RptPedidosCliente: TRptPedidosCliente
+object RptPresupuestosCliente: TRptPresupuestosCliente
   OldCreateOrder = True
   OnCreate = DataModuleCreate
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
+    DataSet = tbl_Cabecera.Dataset
     DataTable = tbl_Cabecera
     Left = 264
     Top = 72
   end
   object DADataDetalles: TDADataSource
+    DataSet = tbl_Detalles.Dataset
     DataTable = tbl_Detalles
     Left = 344
     Top = 72
   end
-  object tbl_Cabecera: TDACDSDataTable
-    RemoteUpdatesOptions = []
-    Fields = <>
-    Params = <>
-    MasterMappingMode = mmDataRequest
-    LogChanges = False
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    SchemaCall.Params = <>
-    DataRequestCall.Params = <>
-    DataUpdateCall.Params = <>
-    ScriptCall.Params = <>
-    ReadOnly = False
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    IndexDefs = <>
-    Left = 264
-    Top = 128
-  end
-  object tbl_Detalles: TDACDSDataTable
-    RemoteUpdatesOptions = []
-    Fields = <>
-    Params = <>
-    MasterMappingMode = mmDataRequest
-    LogChanges = False
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    SchemaCall.Params = <>
-    DataRequestCall.Params = <>
-    DataUpdateCall.Params = <>
-    ScriptCall.Params = <>
-    ReadOnly = False
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    IndexDefs = <>
-    Left = 344
-    Top = 128
-  end
-  object DABINAdapter: TDABINAdapter
-    Left = 48
-    Top = 80
-  end
   object frxRichObject1: TfrxRichObject
     Left = 48
     Top = 296
@@ -79,10 +39,6 @@ object RptPedidosCliente: TRptPedidosCliente
     Left = 360
     Top = 296
   end
-  object frxChartObject1: TfrxChartObject
-    Left = 256
-    Top = 344
-  end
   object schReport: TDASchema
     ConnectionManager = dmServer.ConnectionManager
     DataDictionary = DataDictionary
@@ -92,7 +48,6 @@ object RptPedidosCliente: TRptPedidosCliente
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = '15'
             ParamType = daptInput
           end>
@@ -262,389 +217,156 @@ object RptPedidosCliente: TRptPedidosCliente
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_EMPRESA'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_CLIENTE'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMBRE_COMERCIAL'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_PEDIDO'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA_CLIENTE'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'SITUACION'
             DataType = datString
             Size = 9
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_TOTAL'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'OBSERVACIONES'
             DataType = datMemo
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMBRE'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CALLE'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODIGO_POSTAL'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PROVINCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PERSONA_CONTACTO'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TELEFONO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'INCIDENCIAS'
             DataType = datMemo
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'INCIDENCIAS_ACTIVAS'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_ALTA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_MODIFICACION'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'USUARIO'
             DataType = datString
             Size = 20
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_NETO'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_PORTE'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESCUENTO'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_DESCUENTO'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BASE_IMPONIBLE'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IVA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_IVA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'POBLACION'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_FORMA_PAGO'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMBRE_EMPRESA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TELEFONO_1_EMPRESA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAX_EMPRESA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <
           item
             Name = 'ID_PEDIDO'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -714,142 +436,66 @@ object RptPedidosCliente: TRptPedidosCliente
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_PEDIDO'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'POSICION'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TIPO_DETALLE'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CONCEPTO'
             DataType = datString
             Size = 2000
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANTIDAD'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_UNIDAD'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_TOTAL'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAMILIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA_PROVEEDOR'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
+    JoinDataTables = <>
+    UnionDataTables = <>
     Commands = <>
     RelationShips = <>
     UpdateRules = <>
+    Version = 0
     Left = 48
     Top = 16
   end
   object DataDictionary: TDADataDictionary
     Fields = <>
     Left = 46
-    Top = 158
+    Top = 142
   end
   object frxReport: TfrxReport
     Version = '3.23.7'
@@ -949,4 +595,30 @@ object RptPedidosCliente: TRptPedidosCliente
     Left = 344
     Top = 16
   end
+  object Bin2DataStreamer: TDABin2DataStreamer
+    Left = 48
+    Top = 80
+  end
+  object tbl_Cabecera: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    IndexDefs = <>
+    Left = 264
+    Top = 128
+  end
+  object tbl_Detalles: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    IndexDefs = <>
+    Left = 344
+    Top = 128
+  end
 end

Source/Modulos/Presupuestos de cliente/Reports/uRptPedidosCliente_Server.pas

@@ -7,15 +7,12 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces;
+  uDAInterfaces, uDAMemDataTable, uDADataStreamer, uDABin2DataStreamer;
 
 type
-  TRptPedidosCliente = class(TDataModule)
+  TRptPresupuestosCliente = class(TDataModule)
     DADataCabecera: TDADataSource;
     DADataDetalles: TDADataSource;
-    tbl_Cabecera: TDACDSDataTable;
-    tbl_Detalles: TDACDSDataTable;
-    DABINAdapter: TDABINAdapter;
     frxRichObject1: TfrxRichObject;
     frxBarCodeObject1: TfrxBarCodeObject;
     frxOLEObject1: TfrxOLEObject;
@@ -28,6 +25,9 @@ type
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
     frxReport: TfrxReport;
+    Bin2DataStreamer: TDABin2DataStreamer;
+    tbl_Cabecera: TDAMemDataTable;
+    tbl_Detalles: TDAMemDataTable;
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
@@ -54,14 +54,14 @@ const
 { TRptPedidosProveedor }
 
 
-procedure TRptPedidosCliente.DataModuleCreate(Sender: TObject);
+procedure TRptPresupuestosCliente.DataModuleCreate(Sender: TObject);
 begin
   schReport.ConnectionManager := dmServer.ConnectionManager;
   FConnection := dmServer.DarNuevaConexion;
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 end;
 
-function TRptPedidosCliente.GenerarPedido(const AID: String): Binary;
+function TRptPresupuestosCliente.GenerarPedido(const AID: String): Binary;
 var
   ID_Pedidos: TStringList;
   i: Integer;
@@ -85,7 +85,7 @@ begin
   end;
 end;
 
-procedure TRptPedidosCliente.GenerarPedido(const AID: Integer);
+procedure TRptPresupuestosCliente.GenerarPedido(const AID: Integer);
 var
   AStream: TMemoryStream;
   dsMaster: IDADataset;

Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm

@@ -0,0 +1,605 @@
+object RptPresupuestosCliente: TRptPresupuestosCliente
+  OldCreateOrder = True
+  OnCreate = DataModuleCreate
+  Height = 405
+  Width = 447
+  object DADataCabecera: TDADataSource
+    DataSet = tbl_Cabecera.Dataset
+    DataTable = tbl_Cabecera
+    Left = 264
+    Top = 72
+  end
+  object DADataDetalles: TDADataSource
+    DataSet = tbl_Detalles.Dataset
+    DataTable = tbl_Detalles
+    Left = 344
+    Top = 72
+  end
+  object frxBarCodeObject1: TfrxBarCodeObject
+    Left = 144
+    Top = 296
+  end
+  object frxOLEObject1: TfrxOLEObject
+    Left = 48
+    Top = 344
+  end
+  object frxCrossObject1: TfrxCrossObject
+    Left = 144
+    Top = 344
+  end
+  object frxCheckBoxObject1: TfrxCheckBoxObject
+    Left = 256
+    Top = 296
+  end
+  object frxGradientObject1: TfrxGradientObject
+    Left = 360
+    Top = 296
+  end
+  object schReport: TDASchema
+    ConnectionManager = dmServer.ConnectionManager
+    DataDictionary = DataDictionary
+    Datasets = <
+      item
+        Params = <
+          item
+            Name = 'ID'
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'V_PRESUPUESTOS_CLIENTE'
+            SQL = 
+              'SELECT '#10'    ID, ID_EMPRESA, FECHA_PRESUPUESTO, FECHA_DECISION, '#10 +
+              '    REFERENCIA, SITUACION, ID_CLIENTE, NIF_CIF, NOMBRE, '#10'    REF' +
+              'ERENCIA_CLIENTE, CLIENTE_FINAL, PORTADA, MEMORIA, '#10'    OBSERVACI' +
+              'ONES, INCIDENCIAS, INCIDENCIAS_ACTIVAS, FECHA_ALTA, '#10'    FECHA_M' +
+              'ODIFICACION, USUARIO, IMPORTE_NETO, IMPORTE_PORTE, '#10'    DESCUENT' +
+              'O, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '#10'    IMPORTE_IVA, IMP' +
+              'ORTE_TOTAL, ID_FORMA_PAGO'#10'  FROM'#10'    V_PRESUPUESTOS_CLIENTE'#10'  WH' +
+              'ERE V_PRESUPUESTOS_CLIENTE.ID = :ID'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end
+              item
+                DatasetField = 'FECHA_PRESUPUESTO'
+                TableField = 'FECHA_PRESUPUESTO'
+              end
+              item
+                DatasetField = 'FECHA_DECISION'
+                TableField = 'FECHA_DECISION'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'SITUACION'
+                TableField = 'SITUACION'
+              end
+              item
+                DatasetField = 'ID_CLIENTE'
+                TableField = 'ID_CLIENTE'
+              end
+              item
+                DatasetField = 'NIF_CIF'
+                TableField = 'NIF_CIF'
+              end
+              item
+                DatasetField = 'NOMBRE'
+                TableField = 'NOMBRE'
+              end
+              item
+                DatasetField = 'REFERENCIA_CLIENTE'
+                TableField = 'REFERENCIA_CLIENTE'
+              end
+              item
+                DatasetField = 'CLIENTE_FINAL'
+                TableField = 'CLIENTE_FINAL'
+              end
+              item
+                DatasetField = 'PORTADA'
+                TableField = 'PORTADA'
+              end
+              item
+                DatasetField = 'MEMORIA'
+                TableField = 'MEMORIA'
+              end
+              item
+                DatasetField = 'OBSERVACIONES'
+                TableField = 'OBSERVACIONES'
+              end
+              item
+                DatasetField = 'INCIDENCIAS'
+                TableField = 'INCIDENCIAS'
+              end
+              item
+                DatasetField = 'INCIDENCIAS_ACTIVAS'
+                TableField = 'INCIDENCIAS_ACTIVAS'
+              end
+              item
+                DatasetField = 'FECHA_ALTA'
+                TableField = 'FECHA_ALTA'
+              end
+              item
+                DatasetField = 'FECHA_MODIFICACION'
+                TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'USUARIO'
+                TableField = 'USUARIO'
+              end
+              item
+                DatasetField = 'IMPORTE_NETO'
+                TableField = 'IMPORTE_NETO'
+              end
+              item
+                DatasetField = 'IMPORTE_PORTE'
+                TableField = 'IMPORTE_PORTE'
+              end
+              item
+                DatasetField = 'DESCUENTO'
+                TableField = 'DESCUENTO'
+              end
+              item
+                DatasetField = 'IMPORTE_DESCUENTO'
+                TableField = 'IMPORTE_DESCUENTO'
+              end
+              item
+                DatasetField = 'BASE_IMPONIBLE'
+                TableField = 'BASE_IMPONIBLE'
+              end
+              item
+                DatasetField = 'IVA'
+                TableField = 'IVA'
+              end
+              item
+                DatasetField = 'IMPORTE_IVA'
+                TableField = 'IMPORTE_IVA'
+              end
+              item
+                DatasetField = 'IMPORTE_TOTAL'
+                TableField = 'IMPORTE_TOTAL'
+              end
+              item
+                DatasetField = 'ID_FORMA_PAGO'
+                TableField = 'ID_FORMA_PAGO'
+              end>
+          end>
+        Name = 'Informe_Cabecera'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+            Required = True
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+          end
+          item
+            Name = 'FECHA_PRESUPUESTO'
+            DataType = datDateTime
+          end
+          item
+            Name = 'FECHA_DECISION'
+            DataType = datDateTime
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'SITUACION'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'ID_CLIENTE'
+            DataType = datInteger
+          end
+          item
+            Name = 'NIF_CIF'
+            DataType = datString
+            Size = 15
+          end
+          item
+            Name = 'NOMBRE'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'REFERENCIA_CLIENTE'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'CLIENTE_FINAL'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'PORTADA'
+            DataType = datMemo
+          end
+          item
+            Name = 'MEMORIA'
+            DataType = datMemo
+          end
+          item
+            Name = 'OBSERVACIONES'
+            DataType = datMemo
+          end
+          item
+            Name = 'INCIDENCIAS'
+            DataType = datMemo
+          end
+          item
+            Name = 'INCIDENCIAS_ACTIVAS'
+            DataType = datSmallInt
+            Required = True
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+          end
+          item
+            Name = 'IMPORTE_NETO'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_PORTE'
+            DataType = datCurrency
+          end
+          item
+            Name = 'DESCUENTO'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_DESCUENTO'
+            DataType = datCurrency
+          end
+          item
+            Name = 'BASE_IMPONIBLE'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IVA'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            DataType = datCurrency
+          end
+          item
+            Name = 'ID_FORMA_PAGO'
+            DataType = datInteger
+          end>
+      end
+      item
+        Params = <
+          item
+            Name = 'ID'
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'PRESUPUESTOS_CLIENTE_DETALLES'
+            SQL = 
+              'SELECT PRESUPUESTOS_CLIENTE_DETALLES.ID, PRESUPUESTOS_CLIENTE_DE' +
+              'TALLES.ID_PRESUPUESTO,'#10'       PRESUPUESTOS_CLIENTE_DETALLES.POSI' +
+              'CION, PRESUPUESTOS_CLIENTE_DETALLES.TIPO_DETALLE,'#10'       PRESUPU' +
+              'ESTOS_CLIENTE_DETALLES.CONCEPTO, PRESUPUESTOS_CLIENTE_DETALLES.C' +
+              'ANTIDAD,'#10'       PRESUPUESTOS_CLIENTE_DETALLES.IMPORTE_UNIDAD, PR' +
+              'ESUPUESTOS_CLIENTE_DETALLES.IMPORTE_TOTAL,'#10'       ARTICULOS.REFE' +
+              'RENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERENCIA_PROV as REFERENC' +
+              'IA_PROVEEDOR'#10#10'FROM PRESUPUESTOS_CLIENTE_DETALLES'#10'LEFT JOIN ARTIC' +
+              'ULOS ON (PRESUPUESTOS_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.I' +
+              'D)'#10'WHERE PRESUPUESTOS_CLIENTE_DETALLES.ID_PRESUPUESTO = :ID'#10'ORDE' +
+              'R BY POSICION'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_PRESUPUESTO'
+                TableField = 'ID_PRESUPUESTO'
+              end
+              item
+                DatasetField = 'POSICION'
+                TableField = 'POSICION'
+              end
+              item
+                DatasetField = 'TIPO_DETALLE'
+                TableField = 'TIPO_DETALLE'
+              end
+              item
+                DatasetField = 'CONCEPTO'
+                TableField = 'CONCEPTO'
+              end
+              item
+                DatasetField = 'CANTIDAD'
+                TableField = 'CANTIDAD'
+              end
+              item
+                DatasetField = 'IMPORTE_UNIDAD'
+                TableField = 'IMPORTE_UNIDAD'
+              end
+              item
+                DatasetField = 'IMPORTE_TOTAL'
+                TableField = 'IMPORTE_TOTAL'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = '<unknown>'
+                SQLOrigin = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'FAMILIA'
+                TableField = '<unknown>'
+                SQLOrigin = 'FAMILIA'
+              end
+              item
+                DatasetField = 'REFERENCIA_PROVEEDOR'
+                TableField = '<unknown>'
+                SQLOrigin = 'REFERENCIA_PROVEEDOR'
+              end>
+          end>
+        Name = 'Informe_Detalles'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_PRESUPUESTO'
+            DataType = datInteger
+          end
+          item
+            Name = 'POSICION'
+            DataType = datInteger
+          end
+          item
+            Name = 'TIPO_DETALLE'
+            DataType = datString
+            Size = 10
+          end
+          item
+            Name = 'CONCEPTO'
+            DataType = datString
+            Size = 2000
+          end
+          item
+            Name = 'CANTIDAD'
+            DataType = datInteger
+          end
+          item
+            Name = 'IMPORTE_UNIDAD'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            DataType = datCurrency
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'REFERENCIA_PROVEEDOR'
+            DataType = datString
+            Size = 255
+          end>
+      end>
+    JoinDataTables = <>
+    UnionDataTables = <>
+    Commands = <>
+    RelationShips = <>
+    UpdateRules = <>
+    Version = 0
+    Left = 48
+    Top = 16
+  end
+  object DataDictionary: TDADataDictionary
+    Fields = <>
+    Left = 46
+    Top = 142
+  end
+  object frxReport: TfrxReport
+    Version = '3.23.7'
+    DotMatrixReport = False
+    EngineOptions.DoublePass = True
+    IniFile = '\Software\Fast Reports'
+    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
+    PreviewOptions.Zoom = 1.000000000000000000
+    PrintOptions.Printer = 'Por defecto'
+    ReportOptions.CreateDate = 39065.872423495400000000
+    ReportOptions.LastChange = 39399.705345219900000000
+    ScriptLanguage = 'PascalScript'
+    ScriptText.Strings = (
+      ''
+      'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);'
+      'var'
+      '  Cadena: String;'
+      'begin'
+      '{  DatosEmpresa.Lines.Clear;'
+      '  if (<frxDBCabecera."TELEFONO_1_EMPRESA"> <> '#39#39') then'
+      '       Cadena := '#39'TLF: '#39' + <frxDBCabecera."TELEFONO_1_EMPRESA">;'
+      '  if (<frxDBCabecera."FAX_EMPRESA"> <> '#39#39') then'
+      
+        '       Cadena := Cadena + '#39' FAX: '#39' + <frxDBCabecera."FAX_EMPRESA' +
+        '">;'
+      '  DatosEmpresa.Lines.Add(Cadena);'
+      '}'
+      'end;'
+      ''
+      'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '{'
+      '  NombreEmpresa.Lines.Clear;'
+      '  NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
+      '}'
+      'end;'
+      ''
+      'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);'
+      'var'
+      '  ACadena : String;'
+      'begin'
+      '{'
+      '  ACadena := '#39#39';'
+      '  DireccionEnvio.Lines.Clear;'
+      '  if (<frxDBCabecera."REFERENCIA_CLIENTE"> <> '#39#39') then'
+      '     ACadena := <frxDBCabecera."REFERENCIA_CLIENTE">;'
+      ''
+      '  if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
+      
+        '     ACadena := ACadena + '#39'  '#39' + <frxDBCabecera."PERSONA_CONTACT' +
+        'O">;'
+      ''
+      '  DireccionEnvio.Lines.Add(ACadena);'
+      '  ACadena := '#39#39';'
+      '  DireccionEnvio.Lines.Add(<frxDBCabecera."CALLE">);'
+      '  if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
+      '     ACadena := <frxDBCabecera."CODIGO_POSTAL"> + '#39' '#39';'
+      '  if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
+      '     ACadena := ACadena + <frxDBCabecera."CODIGO_POSTAL">;'
+      ''
+      '  if (ACadena <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(ACadena);'
+      ''
+      '  if (<frxDBCabecera."PROVINCIA"> <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(<frxDBCabecera."PROVINCIA">);'
+      ''
+      '  if (<frxDBCabecera."TELEFONO"> <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(<frxDBCabecera."TELEFONO">);'
+      '}'
+      'end;'
+      ''
+      'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if not Engine.FinalPass then'
+      '     Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
+      ''
+      '  if Engine.FinalPass then'
+      '     Set('#39'Pagina'#39', (<Pagina> + 1));'
+      'end;'
+      ''
+      'procedure frxReportOnStartReport(Sender: TfrxComponent);'
+      'begin'
+      '  Set('#39'Pagina'#39', 0);'
+      '  Set('#39'TotalPaginas'#39', 0);'
+      'end;'
+      ''
+      'begin'
+      ''
+      'end.')
+    ShowProgress = False
+    StoreInDFM = False
+    OnStartReport = 'frxReportOnStartReport'
+    Left = 169
+    Top = 16
+    Datasets = <
+      item
+        DataSet = frxDBCabecera
+        DataSetName = 'frxDBCabecera'
+      end
+      item
+        DataSet = frxDBDetalles
+        DataSetName = 'frxDBDetalles'
+      end>
+    Variables = <
+      item
+        Name = ' Paginacion'
+        Value = Null
+      end
+      item
+        Name = 'Pagina'
+        Value = Null
+      end
+      item
+        Name = 'TotalPaginas'
+        Value = Null
+      end>
+    Style = <>
+  end
+  object frxDBCabecera: TfrxDBDataset
+    UserName = 'frxDBCabecera'
+    CloseDataSource = False
+    DataSource = DADataCabecera
+    Left = 264
+    Top = 16
+  end
+  object frxDBDetalles: TfrxDBDataset
+    UserName = 'frxDBDetalles'
+    CloseDataSource = False
+    DataSource = DADataDetalles
+    Left = 344
+    Top = 16
+  end
+  object Bin2DataStreamer: TDABin2DataStreamer
+    Left = 48
+    Top = 80
+  end
+  object tbl_Cabecera: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    IndexDefs = <>
+    Left = 264
+    Top = 128
+  end
+  object tbl_Detalles: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    IndexDefs = <>
+    Left = 344
+    Top = 128
+  end
+end

Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas

@@ -0,0 +1,116 @@
+unit uRptPresupuestosCliente_Server;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
+  uDADataTable, uDACDSDataTable, DB, uDAClasses, uDABINAdapter, uROTypes,
+  uDAInterfaces, uDAMemDataTable, uDADataStreamer, uDABin2DataStreamer,
+  frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich;
+
+type
+  TRptPresupuestosCliente = class(TDataModule)
+    DADataCabecera: TDADataSource;
+    DADataDetalles: TDADataSource;
+    frxBarCodeObject1: TfrxBarCodeObject;
+    frxOLEObject1: TfrxOLEObject;
+    frxCrossObject1: TfrxCrossObject;
+    frxCheckBoxObject1: TfrxCheckBoxObject;
+    frxGradientObject1: TfrxGradientObject;
+    frxDBCabecera: TfrxDBDataset;
+    frxDBDetalles: TfrxDBDataset;
+    Bin2DataStreamer: TDABin2DataStreamer;
+    tbl_Cabecera: TDAMemDataTable;
+    tbl_Detalles: TDAMemDataTable;
+    schReport: TDASchema;
+    DataDictionary: TDADataDictionary;
+    frxReport: TfrxReport;
+    procedure DataModuleCreate(Sender: TObject);
+  private
+    FConnection: IDAConnection;
+    procedure GenerarPresupuesto(const AID : Integer); overload;
+  public
+    function GenerarPresupuesto(const AID : String): Binary; overload;
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  uDataModuleServer, schPresupuestosClienteClient_Intf;
+
+const
+  rptInforme = 'InfPresupuestoCliente.fr3';
+
+  { Dataset names for schReport }
+  ds_InformeCabecera = 'Informe_Cabecera';
+  ds_InformeDetalles = 'Informe_Detalles';
+
+
+{ TRptPresupuestosProveedor }
+
+
+procedure TRptPresupuestosCliente.DataModuleCreate(Sender: TObject);
+begin
+  schReport.ConnectionManager := dmServer.ConnectionManager;
+  FConnection := dmServer.DarNuevaConexion;
+  frxReport.EngineOptions.NewSilentMode := simReThrow;
+end;
+
+function TRptPresupuestosCliente.GenerarPresupuesto(const AID: String): Binary;
+var
+  ID_Presupuestos: TStringList;
+  i: Integer;
+
+begin
+  Result := Binary.Create;
+  FConnection.BeginTransaction;
+
+  try
+    ID_Presupuestos := TStringList.Create;
+    ID_Presupuestos.CommaText := AID;
+
+    //Vamos generando todos y cada uno de los albaranes recibidos
+    for i := 0 to ID_Presupuestos.Count - 1 do
+        GenerarPresupuesto(StrToInt(ID_Presupuestos.Strings[i]));
+
+    frxReport.PreviewPages.SaveToStream(Result);
+
+  finally
+    FConnection.RollbackTransaction;
+  end;
+end;
+
+procedure TRptPresupuestosCliente.GenerarPresupuesto(const AID: Integer);
+var
+  AStream: TMemoryStream;
+  dsMaster: IDADataset;
+  dsDetail: IDADataset;
+begin
+  AStream := TMemoryStream.Create;
+
+  try
+    dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [AID]);
+    dsDetail := schReport.NewDataset(FConnection, ds_InformeDetalles, ['ID'], [AID], False);
+
+    AStream.Clear;
+    Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_Cabecera, TRUE, '', TRUE, TRUE);
+
+    AStream.Clear;
+    Bin2DataStreamer.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);
+
+    frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
+    frxReport.PrepareReport(False);
+
+  finally
+    AStream.Free;
+    dsMaster := Nil;
+    dsDetail := Nil;
+  end;
+end;
+
+end.

Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm

@@ -1282,7 +1282,6 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
     InsertCommandName = 'Insert_PresupuestosCliente_Detalles'
     DeleteCommandName = 'Delete_PresupuestosCliente_Detalles'
     UpdateCommandName = 'Update_PresupuestosCliente_Detalles'
-    RefreshDatasetName = 'PresupuestosCliente_Detalles_Refresh'
     ReferencedDataset = 'PresupuestosCliente_Detalles'
     ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly

Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas

@@ -45,7 +45,7 @@ uses
   Dialogs,
   {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
   schPresupuestosClienteClient_Intf, uRestriccionesUsuarioUtils,
-//  uRptPresupuestosCliente_Server,
+  uRptPresupuestosCliente_Server,
   uBizPresupuestosClienteServer;
 
 procedure Create_srvPresupuestosCliente(out anInstance : IUnknown);
@@ -80,15 +80,15 @@ begin
 end;
 
 function TsrvPresupuestosCliente.GenerateReport(const ID: String): Binary;
-//var
+var
-//  AReportGenerator : TRptPresupuestosCliente;
+  AReportGenerator : TRptPresupuestosCliente;
 begin
-//  AReportGenerator := TRptPresupuestosCliente.Create(nil);
+  AReportGenerator := TRptPresupuestosCliente.Create(nil);
-//  try
+  try
-//    Result := AReportGenerator.GenerarPedido(ID);
+    Result := AReportGenerator.GenerarPresupuesto(ID);
-//  finally
+  finally
-//    FreeAndNIL(AReportGenerator);
+    FreeAndNIL(AReportGenerator);
-//  end;
+  end;
 end;
 
 initialization

Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj

@@ -42,6 +42,7 @@
     <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><Excluded_Packages>
+      
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
@@ -50,38 +51,47 @@
     <DelphiCompile Include="PresupuestosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Articulos_view.dcp" />
+    <DCCReference Include="..\Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="..\PresupuestosCliente_controller.dcp" />
-    <DCCReference Include="PresupuestosCliente_model.dcp" />
+    <DCCReference Include="..\PresupuestosCliente_model.dcp" />
     <DCCReference Include="uEditorElegirArticulosPresupuestoCliente.pas">
       <Form>fEditorElegirArticulosPresupuestoCliente</Form>
+      <DesignClass>TfEditorElegirArticulosPedidoCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirPresupuestosCliente.pas">
       <Form>fEditorElegirPresupuestosCliente</Form>
+      <DesignClass>TfEditorElegirPedidosCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorPresupuestoCliente.pas">
       <Form>fEditorPresupuestoCliente</Form>
+      <DesignClass>TfEditorPedidoCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorPresupuestosCliente.pas">
       <Form>fEditorPresupuestosCliente</Form>
+      <DesignClass>TfEditorPedidosCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorPresupuestosClienteReport.pas">
       <Form>fEditorPresupuestosClientePreview</Form>
+      <DesignClass>TfEditorPedidosClientePreview</DesignClass>
     </DCCReference>
     <DCCReference Include="uPresupuestosClienteViewRegister.pas" />
     <DCCReference Include="uViewDetallesPresupuestoCliente.pas">
       <Form>frViewDetallesPresupuestoCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewElegirArticulosPresupuestosCliente.pas">
       <Form>frViewElegirArticulosPresupuestosCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewPresupuestoCliente.pas">
       <Form>frViewPresupuestoCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewPresupuestosCliente.pas">
       <Form>frViewPresupuestosCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
   </ItemGroup>
 </Project>
@@ -567,4 +577,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->

Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc

@@ -23,4 +23,4 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorElegirArticulosPresupuestoCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosClienteReport.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\PresupuestosCliente_view.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE4.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D7.tmp */

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm

@@ -147,7 +147,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   inherited pgPaginas: TPageControl
     Width = 632
     Height = 442
-    ActivePage = pagContenido
+    ActivePage = pagMemoria
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 632
@@ -238,6 +238,34 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         end
       end
     end
+    object pagPortada: TTabSheet
+      Caption = 'Portada'
+      ImageIndex = 3
+      object eIncidencias: TcxDBMemo
+        Left = 0
+        Top = 0
+        Align = alClient
+        DataBinding.DataField = 'PORTADA'
+        DataBinding.DataSource = dsDataTable
+        TabOrder = 0
+        Height = 414
+        Width = 624
+      end
+    end
+    object pagMemoria: TTabSheet
+      Caption = 'Memoria'
+      ImageIndex = 4
+      object cxDBMemo1: TcxDBMemo
+        Left = 0
+        Top = 0
+        Align = alClient
+        DataBinding.DataField = 'MEMORIA'
+        DataBinding.DataSource = dsDataTable
+        TabOrder = 0
+        Height = 414
+        Width = 624
+      end
+    end
   end
   inherited StatusBar: TJvStatusBar
     Top = 589

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas

@@ -27,8 +27,12 @@ type
     dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
     frViewTotales1: TfrViewTotales;
     frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente;
+    pagPortada: TTabSheet;
+    pagMemoria: TTabSheet;
+    eIncidencias: TcxDBMemo;
+    cxDBMemo1: TcxDBMemo;
 
-    procedure FormShow(Sender: TObject); 
+    procedure FormShow(Sender: TObject);
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
     procedure pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
@@ -103,7 +107,6 @@ constructor TfEditorPresupuestoCliente.Create(AOwner: TComponent);
 begin
   inherited;
   pgPaginas.ActivePageIndex := 0;
-
   AsignarVista;
 end;
 

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas

@@ -372,6 +372,7 @@ begin
       end;
     end;
   end;
+  APresupuestos := Nil;
 end;
 
 procedure TfEditorPresupuestosCliente.SetController(const Value: IPresupuestosClienteController);

Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas

@@ -696,7 +696,6 @@ begin
 
       //Primero debemos hacer el ApplyUpdates del recibo inicial por si fallase
       //Así no se haría el nuevo
-//      AsignarID(ARecibosCliente, NuevoID);
       ARecibosCliente.DataTable.ApplyUpdates;
 
       if Assigned(ANuevoReciboCliente) then

Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas

@@ -58,22 +58,25 @@ var
   AEditor : IEditorRecibosClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
     AStream := FDataModule.GetReport(ID);
     try
       CreateEditor('EditorRecibosClientePreview', IEditorRecibosClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Preview;
 end;
 
 procedure TRecibosClienteReportController.Print(const ID : String);
@@ -82,22 +85,25 @@ var
   AEditor : IEditorRecibosClientePreview;
 begin
   AEditor := NIL;
-
   ShowHourglassCursor;
   try
-  AStream := FDataModule.GetReport(ID);
+    AStream := FDataModule.GetReport(ID);
     try
       CreateEditor('EditorRecibosClientePreview', IEditorRecibosClientePreview, AEditor);
-      AEditor.LoadFromStream(AStream);
+      if Assigned(AEditor) then
+      with AEditor do
+      begin
+        AEditor.LoadFromStream(AStream);
+        AEditor.Print;
+        AEditor.Release;
+      end;
     finally
-      AStream.Free;
+      FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.Print
 end;
 
 end.

Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Data\uDataModuleRecibosCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Data\RecibosCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfCA.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1BD.tmp */

Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Plugin\uPluginRecibosCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfD0.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C3.tmp */

Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf98.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf18B.tmp */

Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf96.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf189.tmp */

Source/Servidor/FactuGES_Server.dpr

@@ -56,18 +56,19 @@ uses
   schAlmacenesClient_Intf in '..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas',
   schAlmacenesServer_Intf in '..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas',
   srvAlbaranesCliente_Impl in '..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas' {srvAlbaranesCliente: TDataAbstractService},
-  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
-  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   uBizAlbaranClienteServer in '..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas',
   srvRecibosCliente_Impl in '..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas' {srvRecibosCliente: TDataAbstractService},
   srvFacturasCliente_Impl in '..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas' {srvFacturasCliente: TDataAbstractService},
   uBizFacturasClienteServer in '..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas',
-  schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
-  schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
   schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
   schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_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',
+  uRptPresupuestosCliente_Server in '..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas' {RptPresupuestosCliente},
+  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
+  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
+  schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
+  schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -89,6 +89,9 @@
 		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+		</DCCReference>
 		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
 			<Form>srvPresupuestosCliente</Form>
 			<DesignClass>TDataAbstractService</DesignClass>

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "3.0.0.0\0"
               VALUE "ProductVersion", "3.0.0.0\0"
-              VALUE "CompileDate", "lunes, 12 de noviembre de 2007 21:28\0"
+              VALUE "CompileDate", "martes, 13 de noviembre de 2007 20:09\0"
          END
     END
     BLOCK "VarFileInfo"