Version 2.6.3 Informe Listado de datos de los contactos

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

Database/scripts/factuges.sql

@@ -4466,7 +4466,53 @@ INNER JOIN VENDEDORES_DATOS ON (VENDEDORES_DATOS.ID_VENDEDOR = V_CONTACTOS.ID)
 WHERE V_CONTACTOS.ID_CATEGORIA = 3
 ;
 
+CREATE VIEW V_LISTADO_DATOS_CONTACTO(
+    ID,
+    ID_CONTACTO,
+    NOMBRE,
+    TELEFONO_TRABAJO,
+    TELEFONO_PARTICULAR,
+    MOVIL,
+    MAIL_TRABAJO,
+    MAIL_PARTICULAR)
+AS
+select
+    ID,
+    ID_CONTACTO,
+    NOMBRE,
+    telefono_trabajo,
+    telefono_particular,
+    movil,
+    mail_tabajo,
+    mail_particular
+from
+(
+select
+    ID,
+    ID as ID_CONTACTO,
+    NOMBRE,
+    TELEFONO_1 as telefono_trabajo,
+    Telefono_2 as telefono_particular,
+    MOVIL_1 as movil,
+    EMAIL_1 as mail_tabajo,
+    EMAIL_2 as mail_particular
+from CONTACTOS
 
+union
+
+select
+    ID,
+    ID_CONTACTO,
+    NOMBRE,
+    null as telefono_tabajo,
+    TELEFONO as telefono_particular,
+    MOVIL,
+    null as movil_trabajo,
+    EMAIL as movil_particular
+from CONTACTOS_DATOS_PERSONAL
+)
+order by id_contacto
+;
 
 
 /******************************************************************************/

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">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>
@@ -58,55 +72,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\designide.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.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\dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.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_D11R.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

@@ -52,7 +52,8 @@
     <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">6</VersionInfo><VersionInfo Name="Release">2</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.6.2.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.6.2.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">6</VersionInfo><VersionInfo Name="Release">3</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.6.3.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.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,1,0
+FILEVERSION 2,6,3,0
-PRODUCTVERSION 2,6,1,0
+PRODUCTVERSION 2,6,3,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.1.0\0"
+              VALUE "FileVersion", "2.6.3.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.1.0\0"
+              VALUE "ProductVersion", "2.6.3.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/GUIBase/uEditorPreview.dfm

@@ -2478,7 +2478,7 @@ inherited fEditorPreview: TfEditorPreview
     Bitmap = {}
   end
   object frxReport1: TfrxReport
-    Version = '4.3'
+    Version = '4.8.11'
     DotMatrixReport = False
     EngineOptions.DoublePass = True
     IniFile = '\Software\Fast Reports'
@@ -2489,10 +2489,6 @@ inherited fEditorPreview: TfEditorPreview
     ReportOptions.CreateDate = 38658.858023541660000000
     ReportOptions.LastChange = 38658.858023541660000000
     ScriptLanguage = 'PascalScript'
-    ScriptText.Strings = (
-      'begin'
-      ''
-      'end.')
     StoreInDFM = False
     Left = 16
     Top = 200
@@ -2529,6 +2525,7 @@ inherited fEditorPreview: TfEditorPreview
     ShowDialog = False
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
     Monochrome = True
     Left = 120
     Top = 384
@@ -2536,13 +2533,21 @@ inherited fEditorPreview: TfEditorPreview
   object frxPDFExport1: TfrxPDFExport
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
     PrintOptimized = True
     Outline = False
+    Background = False
+    HTMLTags = False
     Author = 'FastReport'#174
     Subject = 'FastReport PDF export'
-    Background = False
     Creator = 'FastReport (http://www.fast-report.com)'
-    HTMLTags = False
+    ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
+    HideToolbar = False
+    HideMenubar = False
+    HideWindowUI = False
+    FitWindow = False
+    CenterWindow = False
+    PrintScaling = False
     Left = 160
     Top = 384
   end
@@ -2550,6 +2555,7 @@ inherited fEditorPreview: TfEditorPreview
     ShowDialog = False
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
     Monochrome = True
     Left = 192
     Top = 384
@@ -2557,41 +2563,59 @@ inherited fEditorPreview: TfEditorPreview
   object frxXLSExport1: TfrxXLSExport
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
+    ExportEMF = True
     AsText = False
     Background = True
     FastExport = True
     PageBreaks = True
     EmptyLines = True
     SuppressPageHeadersFooters = False
-    Left = 40
+    Left = 344
     Top = 384
   end
   object frxMailExport1: TfrxMailExport
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
     ShowExportDialog = True
     SmtpPort = 25
     UseIniFile = True
+    TimeOut = 60
+    ConfurmReading = False
     Left = 80
     Top = 384
   end
   object frxRTFExport: TfrxRTFExport
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
+    ExportEMF = True
     Wysiwyg = True
     Creator = 'FastReport http://www.fast-report.com'
     SuppressPageHeadersFooters = False
     HeaderFooterMode = hfText
+    AutoSize = False
     Left = 232
     Top = 384
   end
   object frxSimpleTextExport1: TfrxSimpleTextExport
     UseFileCache = True
     ShowProgress = True
+    OverwritePrompt = False
     Frames = False
     EmptyLines = False
     OEMCodepage = False
     Left = 264
     Top = 384
   end
+  object frxCSVExport1: TfrxCSVExport
+    UseFileCache = True
+    ShowProgress = True
+    OverwritePrompt = False
+    Separator = ';'
+    OEMCodepage = False
+    Left = 304
+    Top = 384
+  end
 end

Source/GUIBase/uEditorPreview.pas

@@ -12,7 +12,7 @@ uses
   frxGradient, frxChBox, frxCross, frxRich, frxOLE, frxBarcode,
   ExtCtrls, JvComponentBase, TBXStatusBars, JvExComCtrls, JvStatusBar,
   frxExportMail, frxExportXLS, frxExportText, frxExportRTF, uControllerBase,
-  uIntegerListUtils;
+  uIntegerListUtils, frxExportCSV;
 
 type
   IEditorPreview = interface(IEditorBase)
@@ -115,6 +115,7 @@ type
     TBXItem55: TTBXItem;
     TBXItem56: TTBXItem;
     TBXItem57: TTBXItem;
+    frxCSVExport1: TfrxCSVExport;
     procedure FormShow(Sender: TObject);
     procedure actPrimeraPaginaExecute(Sender: TObject);
     procedure actUltimaPaginaExecute(Sender: TObject);
@@ -308,6 +309,7 @@ procedure TfEditorPreview.actExportarExcelExecute(Sender: TObject);
 begin
   inherited;
   FPreview.Preview.Export(frxXLSExport1);
+//  FPreview.Preview.Export(frxCSVExport1);
 end;
 
 procedure TfEditorPreview.actExportarPDFExecute(Sender: TObject);

Source/Modulos/Contactos/Controller/Contactos_controller.dproj

@@ -43,6 +43,18 @@
     <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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="D:\MISDOC~1\BORLAN~1\Bpl\JclDebugExpert100.bpl">JCL Debug IDE extension</Excluded_Packages>
       <Excluded_Packages Name="D:\MISDOC~1\BORLAN~1\Bpl\JclProjectAnalysisExpert100.bpl">JCL Project Analyzer</Excluded_Packages>
       <Excluded_Packages Name="D:\MISDOC~1\BORLAN~1\Bpl\JclFavoriteFoldersExpert100.bpl">JCL Open and Save IDE dialogs with favorite folders</Excluded_Packages>
@@ -53,29 +65,28 @@
     <DelphiCompile Include="Contactos_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contabilidad_controller.dcp" />
+    <DCCReference Include="Contabilidad_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_data.dcp" />
+    <DCCReference Include="Contactos_data.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="rtl.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\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="uClientesController.pas" />
     <DCCReference Include="uContactosController.pas" />
     <DCCReference Include="uDireccionesContactoController.pas" />
-    <DCCReference Include="uEtiquetasContactosReportController.pas" />
     <DCCReference Include="uGruposClienteController.pas" />
     <DCCReference Include="uGruposProveedorController.pas" />
+    <DCCReference Include="uListadosContactosReportController.pas" />
     <DCCReference Include="uPersonalContactoController.pas" />
     <DCCReference Include="uProcedenciasClienteController.pas" />
     <DCCReference Include="uProveedoresController.pas" />
     <DCCReference Include="uVendedoresController.pas" />
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vclx.dcp" />
     <DCCReference Include="View\uIEditorCliente.pas" />
     <DCCReference Include="View\uIEditorClientes.pas" />
     <DCCReference Include="View\uIEditorContacto.pas" />
@@ -87,15 +98,16 @@
     <DCCReference Include="View\uIEditorElegirPersonaContacto.pas" />
     <DCCReference Include="View\uIEditorElegirProveedores.pas" />
     <DCCReference Include="View\uIEditorElegirVendedores.pas" />
-    <DCCReference Include="View\uIEditorEtiquetasContactosPreview.pas" />
     <DCCReference Include="View\uIEditorGruposCliente.pas" />
     <DCCReference Include="View\uIEditorGruposProveedor.pas" />
+    <DCCReference Include="View\uIEditorListadosContactosPreview.pas" />
     <DCCReference Include="View\uIEditorPersonalContacto.pas" />
     <DCCReference Include="View\uIEditorProcedenciasCliente.pas" />
     <DCCReference Include="View\uIEditorProveedor.pas" />
     <DCCReference Include="View\uIEditorProveedores.pas" />
     <DCCReference Include="View\uIEditorVendedor.pas" />
     <DCCReference Include="View\uIEditorVendedores.pas" />
+    <DCCReference Include="xmlrtl.dcp" />
     <None Include="ModelSupport_Contactos_controller\default.txaPackage" />
   </ItemGroup>
 </Project>

Source/Modulos/Contactos/Controller/View/uIEditorEtiquetasContactosPreview.pas

@@ -1,16 +0,0 @@
-unit uIEditorEtiquetasContactosPreview;
-
-interface
-
-uses
-  uEditorPreview, uBizContactos, uEtiquetasContactosReportController;
-
-type
-  IEditorEtiquetasContactosPreview = interface(IEditorPreview)
-  ['{270D1825-A4A4-4480-BBBA-6DD464ACAD3C}']
-  end;
-
-
-implementation
-
-end.

Source/Modulos/Contactos/Controller/View/uIEditorListadosContactosPreview.pas

@@ -0,0 +1,16 @@
+unit uIEditorListadosContactosPreview;
+
+interface
+
+uses
+  uEditorPreview, uBizContactos, uListadosContactosReportController;
+
+type
+  IEditorListadosContactosPreview = interface(IEditorPreview)
+  ['{270D1825-A4A4-4480-BBBA-6DD464ACAD3C}']
+  end;
+
+
+implementation
+
+end.

Source/Modulos/Contactos/Controller/uClientesController.pas

@@ -16,8 +16,10 @@ type
     function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto;
     function EsEliminable(ACliente: IBizContacto): Boolean;
     function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload;
-    procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PreviewInformeEtiquetas(ACliente : IBizCliente; AllItems: Boolean = false);
-    procedure Print(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PrintInformeEtiquetas(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PreviewInformeListaDatosContacto(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PrintInformeListaDatosContacto(ACliente : IBizCliente; AllItems: Boolean = false);
     procedure SetTieneSubcuenta(ACliente: IBizCliente; AValue: Boolean);
     procedure SetIgnorarContabilidad(ACliente: IBizCliente; AValue: Boolean);
   end;
@@ -47,8 +49,10 @@ type
     function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto;
     function EsEliminable(ACliente: IBizContacto): Boolean;
     function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload;
-    procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PreviewInformeEtiquetas(ACliente : IBizCliente; AllItems: Boolean = false);
-    procedure Print(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PrintInformeEtiquetas(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PreviewInformeListaDatosContacto(ACliente : IBizCliente; AllItems: Boolean = false);
+    procedure PrintInformeListaDatosContacto(ACliente : IBizCliente; AllItems: Boolean = false);
     procedure SetTieneSubcuenta(ACliente: IBizCliente; AValue: Boolean);
     procedure SetIgnorarContabilidad(ACliente: IBizCliente; AValue: Boolean);
   end;
@@ -57,7 +61,7 @@ implementation
 
 uses
   Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils,
-  uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
+  uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uListadosContactosReportController,
   uIEditorElegirClientes, uEditorGridBase, uDAInterfaces, uFactuGES_App, uIEditorElegirDireccionEntrega,
   Dialogs, uIntegerListUtils;
 
@@ -257,12 +261,12 @@ begin
   Result := AContacto;
 end;
 
-procedure TClientesController.Preview(ACliente: IBizCliente; AllItems: Boolean);
+procedure TClientesController.PreviewInformeEtiquetas(ACliente: IBizCliente; AllItems: Boolean);
 var
-  AReportController : IEtiquetasContactosReportController;
+  AReportController : IListadosContactosReportController;
   ListaID: TIntegerList;
 begin
-  AReportController := TEtiquetasContactosReportController.Create;
+  AReportController := TListadosContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
   try
@@ -283,20 +287,20 @@ begin
    else
      ListaID.Add(ACliente.ID);
 
-    AReportController.Preview(ListaID);
+    AReportController.PreviewInformeEtiquetas(ListaID);
   finally
     AReportController := NIL;
     FreeANDNIL(ListaID);
   end;
 end;
 
-procedure TClientesController.Print(ACliente: IBizCliente; AllItems: Boolean);
+procedure TClientesController.PreviewInformeListaDatosContacto(
+  ACliente: IBizCliente; AllItems: Boolean);
 var
-  AReportController : IEtiquetasContactosReportController;
+  AReportController : IListadosContactosReportController;
   ListaID: TIntegerList;
-
 begin
-  AReportController := TEtiquetasContactosReportController.Create;
+  AReportController := TListadosContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
   try
@@ -317,7 +321,77 @@ begin
    else
      ListaID.Add(ACliente.ID);
 
-    AReportController.Print(ListaID);
+    AReportController.PreviewInformeListaDatosContacto(ListaID);
+  finally
+    AReportController := NIL;
+    FreeANDNIL(ListaID);
+  end;
+end;
+
+procedure TClientesController.PrintInformeEtiquetas(ACliente: IBizCliente; AllItems: Boolean);
+var
+  AReportController : IListadosContactosReportController;
+  ListaID: TIntegerList;
+
+begin
+  AReportController := TListadosContactosReportController.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.PrintInformeEtiquetas(ListaID);
+
+  finally
+    AReportController := NIL;
+    FreeANDNil(ListaID);
+  end;
+end;
+
+procedure TClientesController.PrintInformeListaDatosContacto(
+  ACliente: IBizCliente; AllItems: Boolean);
+var
+  AReportController : IListadosContactosReportController;
+  ListaID: TIntegerList;
+
+begin
+  AReportController := TListadosContactosReportController.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.PrintInformeListaDatosContacto(ListaID);
 
   finally
     AReportController := NIL;

Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas

@@ -1,113 +0,0 @@
-unit uEtiquetasContactosReportController;
-
-interface
-
-uses
-  Classes, SysUtils, uDADataTable, uIDataModuleEtiquetasContactosReport,
-  uVendedoresController, uControllerBase, uIntegerListUtils;
-
-type
-  IEtiquetasContactosReportController = interface(IControllerBase)
-  ['{76BB35E3-554E-4D30-8D3E-54E488EF82E2}']
-    procedure Preview(const ListaID : TIntegerList);
-    procedure Print(const ListaID : TIntegerList);
-  end;
-
-  TEtiquetasContactosReportController = class(TControllerBase, IEtiquetasContactosReportController)
-  private
-    FDataModule : IDataModuleEtiquetasContactosReport;
-    function CreateEditor(const AName: String; const IID: TGUID; out Intf): Boolean;
-  public
-    constructor Create; override;
-    destructor Destroy; override;
-
-    procedure Preview(const ListaID : TIntegerList);
-    procedure Print(const ListaID : TIntegerList);
-  end;
-
-
-implementation
-
-uses
-  uROTypes, uEditorRegistryUtils, uIEditorEtiquetasContactosPreview,
-  uEditorPreview, uDataModuleContactos, uEditorBase, cxControls;
-
-{ TEtiquetasContactosReportController }
-
-constructor TEtiquetasContactosReportController.Create;
-begin
-  inherited;
-  FDataModule := TDataModuleContactos.Create(Nil);
-end;
-
-function TEtiquetasContactosReportController.CreateEditor(const AName: String; const IID: TGUID; out Intf): Boolean;
-begin
-  Result := Supports(EditorRegistry.CreateEditor(AName), IID, Intf);
-end;
-
-
-destructor TEtiquetasContactosReportController.Destroy;
-begin
-  FDataModule := NIL;
-  inherited;
-end;
-
-procedure TEtiquetasContactosReportController.Preview(const ListaID : TIntegerList);
-var
-  AStream: Binary;
-  AEditor : IEditorEtiquetasContactosPreview;
-begin
-  AEditor := NIL;
-
-  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;
-      end;
-    end;
-  finally
-    FreeAndNil(AStream);
-    AEditor := Nil;
-  end;
-end;
-
-procedure TEtiquetasContactosReportController.Print(const ListaID : TIntegerList);
-var
-  AStream: Binary;
-  AEditor : IEditorEtiquetasContactosPreview;
-begin
-  AEditor := NIL;
-  ShowHourglassCursor;
-  try
-    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;
-        end;
-      end;
-    finally
-      FreeAndNil(AStream);
-      AEditor := Nil;
-    end;
-  finally
-    HideHourglassCursor;
-  end;
-end;
-
-end.

Source/Modulos/Contactos/Controller/uListadosContactosReportController.pas

@@ -0,0 +1,178 @@
+unit uListadosContactosReportController;
+
+interface
+
+uses
+  Classes, SysUtils, uDADataTable, uIDataModuleListadosContactosReport,
+  uVendedoresController, uControllerBase, uIntegerListUtils;
+
+type
+  IListadosContactosReportController = interface(IControllerBase)
+  ['{76BB35E3-554E-4D30-8D3E-54E488EF82E2}']
+    procedure PreviewInformeEtiquetas(const ListaID : TIntegerList);
+    procedure PrintInformeEtiquetas(const ListaID : TIntegerList);
+    procedure PreviewInformeListaDatosContacto(const ListaID : TIntegerList);
+    procedure PrintInformeListaDatosContacto(const ListaID : TIntegerList);
+  end;
+
+  TListadosContactosReportController = class(TControllerBase, IListadosContactosReportController)
+  private
+    FDataModule : IDataModuleListadosContactosReport;
+    function CreateEditor(const AName: String; const IID: TGUID; out Intf): Boolean;
+  public
+    constructor Create; override;
+    destructor Destroy; override;
+
+    procedure PreviewInformeEtiquetas(const ListaID : TIntegerList);
+    procedure PrintInformeEtiquetas(const ListaID : TIntegerList);
+    procedure PreviewInformeListaDatosContacto(const ListaID : TIntegerList);
+    procedure PrintInformeListaDatosContacto(const ListaID : TIntegerList);
+
+  end;
+
+
+implementation
+
+uses
+  uROTypes, uEditorRegistryUtils, uIEditorListadosContactosPreview,
+  uEditorPreview, uDataModuleContactos, uEditorBase, cxControls;
+
+{ TEtiquetasContactosReportController }
+
+constructor TListadosContactosReportController.Create;
+begin
+  inherited;
+  FDataModule := TDataModuleContactos.Create(Nil);
+end;
+
+function TListadosContactosReportController.CreateEditor(const AName: String; const IID: TGUID; out Intf): Boolean;
+begin
+  Result := Supports(EditorRegistry.CreateEditor(AName), IID, Intf);
+end;
+
+
+destructor TListadosContactosReportController.Destroy;
+begin
+  FDataModule := NIL;
+  inherited;
+end;
+
+procedure TListadosContactosReportController.PreviewInformeEtiquetas(const ListaID : TIntegerList);
+var
+  AStream: Binary;
+  AEditor : IEditorListadosContactosPreview;
+begin
+  AEditor := NIL;
+
+  AStream := FDataModule.GetReportInformeEtiquetas(ListaID);
+  try
+    CreateEditor('EditorListadosContactosPreview', IEditorListadosContactosPreview, AEditor);
+    if Assigned(AEditor) then
+    begin
+      try
+        AEditor.Controller := Self;
+        AEditor.ListaID := ListaID;
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+      finally
+        AEditor.Release;
+      end;
+    end;
+  finally
+    FreeAndNil(AStream);
+    AEditor := Nil;
+  end;
+end;
+
+procedure TListadosContactosReportController.PreviewInformeListaDatosContacto(
+  const ListaID: TIntegerList);
+var
+  AStream: Binary;
+  AEditor : IEditorListadosContactosPreview;
+begin
+  AEditor := NIL;
+
+  AStream := FDataModule.GetReportInformeListaDatosContacto(ListaID);
+  try
+    CreateEditor('EditorListadosContactosPreview', IEditorListadosContactosPreview, AEditor);
+    if Assigned(AEditor) then
+    begin
+      try
+        AEditor.Controller := Self;
+        AEditor.ListaID := ListaID;
+        AEditor.LoadFromStream(AStream);
+        AEditor.Preview;
+      finally
+        AEditor.Release;
+      end;
+    end;
+  finally
+    FreeAndNil(AStream);
+    AEditor := Nil;
+  end;
+end;
+
+procedure TListadosContactosReportController.PrintInformeEtiquetas(const ListaID : TIntegerList);
+var
+  AStream: Binary;
+  AEditor : IEditorListadosContactosPreview;
+begin
+  AEditor := NIL;
+  ShowHourglassCursor;
+  try
+    AStream := FDataModule.GetReportInformeEtiquetas(ListaID);
+    try
+      CreateEditor('EditorListadosContactosPreview', IEditorListadosContactosPreview, AEditor);
+      if Assigned(AEditor) then
+      begin
+        try
+          AEditor.Controller := Self;
+          AEditor.ListaID := ListaID;
+          AEditor.LoadFromStream(AStream);
+          AEditor.Print;
+        finally
+          AEditor.Release;
+        end;
+      end;
+    finally
+      FreeAndNil(AStream);
+      AEditor := Nil;
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TListadosContactosReportController.PrintInformeListaDatosContacto(
+  const ListaID: TIntegerList);
+var
+  AStream: Binary;
+  AEditor : IEditorListadosContactosPreview;
+begin
+  AEditor := NIL;
+  ShowHourglassCursor;
+  try
+    AStream := FDataModule.GetReportInformeListaDatosContacto(ListaID);
+    try
+      CreateEditor('EditorListadosContactosPreview', IEditorListadosContactosPreview, AEditor);
+      if Assigned(AEditor) then
+      begin
+        try
+          AEditor.Controller := Self;
+          AEditor.ListaID := ListaID;
+          AEditor.LoadFromStream(AStream);
+          AEditor.Print;
+        finally
+          AEditor.Release;
+        end;
+      end;
+    finally
+      FreeAndNil(AStream);
+      AEditor := Nil;
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+end.

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -49,7 +49,7 @@ implementation
 
 uses
   Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
-  uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
+  uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uListadosContactosReportController,
   uIEditorElegirProveedores, Controls, uEditorGridBase, JSDialogs, JSDialog,
   uDAInterfaces, uFactuGES_App, Windows, uIntegerListUtils;
 
@@ -220,11 +220,11 @@ end;
 
 procedure TProveedoresController.Preview(AProveedor: IBizProveedor; AllItems: Boolean);
 var
-  AReportController : IEtiquetasContactosReportController;
+  AReportController : IListadosContactosReportController;
   ListaID: TIntegerList;
 
 begin
-  AReportController := TEtiquetasContactosReportController.Create;
+  AReportController := TListadosContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
   try
@@ -245,7 +245,7 @@ begin
    else
      ListaID.Add(AProveedor.ID);
 
-    AReportController.Preview(ListaID);
+    AReportController.PreviewInformeEtiquetas(ListaID);
   finally
     AReportController := NIL;
     FreeANDNil(ListaID);
@@ -254,11 +254,11 @@ end;
 
 procedure TProveedoresController.Print(AProveedor: IBizProveedor; AllItems: Boolean);
 var
-  AReportController : IEtiquetasContactosReportController;
+  AReportController : IListadosContactosReportController;
   ListaID: TIntegerList;
 
 begin
-  AReportController := TEtiquetasContactosReportController.Create;
+  AReportController := TListadosContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
   try
@@ -279,7 +279,7 @@ begin
    else
      ListaID.Add(AProveedor.ID);
 
-    AReportController.Print(ListaID);
+    AReportController.PrintInformeEtiquetas(ListaID);
 
   finally
     AReportController := NIL;

Source/Modulos/Contactos/Data/uDataModuleContactos.dfm

@@ -11,12 +11,12 @@ inherited DataModuleContactos: TDataModuleContactos
     Top = 16
   end
   object rda_Contactos: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 43
     Top = 143
   end
@@ -201,8 +201,6 @@ inherited DataModuleContactos: TDataModuleContactos
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Contactos
     LocalDataStreamer = Bin2DataStreamer
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Contactos'
     IndexDefs = <>
     Left = 176
@@ -333,8 +331,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'DireccionesContacto'
     IndexDefs = <>
     Left = 448
@@ -413,8 +409,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'DatosBancarios'
     IndexDefs = <>
     Left = 176
@@ -505,8 +499,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'PersonalContacto'
     IndexDefs = <>
     Left = 296

Source/Modulos/Contactos/Data/uDataModuleContactos.pas

@@ -8,13 +8,13 @@ uses
   uDAScriptingProvider, uDACDSDataTable, uROWinInetHttpChannel,
   uRORemoteService, uROClient, uROBinMessage,
   uBizContactos, uBizContactosDatosBancarios, 
-  uBizDireccionesContacto, uIDataModuleEtiquetasContactosReport,
+  uBizDireccionesContacto, uIDataModuleListadosContactosReport,
   uIDataModuleContactos, uDADesigntimeCall, uROTypes, uRODynamicRequest,
   uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uDABin2DataStreamer,
   uDAMemDataTable, uDataModuleBase, uBizContactosPersonal;
 
 type
-  TDataModuleContactos = class(TDataModuleBase, IDataModuleContactos, IDataModuleEtiquetasContactosReport)
+  TDataModuleContactos = class(TDataModuleBase, IDataModuleContactos, IDataModuleListadosContactosReport)
     RORemoteService: TRORemoteService;
     rda_Contactos: TDARemoteDataAdapter;
     Bin2DataStreamer: TDABin2DataStreamer;
@@ -36,7 +36,8 @@ type
     function NewDireccion : IBizDireccionesContacto;
 
     // Report
-    function GetReport(const ListaID: TIntegerList): Binary;
+    function GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary;
+    function GetReportInformeListaDatosContacto(const ListaID: TIntegerList): Binary;
   end;
 
 implementation
@@ -60,7 +61,7 @@ begin
   //
 end;
 
-function TDataModuleContactos.GetReport(const ListaID: TIntegerList): Binary;
+function TDataModuleContactos.GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary;
 var
   AParam : TIntegerArray;
 begin
@@ -72,6 +73,19 @@ begin
   end;
 end;
 
+function TDataModuleContactos.GetReportInformeListaDatosContacto(
+  const ListaID: TIntegerList): Binary;
+var
+  AParam : TIntegerArray;
+begin
+  AParam := ListaID.ToIntegerArray;
+  try
+    Result := (RORemoteService as IsrvContactos).GenerarInformeListaDatosContacto(AParam);
+  finally
+    FreeANDNIL(AParam);
+  end;
+end;
+
 function TDataModuleContactos.NewDireccion: IBizDireccionesContacto;
 var
   Condicion: TDAWhereExpression;

Source/Modulos/Contactos/Model/Contactos_model.dproj

@@ -50,26 +50,26 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="Data\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="Data\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Data\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Data\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="Data\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="Data\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
+    <DCCReference Include="Data\FormasPago_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
+    <DCCReference Include="Data\FormasPago_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="Data\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Data\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="Data\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
+    <DCCReference Include="Data\TiposIVA_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="Data\TiposIVA_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
     <DCCReference Include="Data\uIDataModuleClientes.pas" />
     <DCCReference Include="Data\uIDataModuleContactos.pas" />
-    <DCCReference Include="Data\uIDataModuleEtiquetasContactosReport.pas" />
+    <DCCReference Include="Data\uIDataModuleListadosContactosReport.pas" />
     <DCCReference Include="Data\uIDataModuleProveedores.pas" />
     <DCCReference Include="Data\uIDataModuleVendedores.pas" />
+    <DCCReference Include="Data\vcl.dcp" />
+    <DCCReference Include="Data\vcldb.dcp" />
     <DCCReference Include="schContactosClient_Intf.pas" />
     <DCCReference Include="schContactosServer_Intf.pas" />
     <DCCReference Include="uBizClientesDescuentos.pas" />

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

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

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

@@ -0,0 +1,17 @@
+unit uIDataModuleListadosContactosReport;
+
+interface
+
+uses
+  SysUtils, Classes, uROTypes, uIntegerListUtils;
+
+type
+  IDataModuleListadosContactosReport = interface
+  ['{26E68DED-5BD9-4227-B07F-9644BED7AE7B}']
+    function GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary;
+    function GetReportInformeListaDatosContacto(const ListaID: TIntegerList): Binary;
+  end;
+
+implementation
+
+end.

Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas

@@ -1,110 +0,0 @@
-unit uRptEtiquetasContacto_Server;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
-  uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
-  frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable,
-  FactuGES_Intf;
-
-type
-  TRptEtiquetasContacto = class(TDataModule)
-    DADataCabecera: TDADataSource;
-    tbl_Contactos: TDAMemDataTable;
-    frxRichObject1: TfrxRichObject;
-    frxBarCodeObject1: TfrxBarCodeObject;
-    frxOLEObject1: TfrxOLEObject;
-    frxCrossObject1: TfrxCrossObject;
-    frxCheckBoxObject1: TfrxCheckBoxObject;
-    frxGradientObject1: TfrxGradientObject;
-    frxChartObject1: TfrxChartObject;
-    frxDBCabecera: TfrxDBDataset;
-    frxReport: TfrxReport;
-    schReport: TDASchema;
-    DataDictionary: TDADataDictionary;
-    Bin2DataStreamer: TDABin2DataStreamer;
-    procedure DataModuleCreate(Sender: TObject);
-  private
-    FConnection: IDAConnection;
-  public
-    function GenerarInforme(const ListaID: TIntegerArray): Binary; overload;
-  end;
-
-implementation
-
-{$R *.dfm}
-
-uses
-  uSistemaFunc, uDataModuleServer, schContactosClient_Intf;
-
-const
-  rptEtiquetasContacto = 'InfEtiquetasContacto.fr3';
-
-  { Dataset names for schReport }
-  ds_InformeContactos = 'InformeEtiquetasContacto';
-
-
-{ TRptEtiquetasContacto }
-
-
-procedure TRptEtiquetasContacto.DataModuleCreate(Sender: TObject);
-begin
-  schReport.ConnectionManager := dmServer.ConnectionManager;
-  FConnection := dmServer.DarNuevaConexion;
-  frxReport.EngineOptions.NewSilentMode := simReThrow;
-end;
-
-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
-    dsMaster := schReport.NewDataset(FConnection, ds_InformeContactos, [], [], False); //, ['ID'], ['611, 751']); //AID]);
-    AWhereStr := fld_ContactosID + ' in (';
-    for i := 0 to ListaID.Count - 1 do
-    begin
-      if i > 0 then
-        AWhereStr := AWhereStr + ', ';
-      AWhereStr := AWhereStr + IntToStr(ListaID.Items[i]);
-    end;
-
-    AWhereStr := AWhereStr + ')';
-    dsMaster.Where.AddText(AWhereStr);
-
-    dsMaster.Open;
-
-    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
-       raise Exception.Create (('Error Servidor: GenerarInforme, no encuentra informe ' + rptEtiquetasContacto));
-
-    frxReport.LoadFromFile(AInforme, True);
-    frxReport.PrepareReport(True);
-
-    frxReport.PreviewPages.SaveToStream(Result);
-
-  finally
-    AStream.Free;
-    dsMaster := Nil;
-    FConnection.RollbackTransaction;
-  end;
-
-end;
-
-
-end.

Source/Modulos/Contactos/Reports/uRptListadosContactos_Server.dfm

@@ -1,8 +1,8 @@
-object RptEtiquetasContacto: TRptEtiquetasContacto
+object RptListadosContactos: TRptListadosContactos
   OldCreateOrder = True
   OnCreate = DataModuleCreate
   Height = 405
-  Width = 447
+  Width = 690
   object DADataCabecera: TDADataSource
     DataSet = tbl_Contactos.Dataset
     DataTable = tbl_Contactos
@@ -27,37 +27,35 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
         Size = 255
       end
       item
-        Name = 'PERSONA_CONTACTO'
+        Name = 'TELEFONO_TRABAJO'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'TELEFONO_PARTICULAR'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'MOVIL'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'MAIL_TABAJO'
         DataType = datString
         Size = 255
       end
       item
-        Name = 'CALLE'
+        Name = 'MAIL_PARTICULAR'
         DataType = datString
         Size = 255
-      end
-      item
-        Name = 'POBLACION'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'PROVINCIA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'CODIGO_POSTAL'
-        DataType = datString
-        Size = 10
       end>
     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
@@ -180,6 +178,88 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
             DataType = datString
             Size = 10
           end>
+      end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'V_LISTADO_DATOS_CONTACTO '
+            StatementType = stAutoSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_CONTACTO'
+                TableField = 'ID_CONTACTO'
+              end
+              item
+                DatasetField = 'NOMBRE'
+                TableField = 'NOMBRE'
+              end
+              item
+                DatasetField = 'TELEFONO_TRABAJO'
+                TableField = 'TELEFONO_TRABAJO'
+              end
+              item
+                DatasetField = 'TELEFONO_PARTICULAR'
+                TableField = 'TELEFONO_PARTICULAR'
+              end
+              item
+                DatasetField = 'MOVIL'
+                TableField = 'MOVIL'
+              end
+              item
+                DatasetField = 'MAIL_TRABAJO'
+                TableField = 'MAIL_TRABAJO'
+              end
+              item
+                DatasetField = 'MAIL_PARTICULAR'
+                TableField = 'MAIL_PARTICULAR'
+              end>
+          end>
+        Name = 'InformeListaDatosContacto'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+          end
+          item
+            Name = 'ID_CONTACTO'
+            DataType = datInteger
+          end
+          item
+            Name = 'NOMBRE'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'TELEFONO_TRABAJO'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'TELEFONO_PARTICULAR'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'MOVIL'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'MAIL_TRABAJO'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'MAIL_PARTICULAR'
+            DataType = datString
+            Size = 255
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -385,71 +465,16 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
     Top = 158
   end
   object frxReport: TfrxReport
-    Version = '4.3'
+    Version = '4.8.11'
     DotMatrixReport = False
     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'
     PrintOptions.PrintOnSheet = 0
-    ReportOptions.CreateDate = 38330.712904247710000000
+    ReportOptions.CreateDate = 42030.550901400500000000
-    ReportOptions.LastChange = 39328.775946539350000000
+    ReportOptions.LastChange = 42033.784458587960000000
     ScriptLanguage = 'PascalScript'
-    ScriptText.Strings = (
-      'procedure Memo2OnBeforePrint(Sender: TfrxComponent);'
-      'var'
-      '  Cadena: String;'
-      'begin'
-      '  Cadena := '#39#39';'
-      ''
-      '  if (<frxDBCabecera."NOMBRE"> <> '#39#39') then'
-      '     Cadena := UPPERCASE(<frxDBCabecera."NOMBRE">);'
-      ''
-      '  Memo2.Lines.Clear;'
-      '  Memo2.Lines.Add(Cadena);'
-      ''
-      '  if (<frxDBCabecera."CALLE"> <> '#39#39') then'
-      '     Cadena := UPPERCASE(<frxDBCabecera."CALLE">);'
-      '  Memo2.Lines.Add(Cadena);'
-      ''
-      '  Cadena := '#39#39';'
-      '  if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
-      '     Cadena := UPPERCASE(<frxDBCabecera."CODIGO_POSTAL">);'
-      ''
-      '  if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
-      '     if (Cadena <> '#39#39') then'
-      
-        '        Cadena := Cadena + '#39'  '#39' + UPPERCASE(<frxDBCabecera."POBL' +
-        'ACION">);'
-      ''
-      '  if (<frxDBCabecera."PROVINCIA"> <> '#39#39')'
-      
-        '  and (<frxDBCabecera."POBLACION"> <> <frxDBCabecera."PROVINCIA"' +
-        '>) then'
-      '  begin'
-      '     if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
-      
-        '        Cadena := Cadena + '#39'  ('#39' + UPPERCASE(<frxDBCabecera."PRO' +
-        'VINCIA">) + '#39')'#39
-      '     else'
-      
-        '        Cadena := Cadena + '#39'  '#39' + UPPERCASE(<frxDBCabecera."PROV' +
-        'INCIA">);'
-      '  end;'
-      '  Memo2.Lines.Add(Cadena);'
-      ''
-      '  Cadena := '#39#39';'
-      '  Memo2.Lines.Add(Cadena);'
-      '  if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
-      
-        '     Cadena := '#39'ATT. '#39' + UPPERCASE(<frxDBCabecera."PERSONA_CONTA' +
-        'CTO">);'
-      '  Memo2.Lines.Add(Cadena);'
-      'end;'
-      ''
-      'begin'
-      ''
-      'end.')
     ShowProgress = False
     StoreInDFM = False
     Left = 169
@@ -459,6 +484,7 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
     UserName = 'frxDBCabecera'
     CloseDataSource = True
     DataSource = DADataCabecera
+    BCDToCurrency = False
     Left = 264
     Top = 16
   end
@@ -466,4 +492,68 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
     Left = 48
     Top = 80
   end
+  object frxDBCabecera2: TfrxDBDataset
+    UserName = 'frxDBCabecera2'
+    CloseDataSource = True
+    DataSource = DADataCabecera2
+    BCDToCurrency = False
+    Left = 400
+    Top = 16
+  end
+  object DADataCabecera2: TDADataSource
+    DataSet = tbl_lista_datos_contactos.Dataset
+    DataTable = tbl_lista_datos_contactos
+    Left = 400
+    Top = 72
+  end
+  object tbl_lista_datos_contactos: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datInteger
+      end
+      item
+        Name = 'ID_CONTACTO'
+        DataType = datInteger
+      end
+      item
+        Name = 'NOMBRE'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'TELEFONO_TRABAJO'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'TELEFONO_PARTICULAR'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'MOVIL'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'MAIL_TRABAJO'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'MAIL_PARTICULAR'
+        DataType = datString
+        Size = 255
+      end>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    IndexDefs = <>
+    Left = 400
+    Top = 128
+  end
 end

Source/Modulos/Contactos/Reports/uRptListadosContactos_Server.pas

@@ -0,0 +1,167 @@
+unit uRptListadosContactos_Server;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
+  uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
+  frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
+  uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable,
+  FactuGES_Intf, frxExportCSV;
+
+type
+  TRptListadosContactos = class(TDataModule)
+    DADataCabecera: TDADataSource;
+    tbl_Contactos: TDAMemDataTable;
+    frxRichObject1: TfrxRichObject;
+    frxBarCodeObject1: TfrxBarCodeObject;
+    frxOLEObject1: TfrxOLEObject;
+    frxCrossObject1: TfrxCrossObject;
+    frxCheckBoxObject1: TfrxCheckBoxObject;
+    frxGradientObject1: TfrxGradientObject;
+    frxChartObject1: TfrxChartObject;
+    frxDBCabecera: TfrxDBDataset;
+    frxReport: TfrxReport;
+    Bin2DataStreamer: TDABin2DataStreamer;
+    frxDBCabecera2: TfrxDBDataset;
+    DADataCabecera2: TDADataSource;
+    tbl_lista_datos_contactos: TDAMemDataTable;
+    schReport: TDASchema;
+    DataDictionary: TDADataDictionary;
+    procedure DataModuleCreate(Sender: TObject);
+  private
+    FConnection: IDAConnection;
+  public
+    function GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary; overload;
+    function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; overload;
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  uSistemaFunc, uDataModuleServer, schContactosClient_Intf;
+
+const
+  rptEtiquetasContacto = 'InfEtiquetasContacto.fr3';
+  rptListaDatosContacto = 'InfListaDatosContacto.fr3';
+
+  { Dataset names for schReport }
+  ds_InformeEtiquetasContactos = 'InformeEtiquetasContacto';
+  ds_InformeListaDatosContacto = 'InformeListaDatosContacto';
+  ds_InformeListaDatosContactoPersonal = 'InformeListaDatosContactoPersonal';
+
+
+{ TRptListadosContactos }
+
+
+procedure TRptListadosContactos.DataModuleCreate(Sender: TObject);
+begin
+  schReport.ConnectionManager := dmServer.ConnectionManager;
+  FConnection := dmServer.DarNuevaConexion;
+  frxReport.EngineOptions.NewSilentMode := simReThrow;
+end;
+
+function TRptListadosContactos.GenerarInformeEtiquetas(
+  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
+    dsMaster := schReport.NewDataset(FConnection, ds_InformeEtiquetasContactos, [], [], False); //, ['ID'], ['611, 751']); //AID]);
+    AWhereStr := fld_ContactosID + ' in (';
+    for i := 0 to ListaID.Count - 1 do
+    begin
+      if i > 0 then
+        AWhereStr := AWhereStr + ', ';
+      AWhereStr := AWhereStr + IntToStr(ListaID.Items[i]);
+    end;
+
+    AWhereStr := AWhereStr + ')';
+    dsMaster.Where.AddText(AWhereStr);
+
+    dsMaster.Open;
+
+    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
+       raise Exception.Create (('Error Servidor: GenerarInforme, no encuentra informe ' + rptEtiquetasContacto));
+
+    frxReport.LoadFromFile(AInforme, True);
+    frxReport.PrepareReport(True);
+
+    frxReport.PreviewPages.SaveToStream(Result);
+
+  finally
+    AStream.Free;
+    dsMaster := Nil;
+    FConnection.RollbackTransaction;
+  end;
+
+end;
+
+function TRptListadosContactos.GenerarInformeListaDatosContacto(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
+    dsMaster := schReport.NewDataset(FConnection, ds_InformeListaDatosContacto, [], [], False); //, ['ID'], ['611, 751']); //AID]);
+    AWhereStr := fld_PersonalContactoID_CONTACTO + ' in (';
+    for i := 0 to ListaID.Count - 1 do
+    begin
+      if i > 0 then
+        AWhereStr := AWhereStr + ', ';
+      AWhereStr := AWhereStr + IntToStr(ListaID.Items[i]);
+    end;
+
+    AWhereStr := AWhereStr + ')';
+    dsMaster.Where.AddText(AWhereStr);
+    dsMaster.Open;
+    AStream.Clear;
+    Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_lista_datos_contactos, TRUE, '', TRUE, TRUE);
+
+    AInforme := DarRutaFichero(DarRutaInformes, rptListaDatosContacto);
+    if VarIsNull(AInforme) then
+       raise Exception.Create (('Error Servidor: GenerarInforme, no encuentra informe ' + rptListaDatosContacto));
+
+    frxReport.LoadFromFile(AInforme, True);
+    frxReport.PrepareReport(True);
+
+    frxReport.PreviewPages.SaveToStream(Result);
+
+  finally
+    AStream.Free;
+    dsMaster := Nil;
+    FConnection.RollbackTransaction;
+  end;
+
+
+end;
+
+
+end.

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -42,6 +42,7 @@ type
   public
     function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
+    function GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary;
   end;
 
 implementation
@@ -52,7 +53,7 @@ uses
   uDataModuleServer, uDatabaseUtils, uUsersManager,
   schContactosClient_Intf, uBizVendedoresServer,
   uBizClientesServer, uBizProveedoresServer, uRestriccionesUsuarioUtils,
-  uRptEtiquetasContacto_Server;
+  uRptListadosContactos_Server;
 
 procedure Create_srvContactos(out anInstance : IUnknown);
 begin
@@ -109,11 +110,24 @@ end;
 
 function TsrvContactos.GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
 var
-  AReportGenerator : TRptEtiquetasContacto;
+  AReportGenerator : TRptListadosContactos;
 begin
-  AReportGenerator := TRptEtiquetasContacto.Create(nil);
+  AReportGenerator := TRptListadosContactos.Create(nil);
   try
-    Result := AReportGenerator.GenerarInforme(ListaID);
+    Result := AReportGenerator.GenerarInformeEtiquetas(ListaID);
+  finally
+    FreeAndNIL(AReportGenerator);
+  end;
+end;
+
+function TsrvContactos.GenerarInformeListaDatosContacto(
+  const ListaID: TIntegerArray): Binary;
+var
+  AReportGenerator : TRptListadosContactos;
+begin
+  AReportGenerator := TRptListadosContactos.Create(nil);
+  try
+    Result := AReportGenerator.GenerarInformeListaDatosContacto(ListaID);
   finally
     FreeAndNIL(AReportGenerator);
   end;

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -89,7 +89,7 @@ contains
   uEditorGruposCliente in 'uEditorGruposCliente.pas' {fEditorGruposCliente: TCustomEditor},
   uEditorVendedores in 'uEditorVendedores.pas' {fEditorVendedores: TCustomEditor},
   uEditorGruposProveedor in 'uEditorGruposProveedor.pas' {fEditorGruposProveedor: TCustomEditor},
-  uEditorEtiquetasContactosReport in 'uEditorEtiquetasContactosReport.pas' {fEditorEtiquetasContactosReport: TCustomEditor},
+  uEditorListadosContactosReport in 'uEditorListadosContactosReport.pas' {fEditorListadosContactosPreview: TCustomEditor},
   uViewSubCuentaContacto in 'uViewSubCuentaContacto.pas' {frViewSubCuentaContacto: TCustomView},
   uEditorProcedenciasCliente in 'uEditorProcedenciasCliente.pas' {fEditorProcedenciasCliente: TCustomEditor},
   uEditorElegirVendedores in 'uEditorElegirVendedores.pas' {fEditorElegirVendedores: TCustomEditor},

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -47,40 +47,34 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
+    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
+    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
+    <DCCReference Include="FormasPago_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
+    <DCCReference Include="FormasPago_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
+    <DCCReference Include="TiposIVA_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="TiposIVA_model.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\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
@@ -121,10 +115,6 @@
       <Form>fEditorElegirVendedores</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorEtiquetasContactosReport.pas">
-      <Form>fEditorEtiquetasContactosReport</Form>
-      <DesignClass>TCustomEditor</DesignClass>
-    </DCCReference>
     <DCCReference Include="uEditorGruposCliente.pas">
       <Form>fEditorGruposCliente</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -133,6 +123,10 @@
       <Form>fEditorGruposProveedor</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorListadosContactosReport.pas">
+      <Form>fEditorListadosContactosPreview</Form>
+      <DesignClass>TCustomEditor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorPersonal.pas">
       <Form>fEditorPersonal</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -228,6 +222,12 @@
       <Form>frViewVendedores</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contactos/Views/uContactosViewRegister.pas

@@ -14,7 +14,7 @@ uses
   uEditorCliente, uEditorProveedor,
   uEditorVendedor, uEditorElegirProveedores, uEditorDireccion,
   uEditorElegirVendedores, uEditorGruposCliente, uEditorProcedenciasCliente,
-  uEditorGruposProveedor, uEditorEtiquetasContactosReport,
+  uEditorGruposProveedor, uEditorListadosContactosReport,
   uViewConfiguracionContactos, uEditorPersonal, uEditorElegirPersonaContacto,
   uEditorElegirDireccionEntrega;
 
@@ -39,7 +39,7 @@ begin
   EditorRegistry.RegisterClass(TfEditorProcedenciasCliente, 'EditorProcedenciasCliente');
   EditorRegistry.RegisterClass(TfEditorGruposProveedor, 'EditorGruposProveedor');
 
-  EditorRegistry.RegisterClass(TfEditorEtiquetasContactosPreview, 'EditorEtiquetasContactosPreview');
+  EditorRegistry.RegisterClass(TfEditorListadosContactosPreview, 'EditorListadosContactosPreview');
 
   EditorRegistry.RegisterClass(TfEditorPersonal, 'EditorPersonalContacto');
   EditorRegistry.RegisterClass(TfEditorElegirPersonaContacto, 'EditorElegirPersonaContacto');
@@ -68,7 +68,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorProcedenciasCliente);
   EditorRegistry.UnRegisterClass(TfEditorGruposProveedor);
 
-  EditorRegistry.UnRegisterClass(TfEditorEtiquetasContactosPreview);
+  EditorRegistry.UnRegisterClass(TfEditorListadosContactosPreview);
 
   EditorRegistry.UnRegisterClass(TfEditorPersonal);
   EditorRegistry.UnRegisterClass(TfEditorElegirPersonaContacto);

Source/Modulos/Contactos/Views/uEditorCliente.dfm

@@ -2,18 +2,18 @@ inherited fEditorCliente: TfEditorCliente
   Left = 387
   Top = 297
   Caption = 'Ficha de cliente'
-  ClientHeight = 645
+  ClientHeight = 852
-  ClientWidth = 896
+  ClientWidth = 998
-  ExplicitWidth = 904
+  ExplicitWidth = 1006
-  ExplicitHeight = 679
+  ExplicitHeight = 886
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 896
+    Width = 998
     Caption = 'Ficha de cliente'
     ExplicitWidth = 896
     inherited Image1: TImage
-      Left = 869
+      Left = 971
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -49,7 +49,7 @@ inherited fEditorCliente: TfEditorCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 896
+    Width = 998
     ExplicitWidth = 896
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 446
@@ -59,29 +59,58 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 896
+      ExplicitWidth = 998
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 626
+    Top = 833
-    Width = 896
+    Width = 998
     ExplicitTop = 626
     ExplicitWidth = 896
   end
   inherited pgPaginas: TPageControl
-    Width = 890
+    Width = 992
-    Height = 514
+    Height = 721
-    ExplicitTop = 109
+    ActivePage = pagPersonal
     ExplicitWidth = 890
     ExplicitHeight = 514
     inherited pagGeneral: TTabSheet
       ExplicitWidth = 882
       ExplicitHeight = 486
+      inherited frViewPersonalContacto1: TfrViewPersonalContacto
+        Top = 543
+        Width = 984
+        TabOrder = 1
+        ExplicitTop = 336
+        ExplicitWidth = 882
+        inherited cxGrid: TcxGrid
+          Width = 984
+          ExplicitTop = 25
+          ExplicitWidth = 882
+          ExplicitHeight = 461
+        end
+        inherited ToolBar1: TToolBar
+          Width = 984
+          ExplicitWidth = 882
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 62
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 74
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 67
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 117
+          end
+        end
+      end
       inline frViewCliente1: TfrViewCliente
         Left = 0
         Top = 0
-        Width = 882
+        Width = 984
-        Height = 486
+        Height = 543
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -92,29 +121,29 @@ inherited fEditorCliente: TfEditorCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 882
-        ExplicitHeight = 486
+        ExplicitHeight = 0
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 882
+          Width = 984
-          Height = 486
+          Height = 543
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 882
-          ExplicitHeight = 486
+          ExplicitHeight = 0
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 820
+            Left = 922
             Top = 218
-            ExplicitLeft = 820
+            ExplicitLeft = 922
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 820
+            Left = 922
             Top = 190
-            ExplicitLeft = 820
+            ExplicitLeft = 922
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 820
+            Left = 922
             Top = 162
-            ExplicitLeft = 820
+            ExplicitLeft = 922
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
@@ -148,23 +177,23 @@ inherited fEditorCliente: TfEditorCliente
             Width = 428
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 493
+            Left = 560
             Top = 243
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 493
+            ExplicitLeft = 560
             ExplicitTop = 243
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 672
+            Left = 739
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 57
             ExplicitWidth = 177
             Width = 177
@@ -230,37 +259,37 @@ inherited fEditorCliente: TfEditorCliente
             Width = 428
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 672
+            Left = 739
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 30
             ExplicitWidth = 177
             Width = 177
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 672
+            Left = 739
             Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 84
             ExplicitWidth = 177
             Width = 177
           end
           inherited eFax: TcxDBTextEdit
-            Left = 672
+            Left = 739
             Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 111
             ExplicitWidth = 177
             Width = 177
@@ -276,51 +305,51 @@ inherited fEditorCliente: TfEditorCliente
             Width = 428
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 285
+            Left = 312
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 285
+            ExplicitLeft = 312
             ExplicitTop = 30
             ExplicitWidth = 271
             Width = 271
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 672
+            Left = 739
             Top = 162
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 162
             ExplicitWidth = 148
             Width = 148
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 672
+            Left = 739
             Top = 190
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 190
             ExplicitWidth = 148
             Width = 148
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 672
+            Left = 739
             Top = 217
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 672
+            ExplicitLeft = 739
             ExplicitTop = 217
             ExplicitWidth = 148
             Width = 148
@@ -346,9 +375,9 @@ inherited fEditorCliente: TfEditorCliente
             Width = 428
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 577
+            Left = 644
             Top = 270
-            ExplicitLeft = 577
+            ExplicitLeft = 644
             ExplicitTop = 270
             inherited dxLayoutControl1: TdxLayoutControl
               inherited cbTienda: TcxComboBox
@@ -383,12 +412,12 @@ inherited fEditorCliente: TfEditorCliente
       ExplicitWidth = 882
       ExplicitHeight = 486
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 882
+        Width = 984
-        Height = 486
+        Height = 693
         ExplicitWidth = 882
         ExplicitHeight = 486
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 882
+          Width = 984
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 882
           inherited eEntidad: TcxDBTextEdit
@@ -400,12 +429,12 @@ inherited fEditorCliente: TfEditorCliente
             Width = 345
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 542
+            Left = 596
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 542
+            ExplicitLeft = 596
             ExplicitWidth = 318
             Width = 318
           end
@@ -435,44 +464,20 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     inherited pagPersonal: TTabSheet
+      ExplicitLeft = 4
+      ExplicitTop = 24
       ExplicitWidth = 882
       ExplicitHeight = 486
-      inherited frViewPersonalContacto1: TfrViewPersonalContacto
-        Width = 882
-        Height = 486
-        ExplicitWidth = 882
-        ExplicitHeight = 486
-        inherited cxGrid: TcxGrid
-          Width = 882
-          Height = 461
-          ExplicitWidth = 882
-          ExplicitHeight = 461
-        end
-        inherited ToolBar1: TToolBar
-          Width = 882
-          ExplicitWidth = 882
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 62
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 74
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 67
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 117
-          end
-        end
-      end
     end
     object pagDatosComerciales: TTabSheet
       Caption = 'Datos comerciales'
       ImageIndex = 4
+      ExplicitWidth = 882
+      ExplicitHeight = 486
       inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales
         Left = 0
         Top = 0
-        Width = 882
+        Width = 984
         Height = 193
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
@@ -486,27 +491,27 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 882
         ExplicitHeight = 193
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 882
+          Width = 984
           Height = 193
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 882
           ExplicitHeight = 193
           inherited Label1: TLabel
-            Left = 575
+            Left = 641
             Top = 30
             Width = 277
-            ExplicitLeft = 575
+            ExplicitLeft = 641
             ExplicitTop = 30
             ExplicitWidth = 277
           end
           inherited eDiasVencimiento: TcxDBSpinEdit
-            Left = 647
+            Left = 713
             Top = 62
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 647
+            ExplicitLeft = 713
             ExplicitTop = 62
           end
           inherited cbRegimenIVA: TcxDBComboBox
@@ -540,9 +545,9 @@ inherited fEditorCliente: TfEditorCliente
             Width = 289
           end
           inherited bFormasPago: TButton
-            Left = 415
+            Left = 481
             Top = 57
-            ExplicitLeft = 415
+            ExplicitLeft = 481
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
@@ -556,29 +561,29 @@ inherited fEditorCliente: TfEditorCliente
             Width = 289
           end
           inherited bTiposIVA: TButton
-            Left = 415
+            Left = 481
             Top = 84
-            ExplicitLeft = 415
+            ExplicitLeft = 481
             ExplicitTop = 84
           end
           inherited cxDBSpinEdit1: TcxDBSpinEdit
-            Left = 647
+            Left = 713
             Top = 89
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 647
+            ExplicitLeft = 713
             ExplicitTop = 89
           end
           inherited cxDBSpinEdit2: TcxDBSpinEdit
-            Left = 647
+            Left = 713
             Top = 116
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 647
+            ExplicitLeft = 713
             ExplicitTop = 116
           end
           inherited dxLayoutGroup1: TdxLayoutGroup
@@ -594,11 +599,13 @@ inherited fEditorCliente: TfEditorCliente
     object pagDirecciones: TTabSheet
       Caption = 'Direcciones'
       ImageIndex = 1
+      ExplicitWidth = 882
+      ExplicitHeight = 486
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
-        Width = 882
+        Width = 984
-        Height = 486
+        Height = 693
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -611,10 +618,10 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 882
         ExplicitHeight = 486
         inherited cxGrid: TcxGrid
-          Width = 882
+          Width = 984
-          Height = 461
+          Height = 668
-          ExplicitWidth = 882
+          ExplicitWidth = 984
-          ExplicitHeight = 491
+          ExplicitHeight = 668
           inherited cxGridView: TcxGridDBTableView
             inherited cxGridViewID: TcxGridDBColumn
               SortIndex = 0
@@ -623,20 +630,8 @@ inherited fEditorCliente: TfEditorCliente
           end
         end
         inherited ToolBar1: TToolBar
-          Width = 882
+          Width = 984
-          ExplicitWidth = 882
+          ExplicitWidth = 984
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
         end
       end
     end
@@ -644,11 +639,13 @@ inherited fEditorCliente: TfEditorCliente
       Caption = 'Descuentos'
       ImageIndex = 2
       TabVisible = False
+      ExplicitWidth = 882
+      ExplicitHeight = 486
       inline frViewClienteDescuentos1: TfrViewClienteDescuentos
         Left = 0
         Top = 0
-        Width = 882
+        Width = 984
-        Height = 486
+        Height = 693
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -661,14 +658,14 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 882
         ExplicitHeight = 486
         inherited cxGrid: TcxGrid
-          Width = 882
+          Width = 984
-          Height = 461
+          Height = 668
-          ExplicitWidth = 882
+          ExplicitWidth = 984
-          ExplicitHeight = 491
+          ExplicitHeight = 668
         end
         inherited ToolBar1: TToolBar
-          Width = 882
+          Width = 984
-          ExplicitWidth = 882
+          ExplicitWidth = 984
           inherited ToolButton1: TToolButton
             ExplicitWidth = 62
           end
@@ -687,11 +684,13 @@ inherited fEditorCliente: TfEditorCliente
     object pagContabilidad: TTabSheet
       Caption = 'Contabilidad'
       ImageIndex = 5
+      ExplicitWidth = 882
+      ExplicitHeight = 486
       inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto
         Left = 0
         Top = 0
-        Width = 882
+        Width = 984
-        Height = 486
+        Height = 693
         Align = alClient
         AutoSize = True
         Font.Charset = DEFAULT_CHARSET
@@ -705,13 +704,13 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 882
         ExplicitHeight = 486
         inherited layoutApunte: TdxLayoutControl
-          Width = 882
+          Width = 984
-          Height = 486
+          Height = 693
           ExplicitWidth = 882
           ExplicitHeight = 486
           DesignSize = (
-            882
+            984
-            486)
+            693)
           inherited eRefSubCuenta: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -721,8 +720,8 @@ inherited fEditorCliente: TfEditorCliente
             Width = 441
           end
           inherited BitBtn3: TBitBtn
-            Left = 540
+            Left = 642
-            ExplicitLeft = 540
+            ExplicitLeft = 642
           end
           inherited eSubCuenta: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -733,12 +732,12 @@ inherited fEditorCliente: TfEditorCliente
             Width = 779
           end
           inherited BitBtn1: TBitBtn
-            Left = 656
+            Left = 758
-            ExplicitLeft = 656
+            ExplicitLeft = 758
           end
           inherited BitBtn2: TBitBtn
-            Left = 782
+            Left = 884
-            ExplicitLeft = 782
+            ExplicitLeft = 884
           end
           inherited cbIgnorarContabilidad: TcxDBCheckBox
             DataBinding.DataSource = frViewCliente1.dsContacto
@@ -761,10 +760,10 @@ inherited fEditorCliente: TfEditorCliente
     end
   end
   inherited PnlComentario: TPanel
-    Width = 896
+    Width = 998
     ExplicitWidth = 896
     inherited lbComentario: TLabel
-      Width = 886
+      Width = 988
       Height = 25
     end
   end

Source/Modulos/Contactos/Views/uEditorClientes.dfm

@@ -1931,6 +1931,12 @@ inherited fEditorClientes: TfEditorClientes
       item
         Caption = 'Previsualizar la lista de clientes actual'
         Value = 200
+      end
+      item
+        Caption = 
+          'Previsulalizar lista de clientes seleccionados (SOLO DATOS CONTA' +
+          'CTO)'
+        Value = 300
       end>
     ButtonBar.Buttons = [cbCancel]
     MainIcon = tdiCustom
@@ -2165,7 +2171,7 @@ inherited fEditorClientes: TfEditorClientes
       0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000
       0007C0000007C000000700000007000000070000000700000007C000000FC000
       001F8000003F800000FFF8FFFFFF}
-    Width = 500
+    Width = 600
     Left = 296
     Top = 144
   end
@@ -2242,6 +2248,10 @@ inherited fEditorClientes: TfEditorClientes
       item
         Caption = 'Imprimir la lista de clientes actual'
         Value = 200
+      end
+      item
+        Caption = 'Imprimir lista de clientes seleccionados (SOLO DATOS CONTACTO)'
+        Value = 300
       end>
     ButtonBar.Buttons = [cbCancel]
     MainIcon = tdiCustom
@@ -2476,7 +2486,7 @@ inherited fEditorClientes: TfEditorClientes
       0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000
       0007C0000007C000000700000007000000070000000700000007C000000FC000
       001F8000003F800000FFF8FFFFFF}
-    Width = 500
+    Width = 600
     Left = 328
     Top = 144
   end

Source/Modulos/Contactos/Views/uEditorClientes.pas

@@ -148,7 +148,7 @@ begin
                     AClientes := (Contactos as IBizCliente);
 
                   if Assigned(AClientes) then
-                     (FController as IClientesController).Print(AClientes, AllItems);
+                     (FController as IClientesController).PrintInformeEtiquetas(AClientes, AllItems);
                 end;
       end;
     end;
@@ -197,8 +197,21 @@ begin
                     AClientes := (Contactos as IBizCliente);
 
                   if Assigned(AClientes) then
-                     (FController as IClientesController).Preview(AClientes, AllItems);
+                     (FController as IClientesController).PreviewInformeEtiquetas(AClientes, AllItems);
                 end;
+        300   : begin   // Elemento Seleccionado
+                  if AllItems then
+                  begin
+                    SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Contactos as ISeleccionable).SelectedRecords);
+                    AClientes := (Controller as IClientesController).ExtraerSeleccionados(Contactos) as IBizCliente;
+                  end
+                  else
+                    AClientes := (Contactos as IBizCliente);
+
+                  if Assigned(AClientes) then
+                     (FController as IClientesController).PreviewInformeListaDatosContacto(AClientes, AllItems);
+                end;
+
       end;
     end;
   end;

Source/Modulos/Contactos/Views/uEditorContacto.dfm

@@ -4,24 +4,25 @@ inherited fEditorContacto: TfEditorContacto
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   Caption = 'Ficha de contacto'
-  ClientWidth = 632
+  ClientHeight = 739
+  ClientWidth = 949
   Scaled = False
-  ExplicitWidth = 640
+  ExplicitWidth = 957
-  ExplicitHeight = 240
+  ExplicitHeight = 773
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 632
+    Width = 949
     Caption = 'Contacto'
-    ExplicitWidth = 632
+    ExplicitWidth = 949
     inherited Image1: TImage
-      Left = 605
+      Left = 922
       ExplicitLeft = 607
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 632
+    Width = 949
-    ExplicitWidth = 632
+    ExplicitWidth = 949
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 330
       inherited TBXItem2: TTBXItem
@@ -39,7 +40,7 @@ inherited fEditorContacto: TfEditorContacto
     end
     inherited tbxMenu: TTBXToolbar
       DockPos = 0
-      ExplicitWidth = 632
+      ExplicitWidth = 949
       inherited TBXSubmenuItem4: TTBXSubmenuItem
         inherited TBXItem8: TTBXItem
           Visible = False
@@ -74,24 +75,54 @@ inherited fEditorContacto: TfEditorContacto
     end
   end
   inherited StatusBar: TJvStatusBar
-    Width = 632
+    Top = 720
+    Width = 949
     Panels = <
       item
         Width = 200
       end>
-    ExplicitWidth = 632
+    ExplicitTop = 720
+    ExplicitWidth = 949
   end
   inherited pgPaginas: TPageControl
-    Width = 626
+    Width = 943
+    Height = 608
     ActivePage = pagPersonal
-    ExplicitTop = 79
+    ExplicitWidth = 943
-    ExplicitWidth = 626
+    ExplicitHeight = 608
-    ExplicitHeight = 358
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 618
+      ExplicitWidth = 935
-      ExplicitHeight = 330
+      ExplicitHeight = 580
+      inline frViewPersonalContacto1: TfrViewPersonalContacto
+        Left = 0
+        Top = 430
+        Width = 935
+        Height = 150
+        Align = alBottom
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 0
+        ReadOnly = False
+        ExplicitTop = 430
+        ExplicitWidth = 935
+        ExplicitHeight = 150
+        inherited cxGrid: TcxGrid
+          Width = 935
+          Height = 125
+          ExplicitWidth = 935
+          ExplicitHeight = 125
+        end
+        inherited ToolBar1: TToolBar
+          Width = 935
+          ExplicitWidth = 935
+        end
+      end
     end
     object pagDatosBancarios: TTabSheet
       Caption = 'Datos bancarios'
@@ -99,8 +130,8 @@ inherited fEditorContacto: TfEditorContacto
       inline frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
         Left = 0
         Top = 0
-        Width = 618
+        Width = 935
-        Height = 300
+        Height = 580
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -110,12 +141,12 @@ inherited fEditorContacto: TfEditorContacto
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 618
+        ExplicitWidth = 935
-        ExplicitHeight = 300
+        ExplicitHeight = 580
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 618
+          Width = 935
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 618
+          ExplicitWidth = 935
           inherited eEntidad: TcxDBTextEdit
             Top = 57
             Style.LookAndFeel.SkinName = ''
@@ -127,13 +158,13 @@ inherited fEditorContacto: TfEditorContacto
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 403
+            Left = 570
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 403
+            ExplicitLeft = 570
             ExplicitTop = 57
             ExplicitWidth = 112
             Width = 112
@@ -170,52 +201,32 @@ inherited fEditorContacto: TfEditorContacto
       end
     end
     object pagPersonal: TTabSheet
-      Caption = 'Contactos'
+      Caption = 'Observaciones'
       ImageIndex = 2
-      inline frViewPersonalContacto1: TfrViewPersonalContacto
+      object memObservaciones22: TcxDBMemo
         Left = 0
         Top = 0
-        Width = 618
-        Height = 300
         Align = alClient
-        Font.Charset = DEFAULT_CHARSET
+        DataBinding.DataField = 'NOTAS'
-        Font.Color = clWindowText
+        DataBinding.DataSource = dsDataTable
-        Font.Height = -11
+        Properties.ScrollBars = ssVertical
-        Font.Name = 'Tahoma'
+        Style.LookAndFeel.NativeStyle = True
-        Font.Style = []
+        StyleDisabled.LookAndFeel.NativeStyle = True
-        ParentFont = False
+        StyleFocused.LookAndFeel.NativeStyle = True
+        StyleHot.LookAndFeel.NativeStyle = True
         TabOrder = 0
-        ReadOnly = False
+        Height = 580
-        ExplicitWidth = 618
+        Width = 935
-        ExplicitHeight = 300
-        inherited cxGrid: TcxGrid
-          Width = 618
-          Height = 275
-          ExplicitWidth = 618
-          ExplicitHeight = 305
-        end
-        inherited ToolBar1: TToolBar
-          Width = 618
-          ExplicitWidth = 618
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
-        end
       end
     end
   end
   inherited PnlComentario: TPanel
-    Width = 632
+    Width = 949
-    ExplicitWidth = 632
+    ExplicitWidth = 949
+    inherited lbComentario: TLabel
+      Width = 939
+      Height = 25
+    end
   end
   inherited dsDataTable: TDADataSource [5]
     Left = 168

Source/Modulos/Contactos/Views/uEditorContacto.pas

@@ -14,7 +14,8 @@ uses
 
   uIEditorContacto, uContactosController, TBXStatusBars, JvExComCtrls,
   JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel,
-  uDAInterfaces, uViewPersonalContacto, uViewDetallesGenerico;
+  uDAInterfaces, uViewPersonalContacto, uViewDetallesGenerico, cxControls,
+  cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit;
 
 type
   TfEditorContacto = class(TfEditorDBItem, IEditorContacto)
@@ -24,6 +25,7 @@ type
     dxLayoutOfficeLookAndFeel: TdxLayoutOfficeLookAndFeel;
     pagPersonal: TTabSheet;
     frViewPersonalContacto1: TfrViewPersonalContacto;
+    memObservaciones22: TcxDBMemo;
     procedure FormShow(Sender: TObject);
     procedure dsDataTableDataChange(Sender: TObject; Field: TField);
   protected
@@ -55,7 +57,7 @@ implementation
 {$R *.dfm}
 
 uses
-  cxControls, uFactuGES_App, uCustomEditor, uDataModuleContactos,
+  uFactuGES_App, uCustomEditor, uDataModuleContactos,
   uDMBase, uDataModuleUsuarios;
 
 {

Source/Modulos/Contactos/Views/uEditorContactos.dfm

@@ -2,6 +2,8 @@ inherited fEditorContactos: TfEditorContactos
   Left = 285
   Top = 448
   Caption = 'Lista de contactos'
+  ExplicitWidth = 320
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorListadosContactosReport.dfm

@@ -1,6 +1,5 @@
-inherited fEditorEtiquetasContactosPreview: TfEditorEtiquetasContactosPreview
+inherited fEditorListadosContactosPreview: TfEditorListadosContactosPreview
-  Caption = 'Previsualizar la factura'
+  Caption = 'Previsualizar informe'
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorListadosContactosReport.pas

@@ -1,4 +1,4 @@
-unit uEditorEtiquetasContactosReport;
+unit uEditorListadosContactosReport;
 
 interface
 
@@ -9,12 +9,12 @@ uses
   frxBarcode, JvAppStorage, JvAppRegistryStorage, JvComponentBase,
   JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
   TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage,
-  ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorEtiquetasContactosPreview,
+  ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorListadosContactosPreview,
   JvExComCtrls, JvStatusBar, frxExportText, frxExportRTF, frxExportMail,
-  frxExportXLS;
+  frxExportXLS, frxExportCSV;
 
 type
-  TfEditorEtiquetasContactosPreview = class(TfEditorPreview, IEditorEtiquetasContactosPreview)
+  TfEditorListadosContactosPreview = class(TfEditorPreview, IEditorListadosContactosPreview)
   private
     { Private declarations }
   public

Source/Modulos/Contactos/Views/uEditorProveedor.dfm

@@ -1,16 +1,16 @@
 inherited fEditorProveedor: TfEditorProveedor
   Caption = 'fEditorProveedor'
-  ClientHeight = 590
+  ClientHeight = 820
-  ClientWidth = 648
+  ClientWidth = 945
-  ExplicitWidth = 656
+  ExplicitWidth = 953
-  ExplicitHeight = 624
+  ExplicitHeight = 854
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 648
+    Width = 945
     ExplicitWidth = 648
     inherited Image1: TImage
-      Left = 621
+      Left = 918
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -46,33 +46,60 @@ inherited fEditorProveedor: TfEditorProveedor
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 648
+    Width = 945
     ExplicitWidth = 648
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 648
+      ExplicitWidth = 945
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 571
+    Top = 801
-    Width = 648
+    Width = 945
     ExplicitTop = 571
     ExplicitWidth = 648
   end
   inherited pgPaginas: TPageControl
-    Width = 642
+    Width = 939
-    Height = 459
+    Height = 689
-    ActivePage = pagGeneral
-    ExplicitTop = 109
     ExplicitWidth = 642
     ExplicitHeight = 459
     inherited pagGeneral: TTabSheet
       ExplicitWidth = 634
       ExplicitHeight = 431
+      inherited frViewPersonalContacto1: TfrViewPersonalContacto
+        Top = 511
+        Width = 931
+        TabOrder = 1
+        ExplicitTop = 281
+        ExplicitWidth = 634
+        inherited cxGrid: TcxGrid
+          Width = 931
+          ExplicitTop = 25
+          ExplicitWidth = 634
+          ExplicitHeight = 406
+        end
+        inherited ToolBar1: TToolBar
+          Width = 931
+          ExplicitWidth = 634
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 62
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 74
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 67
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 117
+          end
+        end
+      end
       inline frViewProveedor1: TfrViewProveedor
         Left = 0
         Top = 0
-        Width = 634
+        Width = 931
-        Height = 431
+        Height = 511
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -83,29 +110,29 @@ inherited fEditorProveedor: TfEditorProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 634
-        ExplicitHeight = 431
+        ExplicitHeight = 0
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 634
+          Width = 931
-          Height = 431
+          Height = 511
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 634
-          ExplicitHeight = 431
+          ExplicitHeight = 0
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 572
+            Left = 886
             Top = 218
-            ExplicitLeft = 572
+            ExplicitLeft = 886
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 572
+            Left = 886
             Top = 190
-            ExplicitLeft = 572
+            ExplicitLeft = 886
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 572
+            Left = 886
             Top = 162
-            ExplicitLeft = 572
+            ExplicitLeft = 886
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
@@ -139,23 +166,23 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 267
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 310
+            Left = 518
             Top = 243
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 310
+            ExplicitLeft = 518
             ExplicitTop = 243
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 489
+            Left = 697
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 57
             ExplicitWidth = 172
             Width = 172
@@ -191,37 +218,37 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 221
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 489
+            Left = 697
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 30
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 489
+            Left = 697
             Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 84
             ExplicitWidth = 172
             Width = 172
           end
           inherited eFax: TcxDBTextEdit
-            Left = 489
+            Left = 697
             Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 111
             ExplicitWidth = 172
             Width = 172
@@ -237,26 +264,26 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 263
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 216
+            Left = 303
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 216
+            ExplicitLeft = 303
             ExplicitTop = 30
             ExplicitWidth = 254
             Width = 254
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 489
+            Left = 697
             Top = 162
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
@@ -268,26 +295,26 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 192
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 489
+            Left = 697
             Top = 190
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 190
             ExplicitWidth = 165
             Width = 165
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 489
+            Left = 697
             Top = 217
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 489
+            ExplicitLeft = 697
             ExplicitTop = 217
             ExplicitWidth = 165
             Width = 165
@@ -313,10 +340,10 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 253
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 394
+            Left = 602
             Top = 270
             Width = 290
-            ExplicitLeft = 394
+            ExplicitLeft = 602
             ExplicitTop = 270
             ExplicitWidth = 290
             inherited dxLayoutControl1: TdxLayoutControl
@@ -352,12 +379,12 @@ inherited fEditorProveedor: TfEditorProveedor
       ExplicitWidth = 634
       ExplicitHeight = 431
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 634
+        Width = 931
-        Height = 431
+        Height = 661
         ExplicitWidth = 634
         ExplicitHeight = 431
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 634
+          Width = 931
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 634
           inherited eEntidad: TcxDBTextEdit
@@ -369,12 +396,12 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 323
+            Left = 435
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 323
+            ExplicitLeft = 435
             ExplicitWidth = 270
             Width = 270
           end
@@ -404,44 +431,20 @@ inherited fEditorProveedor: TfEditorProveedor
       end
     end
     inherited pagPersonal: TTabSheet
-      ExplicitWidth = 634
+      ExplicitLeft = 4
-      ExplicitHeight = 431
+      ExplicitTop = 24
-      inherited frViewPersonalContacto1: TfrViewPersonalContacto
+      ExplicitWidth = 931
-        Width = 634
+      ExplicitHeight = 661
-        Height = 431
-        ExplicitWidth = 634
-        ExplicitHeight = 431
-        inherited cxGrid: TcxGrid
-          Width = 634
-          Height = 406
-          ExplicitWidth = 634
-          ExplicitHeight = 406
-        end
-        inherited ToolBar1: TToolBar
-          Width = 634
-          ExplicitWidth = 634
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 62
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 74
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 67
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 117
-          end
-        end
-      end
     end
     object pagDatosComerciales: TTabSheet
       Caption = 'Datos comerciales'
       ImageIndex = 2
+      ExplicitWidth = 634
+      ExplicitHeight = 431
       inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales
         Left = 0
         Top = 0
-        Width = 634
+        Width = 931
         Height = 225
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
@@ -455,7 +458,7 @@ inherited fEditorProveedor: TfEditorProveedor
         ExplicitWidth = 634
         ExplicitHeight = 225
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 634
+          Width = 931
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 634
           inherited Label1: TLabel
@@ -465,10 +468,10 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 190
           end
           inherited Label2: TLabel
-            Left = 439
+            Left = 641
             Top = 30
             Width = 149
-            ExplicitLeft = 439
+            ExplicitLeft = 641
             ExplicitTop = 30
             ExplicitWidth = 149
           end
@@ -493,9 +496,9 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 121
           end
           inherited bFormasPago: TButton
-            Left = 279
+            Left = 481
             Top = 57
-            ExplicitLeft = 279
+            ExplicitLeft = 481
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
@@ -509,9 +512,9 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 121
           end
           inherited bTiposIVA: TButton
-            Left = 279
+            Left = 481
             Top = 84
-            ExplicitLeft = 279
+            ExplicitLeft = 481
             ExplicitTop = 84
           end
           inherited eDescuento: TcxDBSpinEdit
@@ -525,33 +528,33 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 73
           end
           inherited eDiasVencimiento1: TcxDBSpinEdit
-            Left = 511
+            Left = 713
             Top = 75
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 511
+            ExplicitLeft = 713
             ExplicitTop = 75
           end
           inherited eDiasVencimiento2: TcxDBSpinEdit
-            Left = 511
+            Left = 713
             Top = 102
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 511
+            ExplicitLeft = 713
             ExplicitTop = 102
           end
           inherited eDiasVencimiento3: TcxDBSpinEdit
-            Left = 511
+            Left = 713
             Top = 129
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 511
+            ExplicitLeft = 713
             ExplicitTop = 129
           end
         end
@@ -560,11 +563,13 @@ inherited fEditorProveedor: TfEditorProveedor
     object pagDirecciones: TTabSheet
       Caption = 'Direcciones'
       ImageIndex = 3
+      ExplicitWidth = 634
+      ExplicitHeight = 431
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
-        Width = 634
+        Width = 931
-        Height = 431
+        Height = 661
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -577,13 +582,13 @@ inherited fEditorProveedor: TfEditorProveedor
         ExplicitWidth = 634
         ExplicitHeight = 431
         inherited cxGrid: TcxGrid
-          Width = 634
+          Width = 931
-          Height = 406
+          Height = 636
           ExplicitWidth = 634
           ExplicitHeight = 436
         end
         inherited ToolBar1: TToolBar
-          Width = 634
+          Width = 931
           ExplicitWidth = 634
           inherited ToolButton1: TToolButton
             ExplicitWidth = 113
@@ -603,11 +608,13 @@ inherited fEditorProveedor: TfEditorProveedor
     object PagContabilidad: TTabSheet
       Caption = 'Contabilidad'
       ImageIndex = 4
+      ExplicitWidth = 634
+      ExplicitHeight = 431
       inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto
         Left = 0
         Top = 0
-        Width = 634
+        Width = 931
-        Height = 431
+        Height = 661
         Align = alClient
         AutoSize = True
         Font.Charset = DEFAULT_CHARSET
@@ -621,8 +628,8 @@ inherited fEditorProveedor: TfEditorProveedor
         ExplicitWidth = 634
         ExplicitHeight = 431
         inherited layoutApunte: TdxLayoutControl
-          Width = 634
+          Width = 931
-          Height = 431
+          Height = 661
           ExplicitWidth = 634
           ExplicitHeight = 431
           inherited eRefSubCuenta: TcxDBTextEdit
@@ -634,8 +641,8 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 346
           end
           inherited BitBtn3: TBitBtn
-            Left = 292
+            Left = 589
-            ExplicitLeft = 292
+            ExplicitLeft = 589
           end
           inherited eSubCuenta: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -646,12 +653,12 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 265
           end
           inherited BitBtn1: TBitBtn
-            Left = 408
+            Left = 705
-            ExplicitLeft = 408
+            ExplicitLeft = 705
           end
           inherited BitBtn2: TBitBtn
-            Left = 534
+            Left = 831
-            ExplicitLeft = 534
+            ExplicitLeft = 831
           end
           inherited cbIgnorarContabilidad: TcxDBCheckBox
             DataBinding.DataSource = frViewProveedor1.dsContacto
@@ -671,10 +678,10 @@ inherited fEditorProveedor: TfEditorProveedor
     end
   end
   inherited PnlComentario: TPanel
-    Width = 648
+    Width = 945
     ExplicitWidth = 648
     inherited lbComentario: TLabel
-      Width = 638
+      Width = 935
       Height = 25
     end
   end

Source/Modulos/Contactos/Views/uEditorVendedor.dfm

@@ -1,16 +1,16 @@
 inherited fEditorVendedor: TfEditorVendedor
   Caption = 'fEditorVendedor'
-  ClientHeight = 576
+  ClientHeight = 792
-  ClientWidth = 676
+  ClientWidth = 889
-  ExplicitWidth = 684
+  ExplicitWidth = 897
-  ExplicitHeight = 610
+  ExplicitHeight = 826
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 676
+    Width = 889
     ExplicitWidth = 676
     inherited Image1: TImage
-      Left = 649
+      Left = 862
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -51,33 +51,61 @@ inherited fEditorVendedor: TfEditorVendedor
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 676
+    Width = 889
     ExplicitWidth = 676
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 676
+      ExplicitWidth = 889
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 557
+    Top = 773
-    Width = 676
+    Width = 889
     ExplicitTop = 557
     ExplicitWidth = 676
   end
   inherited pgPaginas: TPageControl
-    Width = 670
+    Width = 883
-    Height = 445
+    Height = 661
-    ActivePage = pagGeneral
-    ExplicitTop = 109
     ExplicitWidth = 670
     ExplicitHeight = 445
     inherited pagGeneral: TTabSheet
       ExplicitWidth = 662
       ExplicitHeight = 417
+      inherited frViewPersonalContacto1: TfrViewPersonalContacto
+        Top = 483
+        Width = 875
+        TabOrder = 1
+        Visible = False
+        ExplicitTop = 267
+        ExplicitWidth = 662
+        inherited cxGrid: TcxGrid
+          Width = 875
+          ExplicitTop = 25
+          ExplicitWidth = 662
+          ExplicitHeight = 392
+        end
+        inherited ToolBar1: TToolBar
+          Width = 875
+          ExplicitWidth = 662
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 62
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 74
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 67
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 117
+          end
+        end
+      end
       inline frViewVendedor1: TfrViewVendedor
         Left = 0
         Top = 0
-        Width = 662
+        Width = 875
-        Height = 417
+        Height = 483
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -88,106 +116,150 @@ inherited fEditorVendedor: TfEditorVendedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 662
-        ExplicitHeight = 417
+        ExplicitHeight = 0
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 662
+          Width = 875
-          Height = 417
+          Height = 483
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 662
-          ExplicitHeight = 417
+          ExplicitHeight = 0
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 617
+            Left = 830
             Top = 218
-            ExplicitLeft = 617
+            ExplicitLeft = 830
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 617
+            Left = 830
             Top = 190
-            ExplicitLeft = 617
+            ExplicitLeft = 830
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 617
+            Left = 830
             Top = 162
-            ExplicitLeft = 617
+            ExplicitLeft = 830
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
             Top = 162
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 162
             ExplicitWidth = 174
             Width = 174
           end
           inherited cbProvincia: TcxDBComboBox
             Top = 189
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 189
             ExplicitWidth = 144
             Width = 144
           end
           inherited cbPoblacion: TcxDBComboBox
             Top = 216
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 216
             ExplicitWidth = 236
             Width = 236
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 251
+            Left = 355
             Top = 189
-            ExplicitLeft = 251
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 355
             ExplicitTop = 189
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 430
+            Left = 534
             Top = 57
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 57
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 430
+            Left = 534
             Top = 30
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 30
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 430
+            Left = 534
             Top = 84
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 84
             ExplicitWidth = 172
             Width = 172
           end
           inherited eFax: TcxDBTextEdit
-            Left = 430
+            Left = 534
             Top = 111
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 111
             ExplicitWidth = 172
             Width = 172
           end
           inherited eNombre: TcxDBTextEdit
             Top = 57
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 57
             ExplicitWidth = 263
             Width = 263
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 186
+            Left = 235
             Top = 30
-            ExplicitLeft = 186
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 235
             ExplicitTop = 30
             ExplicitWidth = 194
             Width = 194
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 430
+            Left = 534
             Top = 162
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
@@ -206,45 +278,65 @@ inherited fEditorVendedor: TfEditorVendedor
             Width = 65
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 430
+            Left = 534
             Top = 190
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 190
             ExplicitWidth = 165
             Width = 165
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 430
+            Left = 534
             Top = 217
-            ExplicitLeft = 430
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 534
             ExplicitTop = 217
             ExplicitWidth = 165
             Width = 165
           end
           inherited eReferencia: TcxDBTextEdit
             Top = 30
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 30
             ExplicitWidth = 97
             Width = 97
           end
           inherited ePersonaContacto: TcxDBTextEdit
             Top = 243
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 243
             ExplicitWidth = 256
             Width = 256
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 335
+            Left = 439
             Top = 270
             Width = 451
-            ExplicitLeft = 335
+            ExplicitLeft = 439
             ExplicitTop = 270
             ExplicitWidth = 451
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 451
               ExplicitWidth = 451
               inherited cbTienda: TcxComboBox
+                Style.LookAndFeel.SkinName = ''
+                StyleDisabled.LookAndFeel.SkinName = ''
+                StyleFocused.LookAndFeel.SkinName = ''
+                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 376
                 Width = 376
               end
@@ -259,8 +351,6 @@ inherited fEditorVendedor: TfEditorVendedor
             ExplicitHeight = 228
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewVendedor1.dsContacto
-              ExplicitWidth = 618
-              ExplicitHeight = 60
               Height = 228
               Width = 521
             end
@@ -276,29 +366,51 @@ inherited fEditorVendedor: TfEditorVendedor
       ExplicitWidth = 662
       ExplicitHeight = 417
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 662
+        Width = 875
-        Height = 417
+        Height = 633
         ExplicitWidth = 662
         ExplicitHeight = 417
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 662
+          Width = 875
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 662
           inherited eEntidad: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 114
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 426
+            Left = 539
-            ExplicitLeft = 426
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 539
             ExplicitWidth = 112
             Width = 112
           end
           inherited eCuenta: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 194
             Width = 194
           end
+          inherited eDC: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
           inherited eTitular: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 194
             Width = 194
           end
@@ -309,41 +421,13 @@ inherited fEditorVendedor: TfEditorVendedor
       TabVisible = False
       ExplicitWidth = 662
       ExplicitHeight = 417
-      inherited frViewPersonalContacto1: TfrViewPersonalContacto
-        Width = 662
-        Height = 417
-        ExplicitWidth = 662
-        ExplicitHeight = 417
-        inherited cxGrid: TcxGrid
-          Width = 662
-          Height = 392
-          ExplicitWidth = 662
-          ExplicitHeight = 422
-        end
-        inherited ToolBar1: TToolBar
-          Width = 662
-          ExplicitWidth = 662
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 62
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 74
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 67
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 117
-          end
-        end
-      end
     end
   end
   inherited PnlComentario: TPanel
-    Width = 676
+    Width = 889
     ExplicitWidth = 676
     inherited lbComentario: TLabel
-      Width = 666
+      Width = 879
       Height = 25
     end
   end

Source/Modulos/Contactos/Views/uViewContacto.dfm

@@ -473,6 +473,7 @@ inherited frViewContacto: TfrViewContacto
       ExplicitLeft = 312
       ExplicitTop = 280
       inherited dxLayoutControl1: TdxLayoutControl
+        ExplicitWidth = 290
         inherited cbTienda: TcxComboBox
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
@@ -502,7 +503,8 @@ inherited frViewContacto: TfrViewContacto
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'NOTAS'
         DataBinding.DataSource = dsContacto
-        ExplicitHeight = 228
+        ExplicitWidth = 580
+        ExplicitHeight = 163
         Height = 228
       end
     end
@@ -714,6 +716,7 @@ inherited frViewContacto: TfrViewContacto
         AutoAligns = [aaHorizontal]
         AlignVert = avClient
         Caption = 'Observaciones'
+        Visible = False
         object dxLayoutControlContactoItem8: TdxLayoutItem
           AutoAligns = []
           AlignHorz = ahClient

Source/Servicios/FactuGES.RODL

@@ -17,6 +17,14 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="GenerarInformeListaDatosContacto" UID="{3D152A15-D747-4CF0-8F37-0868CE8114DF}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 <Operation Name="DarTiendaDeUsuario" UID="{B5D87F60-DA79-4720-B04A-06FFCBACD645}">
 <Parameters>
 <Parameter Name="Result" DataType="Integer" Flag="Result">

Source/Servicios/FactuGES_Intf.pas

@@ -207,6 +207,7 @@ type
   IsrvContactos = interface(IDataAbstractService)
     ['{28CCDC07-A3A4-4917-89B4-64423DC70C9D}']
     function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
+    function GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
   end;
 
@@ -221,6 +222,7 @@ type
     function __GetInterfaceName:string; override;
 
     function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
+    function GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary;
     function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
   end;
 
@@ -1305,6 +1307,23 @@ begin
   end
 end;
 
+function TsrvContactos_Proxy.GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeListaDatosContacto');
+    __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 function TsrvContactos_Proxy.DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer;
 begin
   try

Source/Servicios/FactuGES_Invk.pas

@@ -27,6 +27,7 @@ type
     constructor Create; override;
   published
     procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarInformeListaDatosContacto(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;
 
@@ -369,6 +370,36 @@ begin
   end;
 end;
 
+procedure TsrvContactos_Invoker.Invoke_GenerarInformeListaDatosContacto(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInformeListaDatosContacto(const ListaID: TIntegerArray): Binary; }
+var
+  ListaID: FactuGES_Intf.TIntegerArray;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaID := nil;
+  lResult := nil;
+  try
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+
+    lResult := (__Instance as IsrvContactos).GenerarInformeListaDatosContacto(ListaID);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContactos', 'GenerarInformeListaDatosContactoResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(ListaID);
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 procedure TsrvContactos_Invoker.Invoke_DarTiendaDeUsuario(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarTiendaDeUsuario(const ID_Empresa: Integer; const ID_Usuario: Integer): Integer; }
 var

Source/Servidor/FactuGES_Server.dpr

@@ -76,7 +76,6 @@ uses
   schUnidadesMedidaClient_Intf in '..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas',
   schUnidadesMedidaServer_Intf in '..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas',
   uBizPagosProveedorServer in '..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas',
-  uRptEtiquetasContacto_Server in '..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas' {RptEtiquetasContacto: TDataModule},
   uRptFacturasCliente_Server in '..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas' {RptFacturasCliente: TDataModule},
   uRptRecibosCliente_Server in '..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas' {RptRecibosCliente: TDataModule},
   uBizRecibosClienteServer in '..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas',
@@ -137,7 +136,8 @@ uses
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
   schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas';
+  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
+  uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule};
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -1,295 +1,294 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+	<PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
+		<MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
+		<DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
+		<DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-  </PropertyGroup>
+	</PropertyGroup>
-  <ProjectExtensions>
+	<ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
+		<Borland.ProjectType/>
-    <BorlandProject>
+		<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">6</VersionInfo><VersionInfo Name="Release">2</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.6.2.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.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 23 de enero de 2015 11:22</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">6</VersionInfo><VersionInfo Name="Release">3</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.6.3.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.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 23 de enero de 2015 11:51</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
+						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
+					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
-  </ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+	<ItemGroup>
-  <ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
-    <DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
-      <MainSource>MainSource</MainSource>
+		</DelphiCompile>
-    </DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas"/>
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas" />
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
+			<Form>srvEjercicios</Form>
-      <Form>srvEjercicios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
-      <Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
-      <DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones</Form>
-      <Form>srvProvinciasPoblaciones</Form>
+			<DesignClass>TRORemoteDataModule</DesignClass>
-      <DesignClass>TRORemoteDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+			<Form>srvAlbaranesCliente</Form>
-      <Form>srvAlbaranesCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
-      <Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
-      <Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
-      <DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
-    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+			<Form>RptComisiones</Form>
-      <Form>RptComisiones</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+			<Form>srvComisiones</Form>
-      <Form>srvComisiones</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas"/>
-    <DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas" />
+		<DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
-    <DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
+			<Form>srvContabilidad</Form>
-      <Form>srvContabilidad</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas">
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptListadosContactos</Form>
-      <Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
-      <Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
-      <DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
-    <DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
+			<Form>RptContratosCliente</Form>
-      <Form>RptContratosCliente</Form>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
+			<Form>srvContratosCliente</Form>
-      <Form>srvContratosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<Form>RptFacturasCliente</Form>
-      <Form>RptFacturasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+			<Form>srvFacturasCliente</Form>
-      <Form>srvFacturasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<Form>RptFacturasProveedor</Form>
-      <Form>RptFacturasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
-      <Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<Form>srvGestorDocumentos</Form>
-      <Form>srvGestorDocumentos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+			<Form>srvGestorInformes</Form>
-      <Form>srvGestorInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
-      <Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
-      <Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+			<Form>srvPedidosProveedor</Form>
-      <Form>srvPedidosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
-    <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\schPresupuestosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
-      <Form>RptPresupuestosCliente</Form>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+			<Form>srvPresupuestosCliente</Form>
-      <Form>srvPresupuestosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<Form>RptRecibosCliente</Form>
-      <Form>RptRecibosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+			<Form>srvRecibosCliente</Form>
-      <Form>srvRecibosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<Form>RptRecibosProveedor</Form>
-      <Form>RptRecibosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
-      <Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
-      <Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
-      <Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
-      <Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
-      <Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
-      <Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
-      <DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
-    <DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
-      <Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
-      <DesignClass>TFrame</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
-      <Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
-      <DesignClass>TFrame</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
-      <Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
-      <DesignClass>TForm</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
-      <Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
-      <DesignClass>TFrame</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
-    <DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
-      <Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
-      <DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
-    <DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
-      <Form>fAcercaDe</Form>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
-    <DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
-      <Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
-      <DesignClass>TDataModule</DesignClass>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
-    <DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
-      <Form>fServerForm</Form>
+		</DCCReference>
-    </DCCReference>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
-    <DCCReference Include="Utiles\RegExpr.pas" />
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
+	</ItemGroup>
-  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,1,0
+FILEVERSION 2,6,3,0
-PRODUCTVERSION 2,6,1,0
+PRODUCTVERSION 2,6,3,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.1.0\0"
+              VALUE "FileVersion", "2.6.3.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.1.0\0"
+              VALUE "ProductVersion", "2.6.3.0\0"
-              VALUE "CompileDate", "viernes, 23 de enero de 2015 11:22\0"
+              VALUE "CompileDate", "lunes, 02 de febrero de 2015 16:34\0"
          END
     END
     BLOCK "VarFileInfo"