Se arregla el informe de etiquetas de cliente y proveedor que no funcionaba bien, se copia de tecsitel que ya estaba arreglado

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@408 f4e31baf-9722-1c47-927c-6f952f962d4b

Source/Base/Base.dproj

@@ -44,13 +44,6 @@
     <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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -65,53 +58,53 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Contactos\Controller\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dxNavBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Controller\xmlrtl.dcp" />
     <DCCReference Include="..\Modulos\Presupuestos de cliente\dxDockingD11.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Cliente/FactuGES.dproj

@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">1</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       

Source/Modulos/Contactos/Controller/uClientesController.pas

@@ -57,7 +57,7 @@ uses
   Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
   uIEditorElegirClientes, uEditorGridBase, uDAInterfaces, uFactuGES_App,
-  Dialogs;
+  Dialogs, uIntegerListUtils;
 
 { TClientesController }
 
@@ -235,11 +235,11 @@ end;
 procedure TClientesController.Preview(ACliente: IBizCliente; AllItems: Boolean);
 var
   AReportController : IEtiquetasContactosReportController;
-  ListaID: TStringList;
+  ListaID: TIntegerList;
 begin
   AReportController := TEtiquetasContactosReportController.Create;
-  try
+  ListaID := TIntegerList.Create;
-    ListaID := TStringList.Create;
+
   try
    //Si deseamos previsualizar todos los items del objeto albaran
    if AllItems then
@@ -249,56 +249,54 @@ begin
        First;
        while not EOF do
        begin
-             ListaID.Add(IntToStr(ACliente.ID));
+         ListaID.Add(ACliente.ID);
-             Next;
-           end;
-         end;
-       end
-       else //Solo previsualizamos el item seleccionado
-         ListaID.Add(IntToStr(ACliente.ID));
-
-       AReportController.Preview(ListaID.CommaText);
-    finally
-      FreeANDNil(ListaID);
-    end;
-  finally
-    AReportController := NIL;
-  end;
-end;
-
-procedure TClientesController.Print(ACliente: IBizCliente; AllItems: Boolean);
-var
-  AReportController : IEtiquetasContactosReportController;
-  ListaID: TStringList;
-
-begin
-  AReportController := TEtiquetasContactosReportController.Create;
-  try
-    ListaID := TStringList.Create;
-    try
-       //Si deseamos previsualizar todos los items del objeto albaran
-       if AllItems then
-       begin
-         with ACliente.DataTable do
-         begin
-           First;
-           while not EOF do
-           begin
-             ListaID.Add(IntToStr(ACliente.ID));
          Next;
        end;
      end;
    end
    //Solo previsualizamos el item seleccionado
    else
-         ListaID.Add(IntToStr(ACliente.ID));
+     ListaID.Add(ACliente.ID);
 
-        AReportController.Print(ListaID.CommaText);
+    AReportController.Preview(ListaID);
-    finally
-      FreeANDNIL(ListaID);
-    end;
   finally
     AReportController := NIL;
+    FreeANDNIL(ListaID);
+  end;
+end;
+
+procedure TClientesController.Print(ACliente: IBizCliente; AllItems: Boolean);
+var
+  AReportController : IEtiquetasContactosReportController;
+  ListaID: TIntegerList;
+
+begin
+  AReportController := TEtiquetasContactosReportController.Create;
+  ListaID := TIntegerList.Create;
+
+  try
+   //Si deseamos previsualizar todos los items del objeto albaran
+   if AllItems then
+   begin
+     with ACliente.DataTable do
+     begin
+       First;
+       while not EOF do
+       begin
+         ListaID.Add(ACliente.ID);
+         Next;
+       end;
+     end;
+   end
+   //Solo previsualizamos el item seleccionado
+   else
+     ListaID.Add(ACliente.ID);
+
+    AReportController.Print(ListaID);
+
+  finally
+    AReportController := NIL;
+    FreeANDNil(ListaID);
   end;
 end;
 

Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas

@@ -4,13 +4,13 @@ interface
 
 uses
   Classes, SysUtils, uDADataTable, uIDataModuleEtiquetasContactosReport,
-  uVendedoresController, uControllerBase;
+  uVendedoresController, uControllerBase, uIntegerListUtils;
 
 type
   IEtiquetasContactosReportController = interface(IControllerBase)
   ['{76BB35E3-554E-4D30-8D3E-54E488EF82E2}']
-    procedure Preview(const AContactosID : String);
+    procedure Preview(const ListaID : TIntegerList);
-    procedure Print(const AContactosID : String);
+    procedure Print(const ListaID : TIntegerList);
   end;
 
   TEtiquetasContactosReportController = class(TControllerBase, IEtiquetasContactosReportController)
@@ -21,8 +21,8 @@ type
     constructor Create; override;
     destructor Destroy; override;
 
-    procedure Preview(const AContactosID : String);
+    procedure Preview(const ListaID : TIntegerList);
-    procedure Print(const AContactosID : String);
+    procedure Print(const ListaID : TIntegerList);
   end;
 
 
@@ -52,30 +52,34 @@ begin
   inherited;
 end;
 
-procedure TEtiquetasContactosReportController.Preview(const AContactosID : String);
+procedure TEtiquetasContactosReportController.Preview(const ListaID : TIntegerList);
 var
   AStream: Binary;
   AEditor : IEditorEtiquetasContactosPreview;
 begin
   AEditor := NIL;
 
-  AStream := FDataModule.GetReport(AContactosID);
+  AStream := FDataModule.GetReport(ListaID);
   try
     CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor);
     if Assigned(AEditor) then
+    begin
       try
+        AEditor.Controller := Self;
+        AEditor.ListaID := ListaID;
         AEditor.LoadFromStream(AStream);
         AEditor.Preview;
       finally
         AEditor.Release;
-        AEditor := NIL;
+      end;
     end;
   finally
     FreeAndNil(AStream);
+    AEditor := Nil;
   end;
 end;
 
-procedure TEtiquetasContactosReportController.Print(const AContactosID : String);
+procedure TEtiquetasContactosReportController.Print(const ListaID : TIntegerList);
 var
   AStream: Binary;
   AEditor : IEditorEtiquetasContactosPreview;
@@ -83,19 +87,23 @@ begin
   AEditor := NIL;
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetReport(AContactosID);
+    AStream := FDataModule.GetReport(ListaID);
     try
       CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor);
       if Assigned(AEditor) then
+      begin
         try
+          AEditor.Controller := Self;
+          AEditor.ListaID := ListaID;
           AEditor.LoadFromStream(AStream);
           AEditor.Print;
         finally
           AEditor.Release;
-          AEditor := Nil;
+        end;
       end;
     finally
       FreeAndNil(AStream);
+      AEditor := Nil;
     end;
   finally
     HideHourglassCursor;

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -51,7 +51,7 @@ uses
   Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
   uIEditorElegirProveedores, Controls, uEditorGridBase, JSDialogs, JSDialog,
-  uDAInterfaces, uFactuGES_App, Windows;
+  uDAInterfaces, uFactuGES_App, Windows, uIntegerListUtils;
 
 { TProveedoresController }
 
@@ -221,12 +221,12 @@ end;
 procedure TProveedoresController.Preview(AProveedor: IBizProveedor; AllItems: Boolean);
 var
   AReportController : IEtiquetasContactosReportController;
-  ListaID: TStringList;
+  ListaID: TIntegerList;
 
 begin
   AReportController := TEtiquetasContactosReportController.Create;
-  try
+  ListaID := TIntegerList.Create;
-    ListaID := TStringList.Create;
+
   try
    //Si deseamos previsualizar todos los items del objeto albaran
    if AllItems then
@@ -236,33 +236,31 @@ begin
        First;
        while not EOF do
        begin
-             ListaID.Add(IntToStr(AProveedor.ID));
+         ListaID.Add(AProveedor.ID);
          Next;
        end;
      end;
    end
    //Solo previsualizamos el item seleccionado
    else
-         ListaID.Add(IntToStr(AProveedor.ID));
+     ListaID.Add(AProveedor.ID);
 
-        AReportController.Preview(ListaID.CommaText);
+    AReportController.Preview(ListaID);
-    finally
-      FreeANDNIL(ListaID);
-    end;
   finally
     AReportController := NIL;
+    FreeANDNil(ListaID);
   end;
 end;
 
 procedure TProveedoresController.Print(AProveedor: IBizProveedor; AllItems: Boolean);
 var
   AReportController : IEtiquetasContactosReportController;
-  ListaID: TStringList;
+  ListaID: TIntegerList;
 
 begin
   AReportController := TEtiquetasContactosReportController.Create;
-  try
+  ListaID := TIntegerList.Create;
-    ListaID := TStringList.Create;
+
   try
    //Si deseamos previsualizar todos los items del objeto albaran
    if AllItems then
@@ -272,21 +270,20 @@ begin
        First;
        while not EOF do
        begin
-             ListaID.Add(IntToStr(AProveedor.ID));
+         ListaID.Add(AProveedor.ID);
          Next;
        end;
      end;
    end
    //Solo previsualizamos el item seleccionado
    else
-         ListaID.Add(IntToStr(AProveedor.ID));
+     ListaID.Add(AProveedor.ID);
+
+    AReportController.Print(ListaID);
 
-        AReportController.Print(ListaID.CommaText);
-    finally
-      FreeANDNIL(ListaID);
-    end;
   finally
     AReportController := NIL;
+    FreeANDNil(ListaID);
   end;
 end;
 

Source/Modulos/Contactos/Data/uDataModuleContactos.pas

@@ -3,7 +3,7 @@ unit uDataModuleContactos;
 interface
 
 uses
-  SysUtils, Classes, DB, DBClient,
+  SysUtils, Classes, DB, DBClient, uIntegerListUtils,
   uDADataTable, uDABINAdapter,
   uDAScriptingProvider, uDACDSDataTable, uROWinInetHttpChannel,
   uRORemoteService, uROClient, uROBinMessage,
@@ -36,7 +36,7 @@ type
     function NewDireccion : IBizDireccionesContacto;
 
     // Report
-    function GetReport(const AContactosID: String): Binary;
+    function GetReport(const ListaID: TIntegerList): Binary;
   end;
 
 implementation
@@ -60,9 +60,16 @@ begin
   //
 end;
 
-function TDataModuleContactos.GetReport(const AContactosID: String): Binary;
+function TDataModuleContactos.GetReport(const ListaID: TIntegerList): Binary;
+var
+  AParam : TIntegerArray;
 begin
-  Result := (RORemoteService as IsrvContactos).GenerateEtiquetasReport(AContactosID);
+  AParam := ListaID.ToIntegerArray;
+  try
+    Result := (RORemoteService as IsrvContactos).GenerarInformeEtiquetas(AParam);
+  finally
+    FreeANDNIL(AParam);
+  end;
 end;
 
 function TDataModuleContactos.NewDireccion: IBizDireccionesContacto;

Source/Modulos/Contactos/Model/Data/uIDataModuleEtiquetasContactosReport.pas

@@ -3,12 +3,12 @@ unit uIDataModuleEtiquetasContactosReport;
 interface
 
 uses
-  SysUtils, Classes, uROTypes;
+  SysUtils, Classes, uROTypes, uIntegerListUtils;
 
 type
   IDataModuleEtiquetasContactosReport = interface
   ['{26E68DED-5BD9-4227-B07F-9644BED7AE7B}']
-    function GetReport(const AClientesID: String): Binary;
+    function GetReport(const ListaID: TIntegerList): Binary;
   end;
 
 implementation

Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm

@@ -56,11 +56,8 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
     LogChanges = False
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
-    LocalSchema = schReport
-    LocalDataStreamer = Bin2DataStreamer
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'InformeEtiquetasContacto'
     IndexDefs = <>
     Left = 264
     Top = 128

Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas

@@ -7,7 +7,8 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable;
+  uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable,
+  FactuGES_Intf;
 
 type
   TRptEtiquetasContacto = class(TDataModule)
@@ -29,7 +30,7 @@ type
   private
     FConnection: IDAConnection;
   public
-    function GenerarInforme(const AID : String): Binary; overload;
+    function GenerarInforme(const ListaID: TIntegerArray): Binary; overload;
   end;
 
 implementation
@@ -56,27 +57,37 @@ begin
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 end;
 
-function TRptEtiquetasContacto.GenerarInforme(const AID: String): Binary;
+function TRptEtiquetasContacto.GenerarInforme(const ListaID: TIntegerArray): Binary;
 var
+  AStream: TMemoryStream;
+  dsMaster: IDADataset;
+  i : Integer;
+  AWhereStr : String;
   AInforme: Variant;
 
 begin
   Result := Binary.Create;
-
   FConnection.BeginTransaction;
 
+  AStream := TMemoryStream.Create;
   try
-//    AStream := TMemoryStream.Create;
+    dsMaster := schReport.NewDataset(FConnection, ds_InformeContactos, [], [], False); //, ['ID'], ['611, 751']); //AID]);
-//    dsMaster := schReport.NewDataset(FConnection, ds_InformeContactos, [], [], False); //, ['ID'], ['611, 751']); //AID]);
+    AWhereStr := fld_ContactosID + ' in (';
-//    dsMaster.Where.AddText(fld_ContactosID + ' in (' + AID + ')');
+    for i := 0 to ListaID.Count - 1 do
-//    dsMaster.Open;
+    begin
+      if i > 0 then
+        AWhereStr := AWhereStr + ', ';
+      AWhereStr := AWhereStr + IntToStr(ListaID.Items[i]);
+    end;
 
-//    AStream.Clear;
+    AWhereStr := AWhereStr + ')';
-//    Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
+    dsMaster.Where.AddText(AWhereStr);
-//    Bin2DataStreamer.ReadDataset(AStream, tbl_Contactos, TRUE, '', TRUE, TRUE);
 
-    tbl_Contactos.Where.AddCondition(fld_ContactosID, cIn, '(' + AID + ')');
+    dsMaster.Open;
-    tbl_Contactos.Active := True;
+
+    AStream.Clear;
+    Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_Contactos, TRUE, '', TRUE, TRUE);
 
     AInforme := DarRutaFichero(DarRutaInformes, rptEtiquetasContacto);
     if VarIsNull(AInforme) then
@@ -84,14 +95,16 @@ begin
 
     frxReport.LoadFromFile(AInforme, True);
     frxReport.PrepareReport(True);
+
     frxReport.PreviewPages.SaveToStream(Result);
 
   finally
-//    AStream.Free;
+    AStream.Free;
-//    dsMaster := Nil;
+    dsMaster := Nil;
     FConnection.RollbackTransaction;
   end;
 
 end;
 
+
 end.

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -40,7 +40,7 @@ type
     procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
       var aConnectionName: string);
   public
-    function GenerateEtiquetasReport(const ContactosID: String): Binary;
+    function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
   end;
 
@@ -107,13 +107,13 @@ begin
   ConnectionName := dmServer.ConnectionName;
 end;
 
-function TsrvContactos.GenerateEtiquetasReport(const ContactosID: String): Binary;
+function TsrvContactos.GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
 var
   AReportGenerator : TRptEtiquetasContacto;
 begin
   AReportGenerator := TRptEtiquetasContacto.Create(nil);
   try
-    Result := AReportGenerator.GenerarInforme(ContactosID);
+    Result := AReportGenerator.GenerarInforme(ListaID);
   finally
     FreeAndNIL(AReportGenerator);
   end;

Source/Modulos/Contactos/Views/uEditorContactos.dfm

@@ -10,9 +10,6 @@ inherited fEditorContactos: TfEditorContactos
     Caption = 'Lista de contactos'
   end
   inherited TBXDock: TTBXDock
-    inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 543
-    end
     inherited tbxFiltro: TTBXToolbar
       ExplicitWidth = 269
       inherited tbxEditFiltro: TTBXEditItem

Source/Servicios/FactuGES.RODL

@@ -9,11 +9,11 @@
 <Interfaces>
 <Interface Name="Default" UID="{28CCDC07-A3A4-4917-89B4-64423DC70C9D}">
 <Operations>
-<Operation Name="GenerateEtiquetasReport" UID="{910E5F58-7F8E-4D4C-A6A8-2FAD54689219}">
+<Operation Name="GenerarInformeEtiquetas" UID="{910E5F58-7F8E-4D4C-A6A8-2FAD54689219}">
 <Parameters>
 <Parameter Name="Result" DataType="Binary" Flag="Result">
 </Parameter>
-<Parameter Name="ContactosID" DataType="String" Flag="In" >
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>

Source/Servicios/FactuGES_Intf.pas

@@ -204,7 +204,7 @@ type
   { IsrvContactos }
   IsrvContactos = interface(IDataAbstractService)
     ['{28CCDC07-A3A4-4917-89B4-64423DC70C9D}']
-    function GenerateEtiquetasReport(const ContactosID: String): Binary;
+    function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
   end;
 
@@ -218,7 +218,7 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function GenerateEtiquetasReport(const ContactosID: String): Binary;
+    function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
   end;
 
@@ -1261,12 +1261,12 @@ begin
   result := 'srvContactos';
 end;
 
-function TsrvContactos_Proxy.GenerateEtiquetasReport(const ContactosID: String): Binary;
+function TsrvContactos_Proxy.GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
 begin
   try
     result := nil;
-    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerateEtiquetasReport');
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEtiquetas');
-    __Message.Write('ContactosID', TypeInfo(String), ContactosID, []);
+    __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);

Source/Servicios/FactuGES_Invk.pas

@@ -24,7 +24,7 @@ type
   private
   protected
   published
-    procedure Invoke_GenerateEtiquetasReport(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarTiendaDeUsuario(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
@@ -259,20 +259,21 @@ uses
 
 { TsrvContactos_Invoker }
 
-procedure TsrvContactos_Invoker.Invoke_GenerateEtiquetasReport(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+procedure TsrvContactos_Invoker.Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function GenerateEtiquetasReport(const ContactosID: String): Binary; }
+{ function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; }
 var
-  ContactosID: String;
+  ListaID: FactuGES_Intf.TIntegerArray;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
+  ListaID := nil;
   lResult := nil;
   try
-    __Message.Read('ContactosID', TypeInfo(String), ContactosID, []);
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
 
-    lResult := (__Instance as IsrvContactos).GenerateEtiquetasReport(ContactosID);
+    lResult := (__Instance as IsrvContactos).GenerarInformeEtiquetas(ListaID);
 
-    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContactos', 'GenerateEtiquetasReportResponse');
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContactos', 'GenerarInformeEtiquetasResponse');
     __Message.Write('Result', TypeInfo(Binary), lResult, []);
     __Message.Finalize;
     __Message.UnsetAttributes(__Transport);
@@ -280,6 +281,7 @@ begin
   finally
     __lObjectDisposer := TROObjectDisposer.Create(__Instance);
     try
+      __lObjectDisposer.Add(ListaID);
       __lObjectDisposer.Add(lResult);
     finally
       __lObjectDisposer.Free();

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -28,7 +28,8 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType />
     <BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 10 de marzo de 2009 19:06</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">1</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 11 de marzo de 2009 16:18</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.3.0.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.3.0.0\0"
-              VALUE "CompileDate", "miércoles, 11 de marzo de 2009 13:31\0"
+              VALUE "CompileDate", "miércoles, 11 de marzo de 2009 16:18\0"
          END
     END
     BLOCK "VarFileInfo"