Version 4.7.0 Genera PDFs con firma digital y primera aproximación a distribuidores

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@193 93f398dd-4eb6-7a46-baf6-13f46f578da2

Source/Base/Utiles/uSistemaFunc.pas

@@ -48,8 +48,10 @@ function GetSpecialFolderPath(folder : integer) : string;
 function PreguntarRuta(const ATitulo: String; const AComentario: String; var ARuta: String): Boolean;
 function PreguntarFicheroWordExportar (var Fichero : String) : Boolean;
 function PreguntarFicheroExcelExportar (var Fichero : String) : Boolean;
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
 function EscapeIllegalChars(AFileName: string): string;
 function FindFile(const filespec: TFileName; attributes: integer = faReadOnly Or faHidden Or faSysFile Or faArchive): TStringList;
+function ExecAndWait(sCommandLine: string): Boolean;
 
 //Directorios informes: EMPRESA, TIENDA, IDIOMA
 function DarRutaFichero(const ARutaIni: String; const AFichero: String; const ADirectorio1: String = ''; const ADirectorio2: String = ''; const ADirectorio3: String = ''): Variant;
@@ -68,6 +70,36 @@ uses
   cxLookAndFeels, uStringsUtils;
 
 
+function ExecAndWait(sCommandLine: string): Boolean;
+var
+  dwExitCode: DWORD;
+  tpiProcess: TProcessInformation;
+  tsiStartup: TStartupInfo;
+begin
+  Result := False;
+  FillChar(tsiStartup, SizeOf(TStartupInfo), 0);
+  tsiStartup.cb := SizeOf(TStartupInfo);
+  if CreateProcess(nil, PChar(sCommandLine), nil, nil, False, 0,
+    nil, nil, tsiStartup, tpiProcess) then
+  begin
+    if WAIT_OBJECT_0 = WaitForSingleObject(tpiProcess.hProcess, INFINITE) then
+    begin
+      if GetExitCodeProcess(tpiProcess.hProcess, dwExitCode) then
+      begin
+        if dwExitCode = 0 then
+          Result := True
+        else
+          SetLastError(dwExitCode + $2000);
+      end;
+    end;
+    dwExitCode := GetLastError;
+    CloseHandle(tpiProcess.hProcess);
+    CloseHandle(tpiProcess.hThread);
+    SetLastError(dwExitCode);
+  end;
+end;
+
+
 function GetSpecialFolderPath(folder : integer) : string;
 const
   SHGFP_TYPE_CURRENT = 0;
@@ -254,6 +286,27 @@ begin
   end;
 end;
 
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
+var
+  DialogoSalvar : TSaveDialog;
+begin
+  DialogoSalvar := TSaveDialog.Create(NIL);
+  try
+    with DialogoSalvar do
+    begin
+      DefaultExt := 'pdf';
+      Filter := 'Documento pdf (*.pdf)|*.pdf';
+      FileName := Fichero;
+      FilterIndex := 0;
+      Options := [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing];
+    end;
+    Result := DialogoSalvar.Execute;
+    if Result then
+      Fichero := DialogoSalvar.FileName;
+  finally
+    DialogoSalvar.Free;
+  end;
+end;
 
 function DarVersionFichero (Executable : String) : String;
 var

Source/Cliente/FactuGES.dproj

@@ -52,7 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</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">4.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">4.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">4</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.7.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.7.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\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/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Comisiones\Base.dcp" />
+    <DCCReference Include="..\Servidor\Base.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\ccpackD11.dcp" />
+    <DCCReference Include="..\Servidor\ccpackD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\cxDataD11.dcp" />
+    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\cxExportD11.dcp" />
+    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\dxThemeD11.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\frx11.dcp" />
+    <DCCReference Include="..\Servidor\frx11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\frxe11.dcp" />
+    <DCCReference Include="..\Servidor\frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\fs11.dcp" />
+    <DCCReference Include="..\Servidor\fs11.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\PNG_D10.dcp" />
+    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\rtl.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\tb2k_d10.dcp" />
+    <DCCReference Include="..\Servidor\tb2k_d10.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\tbx_d10.dcp" />
+    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\vclactnband.dcp" />
+    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\vcljpg.dcp" />
+    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Comisiones\vclx.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/Modulos/Contactos/Controller/uClientesController.pas

@@ -571,16 +571,16 @@ begin
         Post;
       end;
 
-      if (TIENDA_WEB = 1) and (Length(EMAIL_1) = 0) then
+      if (TIENDA_WEB = 1) and ((Length(DIST_EMAIL) = 0) OR (Length(DIST_PASSWORD) = 0)) then
       begin
         {ShowWarningMessage('Acceso a la tienda web',
           'Para que el cliente pueda tener acceso a la tienda web es necesario indicar una dirección de e-mail en el campo ''Correo de trabajo''' +
            #10#13 + #10#13 +
           'Por favor, indique una dirección o desactive el acceso a la tienda.');
          Result := False;}
-        raise Exception.Create('Para que el cliente pueda tener acceso a la tienda web es necesario indicar una dirección de e-mail en el campo ''Correo de trabajo''' +
+        raise Exception.Create('Para que el cliente pueda ser distribuidor es necesario indicar una dirección de e-mail y una contraseña' +
            #10#13 + #10#13 +
-          'Por favor, indique una dirección o desactive el acceso a la tienda.');
+          'Por favor, indique una dirección y contraseña o desactive el acceso de distribuidor.');
       end;
     end;
 

Source/Modulos/Contactos/Controller/uContactosController.pas

@@ -332,6 +332,13 @@ begin
     begin
       AContacto.Edit;
       AContacto.ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
+      AContacto.USUARIO := AppFactuGES.UsuarioActivo.UserName;      
+      AContacto.Post;
+    end
+    else
+    begin
+      AContacto.Edit;
+      AContacto.USUARIO := AppFactuGES.UsuarioActivo.UserName;
       AContacto.Post;
     end;
 

Source/Modulos/Contactos/Data/Contactos_data.dproj

@@ -49,23 +49,23 @@
     <DelphiCompile Include="Contactos_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Views\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="..\Views\ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
-    <DCCReference Include="..\Views\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="..\Views\Contactos_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
-    <DCCReference Include="..\Views\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Views\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Views\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="..\Views\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="..\Views\dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
-    <DCCReference Include="..\Views\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Views\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="..\Views\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="..\Views\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Views\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="..\Views\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="..\Views\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="..\Views\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDataModuleClientes.pas">
       <Form>DataModuleClientes</Form>
       <DesignClass>TDAClientDataModule</DesignClass>

Source/Modulos/Contactos/Data/uDataModuleClientes.dfm

@@ -357,6 +357,37 @@ inherited DataModuleClientes: TDataModuleClientes
       item
         Name = 'DESCUENTO_CAPITULO'
         DataType = datFloat
+      end
+      item
+        Name = 'DIST_EMAIL'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'DIST_PASSWORD'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'DIST_VALIDEZ'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'DIST_FORMA_PAGO'
+        DataType = datMemo
+      end
+      item
+        Name = 'DIST_NOTAS'
+        DataType = datMemo
+      end
+      item
+        Name = 'DIST_LOPD'
+        DataType = datMemo
+      end
+      item
+        Name = 'DIST_CONDICIONES'
+        DataType = datMemo
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -9,24 +9,24 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_DarEmpresasContacto = '{D2260045-5EA2-445E-BD5A-00B439D26E3C}';
+  RID_DarEmpresasContacto = '{4117686A-A758-413B-B33F-823F0F223874}';
-  RID_PersonalContacto = '{E7B4A8C5-D0B5-4198-88FB-0FE344B47561}';
+  RID_PersonalContacto = '{D86CE99D-0742-4C8A-8718-E5496F79C80C}';
-  RID_DarTiendaDeUsuario = '{7FDBC141-D073-425E-8B6B-344226FDED8F}';
+  RID_DarTiendaDeUsuario = '{38CBB232-AEFD-4FCB-9047-6C53966235F2}';
-  RID_SubCuentasContacto = '{6FB220D7-AD68-410D-855E-406CC8B64C5B}';
+  RID_SubCuentasContacto = '{73980B77-D54D-42B6-8296-6AD38BF4A287}';
-  RID_Contactos = '{574727E9-E45C-4013-AA7A-D618CFB784D7}';
+  RID_Contactos = '{3A69B178-6A2C-427E-B26A-04E45823E419}';
-  RID_GruposCliente = '{7D11D206-A5F2-48D8-BC68-F79BBA326860}';
+  RID_GruposCliente = '{A1C74C09-156D-46B1-A11B-1DCEBAF1BB76}';
-  RID_DatosBancarios = '{85FB44EA-ADA5-4D36-957C-47D83CB1446A}';
+  RID_DatosBancarios = '{2141DA3D-CD6D-4CC9-A875-70E47796DEF8}';
-  RID_ContactosDirecciones = '{5AD62CD9-4752-4AF1-9446-2175BE9F0E68}';
+  RID_ContactosDirecciones = '{5AD6717B-F60C-4EB3-A005-5CED779FA124}';
-  RID_Clientes = '{17B3A1E3-F2CE-4919-B7B8-34ECCFA3D33E}';
+  RID_Clientes = '{A9FCAF3B-8433-4B0C-93A7-739B857FBB6E}';
-  RID_Proveedores = '{05E8549B-18CE-420F-A0DC-0F5E8BF230AC}';
+  RID_Proveedores = '{69974D53-8241-4EEC-A52E-8790FB7F873B}';
-  RID_Comerciales = '{A3E835BE-B037-485E-9B2F-E4764A48A4BB}';
+  RID_Comerciales = '{55210549-BE51-409A-88BE-DE48C8EC9FE3}';
-  RID_Instaladores = '{B0A219BC-CE5D-4E2B-9B92-C0457C32D917}';
+  RID_Instaladores = '{45B2F841-BEB7-46CF-8370-1866EA458ABA}';
-  RID_Vendedores = '{96E45877-1FF8-48C4-8BD2-4016D06701FC}';
+  RID_Vendedores = '{C6987CB6-8B9E-4F3E-B1C6-60BAE7D1DAF0}';
-  RID_DireccionesContacto = '{FFF2865B-F57F-4633-A39E-35B8BDDF018F}';
+  RID_DireccionesContacto = '{993CC86B-D192-4A2D-B0C1-63F94673AC27}';
-  RID_ClientesDescuentos = '{788242EA-B70E-4C1D-94A0-E7F2F3731BF9}';
+  RID_ClientesDescuentos = '{601EC58E-D643-4D1B-A284-A339CEBD48C6}';
-  RID_ProcedenciasCliente = '{FDDCA58A-27BC-48D3-90F7-F4086DD3F373}';
+  RID_ProcedenciasCliente = '{C9E5D859-F4D4-49C7-9DAC-BBDEC61606CD}';
-  RID_GruposProveedor = '{FCE44575-FFF9-454C-9300-B9BC387FB125}';
+  RID_GruposProveedor = '{3066E9B1-D0C4-4A30-A219-29B6244C1071}';
-  RID_Contactos_Refresh = '{706F2E1D-C4C9-4003-AB7F-0894C9EC4465}';
+  RID_Contactos_Refresh = '{AA673881-49E3-4DE9-928F-D0C0F6697786}';
 
   { Data table names }
   nme_DarEmpresasContacto = 'DarEmpresasContacto';
@@ -278,6 +278,13 @@ const
   fld_ClientesAGENTE = 'AGENTE';
   fld_ClientesDELEGACION = 'DELEGACION';
   fld_ClientesDESCUENTO_CAPITULO = 'DESCUENTO_CAPITULO';
+  fld_ClientesDIST_EMAIL = 'DIST_EMAIL';
+  fld_ClientesDIST_PASSWORD = 'DIST_PASSWORD';
+  fld_ClientesDIST_VALIDEZ = 'DIST_VALIDEZ';
+  fld_ClientesDIST_FORMA_PAGO = 'DIST_FORMA_PAGO';
+  fld_ClientesDIST_NOTAS = 'DIST_NOTAS';
+  fld_ClientesDIST_LOPD = 'DIST_LOPD';
+  fld_ClientesDIST_CONDICIONES = 'DIST_CONDICIONES';
 
   { Clientes field indexes }
   idx_ClientesID = 0;
@@ -331,6 +338,13 @@ const
   idx_ClientesAGENTE = 48;
   idx_ClientesDELEGACION = 49;
   idx_ClientesDESCUENTO_CAPITULO = 50;
+  idx_ClientesDIST_EMAIL = 51;
+  idx_ClientesDIST_PASSWORD = 52;
+  idx_ClientesDIST_VALIDEZ = 53;
+  idx_ClientesDIST_FORMA_PAGO = 54;
+  idx_ClientesDIST_NOTAS = 55;
+  idx_ClientesDIST_LOPD = 56;
+  idx_ClientesDIST_CONDICIONES = 57;
 
   { Proveedores fields }
   fld_ProveedoresID = 'ID';
@@ -741,7 +755,7 @@ const
 type
   { IDarEmpresasContacto }
   IDarEmpresasContacto = interface(IDAStronglyTypedDataTable)
-  ['{6DCC6AB5-B946-4656-8122-9CEA4C3561D8}']
+  ['{5A42E84A-726A-4C4C-B22D-E980B9E7B359}']
     { Property getters and setters }
     function GetID_EMPRESAValue: Integer;
     procedure SetID_EMPRESAValue(const aValue: Integer);
@@ -776,7 +790,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{0A320E1D-F141-4023-BAB7-8508851D0967}']
+  ['{7DC4AEEE-BA0A-4EDC-AEBD-B55F4387967D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -919,7 +933,7 @@ type
 
   { IDarTiendaDeUsuario }
   IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable)
-  ['{78C5C14C-0995-4F0D-AE6D-D09EE2EBA5AB}']
+  ['{5538F32E-DD6E-485A-BB2C-4626B8FAC737}']
     { Property getters and setters }
     function GetID_TIENDAValue: Integer;
     procedure SetID_TIENDAValue(const aValue: Integer);
@@ -954,7 +968,7 @@ type
 
   { ISubCuentasContacto }
   ISubCuentasContacto = interface(IDAStronglyTypedDataTable)
-  ['{98FBBB17-C37A-4B62-BC5C-EA3EB4E8D40F}']
+  ['{8359AD31-7AAC-47E3-A169-C9419C5DDFA0}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1049,7 +1063,7 @@ type
 
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{8AD40959-2410-4896-B2F6-0ED92285C5EA}']
+  ['{0A502C1B-871E-4A71-816A-7EC57A2FA071}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1408,7 +1422,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{CA2408DC-3393-4166-A710-C5AFB9800D3F}']
+  ['{32C57660-33DF-46CB-8DA6-AF8429274B17}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1455,7 +1469,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{8BCFC161-8278-40D6-A085-01C58E73E6E3}']
+  ['{50526541-FBE8-4008-8F43-234E554FDC87}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1610,7 +1624,7 @@ type
 
   { IContactosDirecciones }
   IContactosDirecciones = interface(IDAStronglyTypedDataTable)
-  ['{99D8DC4D-B704-4B1B-A6EA-3CF7E7016D22}']
+  ['{3B309B93-5971-462D-B3D9-85B61CD5A591}']
     { Property getters and setters }
     function GetID_CONTACTOValue: Integer;
     procedure SetID_CONTACTOValue(const aValue: Integer);
@@ -1801,7 +1815,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{674DFF3A-9F54-48EF-89D6-A6AD544798D1}']
+  ['{7135CE4A-8380-4CD6-AB27-7D7E003309CC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2006,6 +2020,30 @@ type
     procedure SetDESCUENTO_CAPITULOValue(const aValue: Float);
     function GetDESCUENTO_CAPITULOIsNull: Boolean;
     procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean);
+    function GetDIST_EMAILValue: String;
+    procedure SetDIST_EMAILValue(const aValue: String);
+    function GetDIST_EMAILIsNull: Boolean;
+    procedure SetDIST_EMAILIsNull(const aValue: Boolean);
+    function GetDIST_PASSWORDValue: String;
+    procedure SetDIST_PASSWORDValue(const aValue: String);
+    function GetDIST_PASSWORDIsNull: Boolean;
+    procedure SetDIST_PASSWORDIsNull(const aValue: Boolean);
+    function GetDIST_VALIDEZValue: String;
+    procedure SetDIST_VALIDEZValue(const aValue: String);
+    function GetDIST_VALIDEZIsNull: Boolean;
+    procedure SetDIST_VALIDEZIsNull(const aValue: Boolean);
+    function GetDIST_FORMA_PAGOValue: IROStrings;
+    function GetDIST_FORMA_PAGOIsNull: Boolean;
+    procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean);
+    function GetDIST_NOTASValue: IROStrings;
+    function GetDIST_NOTASIsNull: Boolean;
+    procedure SetDIST_NOTASIsNull(const aValue: Boolean);
+    function GetDIST_LOPDValue: IROStrings;
+    function GetDIST_LOPDIsNull: Boolean;
+    procedure SetDIST_LOPDIsNull(const aValue: Boolean);
+    function GetDIST_CONDICIONESValue: IROStrings;
+    function GetDIST_CONDICIONESIsNull: Boolean;
+    procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -2111,13 +2149,35 @@ type
     property DELEGACIONIsNull: Boolean read GetDELEGACIONIsNull write SetDELEGACIONIsNull;
     property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue;
     property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
+    property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue;
+    property DIST_EMAILIsNull: Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull;
+    property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue;
+    property DIST_PASSWORDIsNull: Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull;
+    property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue;
+    property DIST_VALIDEZIsNull: Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull;
+    property DIST_FORMA_PAGO: IROStrings read GetDIST_FORMA_PAGOValue;
+    property DIST_FORMA_PAGOIsNull: Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull;
+    property DIST_NOTAS: IROStrings read GetDIST_NOTASValue;
+    property DIST_NOTASIsNull: Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull;
+    property DIST_LOPD: IROStrings read GetDIST_LOPDValue;
+    property DIST_LOPDIsNull: Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull;
+    property DIST_CONDICIONES: IROStrings read GetDIST_CONDICIONESValue;
+    property DIST_CONDICIONESIsNull: Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull;
   end;
 
   { TClientesDataTableRules }
   TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
   private
     f_NOTAS: IROStrings;
+    f_DIST_FORMA_PAGO: IROStrings;
+    f_DIST_NOTAS: IROStrings;
+    f_DIST_LOPD: IROStrings;
+    f_DIST_CONDICIONES: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
+    procedure DIST_FORMA_PAGO_OnChange(Sender: TObject);
+    procedure DIST_NOTAS_OnChange(Sender: TObject);
+    procedure DIST_LOPD_OnChange(Sender: TObject);
+    procedure DIST_CONDICIONES_OnChange(Sender: TObject);
   protected
     { Property getters and setters }
     function GetIDValue: Integer; virtual;
@@ -2323,6 +2383,30 @@ type
     procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual;
     function GetDESCUENTO_CAPITULOIsNull: Boolean; virtual;
     procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual;
+    function GetDIST_EMAILValue: String; virtual;
+    procedure SetDIST_EMAILValue(const aValue: String); virtual;
+    function GetDIST_EMAILIsNull: Boolean; virtual;
+    procedure SetDIST_EMAILIsNull(const aValue: Boolean); virtual;
+    function GetDIST_PASSWORDValue: String; virtual;
+    procedure SetDIST_PASSWORDValue(const aValue: String); virtual;
+    function GetDIST_PASSWORDIsNull: Boolean; virtual;
+    procedure SetDIST_PASSWORDIsNull(const aValue: Boolean); virtual;
+    function GetDIST_VALIDEZValue: String; virtual;
+    procedure SetDIST_VALIDEZValue(const aValue: String); virtual;
+    function GetDIST_VALIDEZIsNull: Boolean; virtual;
+    procedure SetDIST_VALIDEZIsNull(const aValue: Boolean); virtual;
+    function GetDIST_FORMA_PAGOValue: IROStrings; virtual;
+    function GetDIST_FORMA_PAGOIsNull: Boolean; virtual;
+    procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); virtual;
+    function GetDIST_NOTASValue: IROStrings; virtual;
+    function GetDIST_NOTASIsNull: Boolean; virtual;
+    procedure SetDIST_NOTASIsNull(const aValue: Boolean); virtual;
+    function GetDIST_LOPDValue: IROStrings; virtual;
+    function GetDIST_LOPDIsNull: Boolean; virtual;
+    procedure SetDIST_LOPDIsNull(const aValue: Boolean); virtual;
+    function GetDIST_CONDICIONESValue: IROStrings; virtual;
+    function GetDIST_CONDICIONESIsNull: Boolean; virtual;
+    procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -2427,6 +2511,20 @@ type
     property DELEGACIONIsNull: Boolean read GetDELEGACIONIsNull write SetDELEGACIONIsNull;
     property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue;
     property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
+    property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue;
+    property DIST_EMAILIsNull: Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull;
+    property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue;
+    property DIST_PASSWORDIsNull: Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull;
+    property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue;
+    property DIST_VALIDEZIsNull: Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull;
+    property DIST_FORMA_PAGO: IROStrings read GetDIST_FORMA_PAGOValue;
+    property DIST_FORMA_PAGOIsNull: Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull;
+    property DIST_NOTAS: IROStrings read GetDIST_NOTASValue;
+    property DIST_NOTASIsNull: Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull;
+    property DIST_LOPD: IROStrings read GetDIST_LOPDValue;
+    property DIST_LOPDIsNull: Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull;
+    property DIST_CONDICIONES: IROStrings read GetDIST_CONDICIONESValue;
+    property DIST_CONDICIONESIsNull: Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -2436,7 +2534,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{7B8EE822-7F3D-4A37-A90C-D614D4EF458E}']
+  ['{1716C0C8-11E1-4B43-96EC-283AADB3501E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2999,7 +3097,7 @@ type
 
   { IComerciales }
   IComerciales = interface(IDAStronglyTypedDataTable)
-  ['{EF962C82-23DF-4E13-A793-B0CD34816707}']
+  ['{C349BA14-A608-41C2-9FD6-7A226C24F935}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3418,7 +3516,7 @@ type
 
   { IInstaladores }
   IInstaladores = interface(IDAStronglyTypedDataTable)
-  ['{BF609D94-FFC5-4308-B658-5C8B4B4DED81}']
+  ['{81BCD723-6AC8-4A24-89C3-0CCEF9FB01CA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3777,7 +3875,7 @@ type
 
   { IVendedores }
   IVendedores = interface(IDAStronglyTypedDataTable)
-  ['{D67ABC37-B10F-4ABE-B634-A98DDA6E256D}']
+  ['{A447A57D-31CF-4958-87CA-B95067039FEA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4160,7 +4258,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{B16F0A1B-12F6-4C5C-B1FE-7BE3D6DD3CBC}']
+  ['{E55C842A-BECC-460E-8FD4-B836C739AEB7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4399,7 +4497,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{D7066FC5-59F7-4BC6-9124-509E231ED7E7}']
+  ['{ECE3BBFC-67C3-45B9-ABB3-D28790739CD1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4482,7 +4580,7 @@ type
 
   { IProcedenciasCliente }
   IProcedenciasCliente = interface(IDAStronglyTypedDataTable)
-  ['{AA87B063-67F2-41E0-BCFE-DF911ACA591C}']
+  ['{9829BB9A-F968-454A-A415-20A2CAE3AAED}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4529,7 +4627,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{74599997-1812-4EEE-8C27-45A8449C66B0}']
+  ['{64F28702-F5B8-462D-8A92-6AC3B0E91391}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4576,7 +4674,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{A461B8AD-126F-4F81-AF01-F1474954EF29}']
+  ['{1C74F97C-DCEB-49CA-8781-D9909425C395}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -6511,6 +6609,22 @@ begin
   StrList := TStringList.Create;
   StrList.OnChange := NOTAS_OnChange;
   f_NOTAS := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_FORMA_PAGO_OnChange;
+  f_DIST_FORMA_PAGO := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_NOTAS_OnChange;
+  f_DIST_NOTAS := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_LOPD_OnChange;
+  f_DIST_LOPD := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_CONDICIONES_OnChange;
+  f_DIST_CONDICIONES := NewROStrings(StrList,True);
 end;
 
 destructor TClientesDataTableRules.Destroy;
@@ -6523,6 +6637,26 @@ begin
   if DataTable.Editing then DataTable.Fields[idx_ClientesNOTAS].AsVariant := TStringList(Sender).Text;
 end;
 
+procedure TClientesDataTableRules.DIST_FORMA_PAGO_OnChange(Sender: TObject);
+begin
+  if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsVariant := TStringList(Sender).Text;
+end;
+
+procedure TClientesDataTableRules.DIST_NOTAS_OnChange(Sender: TObject);
+begin
+  if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_NOTAS].AsVariant := TStringList(Sender).Text;
+end;
+
+procedure TClientesDataTableRules.DIST_LOPD_OnChange(Sender: TObject);
+begin
+  if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_LOPD].AsVariant := TStringList(Sender).Text;
+end;
+
+procedure TClientesDataTableRules.DIST_CONDICIONES_OnChange(Sender: TObject);
+begin
+  if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsVariant := TStringList(Sender).Text;
+end;
+
 function TClientesDataTableRules.GetIDValue: Integer;
 begin
   result := DataTable.Fields[idx_ClientesID].AsInteger;
@@ -7590,6 +7724,137 @@ begin
     DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsVariant := Null;
 end;
 
+function TClientesDataTableRules.GetDIST_EMAILValue: String;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_EMAIL].AsString;
+end;
+
+procedure TClientesDataTableRules.SetDIST_EMAILValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_EMAIL].AsString := aValue;
+end;
+
+function TClientesDataTableRules.GetDIST_EMAILIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_EMAIL].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_EMAILIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_EMAIL].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_PASSWORDValue: String;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString;
+end;
+
+procedure TClientesDataTableRules.SetDIST_PASSWORDValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString := aValue;
+end;
+
+function TClientesDataTableRules.GetDIST_PASSWORDIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_PASSWORD].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_PASSWORDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_PASSWORD].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_VALIDEZValue: String;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString;
+end;
+
+procedure TClientesDataTableRules.SetDIST_VALIDEZValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString := aValue;
+end;
+
+function TClientesDataTableRules.GetDIST_VALIDEZIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_VALIDEZIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_FORMA_PAGOValue: IROStrings;
+begin
+  result := f_DIST_FORMA_PAGO;
+  result.Text := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString;
+end;
+
+function TClientesDataTableRules.GetDIST_FORMA_PAGOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_FORMA_PAGOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_NOTASValue: IROStrings;
+begin
+  result := f_DIST_NOTAS;
+  result.Text := DataTable.Fields[idx_ClientesDIST_NOTAS].AsString;
+end;
+
+function TClientesDataTableRules.GetDIST_NOTASIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_NOTAS].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_NOTASIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_NOTAS].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_LOPDValue: IROStrings;
+begin
+  result := f_DIST_LOPD;
+  result.Text := DataTable.Fields[idx_ClientesDIST_LOPD].AsString;
+end;
+
+function TClientesDataTableRules.GetDIST_LOPDIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_LOPD].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_LOPDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_LOPD].AsVariant := Null;
+end;
+
+function TClientesDataTableRules.GetDIST_CONDICIONESValue: IROStrings;
+begin
+  result := f_DIST_CONDICIONES;
+  result.Text := DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString;
+end;
+
+function TClientesDataTableRules.GetDIST_CONDICIONESIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesDIST_CONDICIONES].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetDIST_CONDICIONESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsVariant := Null;
+end;
+
 
 { TProveedoresDataTableRules }
 constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,29 +9,29 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_DarEmpresasContactoDelta = '{8E43A352-5534-4ED0-98A0-8B9315B87DC9}';
+  RID_DarEmpresasContactoDelta = '{A6C17B0F-9BA6-49DA-95E3-AAE7E126D6C3}';
-  RID_PersonalContactoDelta = '{6CEB5C20-52D6-47EB-9E0B-FC1ED530ED57}';
+  RID_PersonalContactoDelta = '{7673EB03-E044-4235-86FD-88C03BF38CA5}';
-  RID_DarTiendaDeUsuarioDelta = '{27AD499A-FDA3-486D-AED3-6F3C185E0BB7}';
+  RID_DarTiendaDeUsuarioDelta = '{BB04C9C0-C1D6-4217-9E5E-A8DD6066DC18}';
-  RID_SubCuentasContactoDelta = '{89060287-0004-4DC6-9B41-CA8BEE15E4FA}';
+  RID_SubCuentasContactoDelta = '{2264ED20-7CBC-4AAD-AE76-4FA9B5772027}';
-  RID_ContactosDelta = '{8568C604-4350-40D2-BFF4-63991A810025}';
+  RID_ContactosDelta = '{7272985B-101D-4E77-B186-F540C5A8B9FE}';
-  RID_GruposClienteDelta = '{2B2FDDCA-B7DC-4E22-837A-CBF4B31EB334}';
+  RID_GruposClienteDelta = '{DB5E0AAD-E731-4141-8174-6E90B00E00C9}';
-  RID_DatosBancariosDelta = '{4B54C2AA-1D6E-4B7C-ABDD-D27AC0EC80E0}';
+  RID_DatosBancariosDelta = '{EE52BF18-C8DA-4499-93B7-BE8450EBFC0C}';
-  RID_ContactosDireccionesDelta = '{96575B97-B9C5-4F98-B022-FB7ED9D2F362}';
+  RID_ContactosDireccionesDelta = '{A2901211-D93D-47D6-B517-81FFF15339A5}';
-  RID_ClientesDelta = '{C370F2E8-BB83-4B2A-B586-616B15393E4B}';
+  RID_ClientesDelta = '{FED5B468-C66D-4F91-87E5-70C095A17999}';
-  RID_ProveedoresDelta = '{F4211FE5-B711-4A6F-BD50-1362FBE58A63}';
+  RID_ProveedoresDelta = '{606CCCEF-0525-4B8C-AFDF-B69086176948}';
-  RID_ComercialesDelta = '{E1E60EEC-3987-4A5F-945E-3254A717DAF0}';
+  RID_ComercialesDelta = '{4E7845A8-6516-46DC-8B41-5FC78B1A4D2B}';
-  RID_InstaladoresDelta = '{9E6D5095-74E3-46F4-A0BD-9978B1764CC3}';
+  RID_InstaladoresDelta = '{27299B3D-AF60-4409-B0F1-01D3C70B3A78}';
-  RID_VendedoresDelta = '{B0DBA7AF-A835-48FD-A7CC-1D0FFCDAF2EC}';
+  RID_VendedoresDelta = '{2356F78C-D158-4718-B0D5-7908F364710D}';
-  RID_DireccionesContactoDelta = '{BE093FC9-3ECB-4D20-83E7-C65A2B28F787}';
+  RID_DireccionesContactoDelta = '{586C0AF6-F3F1-4AEF-A20D-538A864F8C9E}';
-  RID_ClientesDescuentosDelta = '{971706C8-35EA-4642-A2C2-67D8733848E3}';
+  RID_ClientesDescuentosDelta = '{E751E876-C504-4667-9E86-3C1C2F6126BE}';
-  RID_ProcedenciasClienteDelta = '{B1CB95E2-06FE-4612-9DAB-8266C1544841}';
+  RID_ProcedenciasClienteDelta = '{8D68A2B8-266F-425C-9C9B-59AB0F2C0536}';
-  RID_GruposProveedorDelta = '{C818ADEB-6295-4D86-97A9-0B76F573D404}';
+  RID_GruposProveedorDelta = '{79D969BC-F86A-4FED-8F21-89818C75814F}';
-  RID_Contactos_RefreshDelta = '{A915B623-C44A-4698-A8D7-A5EF90EA74C7}';
+  RID_Contactos_RefreshDelta = '{C09DCED2-2FF9-4475-91BA-AAB42A6F40AD}';
 
 type
   { IDarEmpresasContactoDelta }
   IDarEmpresasContactoDelta = interface(IDarEmpresasContacto)
-  ['{8E43A352-5534-4ED0-98A0-8B9315B87DC9}']
+  ['{A6C17B0F-9BA6-49DA-95E3-AAE7E126D6C3}']
     { Property getters and setters }
     function GetOldID_EMPRESAValue : Integer;
 
@@ -65,7 +65,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{6CEB5C20-52D6-47EB-9E0B-FC1ED530ED57}']
+  ['{7673EB03-E044-4235-86FD-88C03BF38CA5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -207,7 +207,7 @@ type
 
   { IDarTiendaDeUsuarioDelta }
   IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario)
-  ['{27AD499A-FDA3-486D-AED3-6F3C185E0BB7}']
+  ['{BB04C9C0-C1D6-4217-9E5E-A8DD6066DC18}']
     { Property getters and setters }
     function GetOldID_TIENDAValue : Integer;
 
@@ -241,7 +241,7 @@ type
 
   { ISubCuentasContactoDelta }
   ISubCuentasContactoDelta = interface(ISubCuentasContacto)
-  ['{89060287-0004-4DC6-9B41-CA8BEE15E4FA}']
+  ['{2264ED20-7CBC-4AAD-AE76-4FA9B5772027}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldREF_SUBCUENTAValue : String;
@@ -335,7 +335,7 @@ type
 
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{8568C604-4350-40D2-BFF4-63991A810025}']
+  ['{7272985B-101D-4E77-B186-F540C5A8B9FE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -694,7 +694,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{2B2FDDCA-B7DC-4E22-837A-CBF4B31EB334}']
+  ['{DB5E0AAD-E731-4141-8174-6E90B00E00C9}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -740,7 +740,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{4B54C2AA-1D6E-4B7C-ABDD-D27AC0EC80E0}']
+  ['{EE52BF18-C8DA-4499-93B7-BE8450EBFC0C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -894,7 +894,7 @@ type
 
   { IContactosDireccionesDelta }
   IContactosDireccionesDelta = interface(IContactosDirecciones)
-  ['{96575B97-B9C5-4F98-B022-FB7ED9D2F362}']
+  ['{A2901211-D93D-47D6-B517-81FFF15339A5}']
     { Property getters and setters }
     function GetOldID_CONTACTOValue : Integer;
     function GetOldID_DIRECCIONValue : Integer;
@@ -1084,7 +1084,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{C370F2E8-BB83-4B2A-B586-616B15393E4B}']
+  ['{FED5B468-C66D-4F91-87E5-70C095A17999}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1137,6 +1137,13 @@ type
     function GetOldAGENTEValue : String;
     function GetOldDELEGACIONValue : String;
     function GetOldDESCUENTO_CAPITULOValue : Float;
+    function GetOldDIST_EMAILValue : String;
+    function GetOldDIST_PASSWORDValue : String;
+    function GetOldDIST_VALIDEZValue : String;
+    function GetOldDIST_FORMA_PAGOValue : IROStrings;
+    function GetOldDIST_NOTASValue : IROStrings;
+    function GetOldDIST_LOPDValue : IROStrings;
+    function GetOldDIST_CONDICIONESValue : IROStrings;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -1190,13 +1197,28 @@ type
     property OldAGENTE : String read GetOldAGENTEValue;
     property OldDELEGACION : String read GetOldDELEGACIONValue;
     property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue;
+    property OldDIST_EMAIL : String read GetOldDIST_EMAILValue;
+    property OldDIST_PASSWORD : String read GetOldDIST_PASSWORDValue;
+    property OldDIST_VALIDEZ : String read GetOldDIST_VALIDEZValue;
+    property OldDIST_FORMA_PAGO : IROStrings read GetOldDIST_FORMA_PAGOValue;
+    property OldDIST_NOTAS : IROStrings read GetOldDIST_NOTASValue;
+    property OldDIST_LOPD : IROStrings read GetOldDIST_LOPDValue;
+    property OldDIST_CONDICIONES : IROStrings read GetOldDIST_CONDICIONESValue;
   end;
 
   { TClientesBusinessProcessorRules }
   TClientesBusinessProcessorRules = class(TDABusinessProcessorRules, IClientes, IClientesDelta)
   private
     f_NOTAS: IROStrings;
+    f_DIST_FORMA_PAGO: IROStrings;
+    f_DIST_NOTAS: IROStrings;
+    f_DIST_LOPD: IROStrings;
+    f_DIST_CONDICIONES: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
+    procedure DIST_FORMA_PAGO_OnChange(Sender: TObject);
+    procedure DIST_NOTAS_OnChange(Sender: TObject);
+    procedure DIST_LOPD_OnChange(Sender: TObject);
+    procedure DIST_CONDICIONES_OnChange(Sender: TObject);
   protected
     { Property getters and setters }
     function GetIDValue: Integer; virtual;
@@ -1504,6 +1526,44 @@ type
     function GetOldDESCUENTO_CAPITULOIsNull: Boolean; virtual;
     procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual;
     procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual;
+    function GetDIST_EMAILValue: String; virtual;
+    function GetDIST_EMAILIsNull: Boolean; virtual;
+    function GetOldDIST_EMAILValue: String; virtual;
+    function GetOldDIST_EMAILIsNull: Boolean; virtual;
+    procedure SetDIST_EMAILValue(const aValue: String); virtual;
+    procedure SetDIST_EMAILIsNull(const aValue: Boolean); virtual;
+    function GetDIST_PASSWORDValue: String; virtual;
+    function GetDIST_PASSWORDIsNull: Boolean; virtual;
+    function GetOldDIST_PASSWORDValue: String; virtual;
+    function GetOldDIST_PASSWORDIsNull: Boolean; virtual;
+    procedure SetDIST_PASSWORDValue(const aValue: String); virtual;
+    procedure SetDIST_PASSWORDIsNull(const aValue: Boolean); virtual;
+    function GetDIST_VALIDEZValue: String; virtual;
+    function GetDIST_VALIDEZIsNull: Boolean; virtual;
+    function GetOldDIST_VALIDEZValue: String; virtual;
+    function GetOldDIST_VALIDEZIsNull: Boolean; virtual;
+    procedure SetDIST_VALIDEZValue(const aValue: String); virtual;
+    procedure SetDIST_VALIDEZIsNull(const aValue: Boolean); virtual;
+    function GetDIST_FORMA_PAGOValue: IROStrings; virtual;
+    function GetDIST_FORMA_PAGOIsNull: Boolean; virtual;
+    function GetOldDIST_FORMA_PAGOValue: IROStrings; virtual;
+    function GetOldDIST_FORMA_PAGOIsNull: Boolean; virtual;
+    procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); virtual;
+    function GetDIST_NOTASValue: IROStrings; virtual;
+    function GetDIST_NOTASIsNull: Boolean; virtual;
+    function GetOldDIST_NOTASValue: IROStrings; virtual;
+    function GetOldDIST_NOTASIsNull: Boolean; virtual;
+    procedure SetDIST_NOTASIsNull(const aValue: Boolean); virtual;
+    function GetDIST_LOPDValue: IROStrings; virtual;
+    function GetDIST_LOPDIsNull: Boolean; virtual;
+    function GetOldDIST_LOPDValue: IROStrings; virtual;
+    function GetOldDIST_LOPDIsNull: Boolean; virtual;
+    procedure SetDIST_LOPDIsNull(const aValue: Boolean); virtual;
+    function GetDIST_CONDICIONESValue: IROStrings; virtual;
+    function GetDIST_CONDICIONESIsNull: Boolean; virtual;
+    function GetOldDIST_CONDICIONESValue: IROStrings; virtual;
+    function GetOldDIST_CONDICIONESIsNull: Boolean; virtual;
+    procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1710,6 +1770,34 @@ type
     property DESCUENTO_CAPITULOIsNull : Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
     property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue;
     property OldDESCUENTO_CAPITULOIsNull : Boolean read GetOldDESCUENTO_CAPITULOIsNull;
+    property DIST_EMAIL : String read GetDIST_EMAILValue write SetDIST_EMAILValue;
+    property DIST_EMAILIsNull : Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull;
+    property OldDIST_EMAIL : String read GetOldDIST_EMAILValue;
+    property OldDIST_EMAILIsNull : Boolean read GetOldDIST_EMAILIsNull;
+    property DIST_PASSWORD : String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue;
+    property DIST_PASSWORDIsNull : Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull;
+    property OldDIST_PASSWORD : String read GetOldDIST_PASSWORDValue;
+    property OldDIST_PASSWORDIsNull : Boolean read GetOldDIST_PASSWORDIsNull;
+    property DIST_VALIDEZ : String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue;
+    property DIST_VALIDEZIsNull : Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull;
+    property OldDIST_VALIDEZ : String read GetOldDIST_VALIDEZValue;
+    property OldDIST_VALIDEZIsNull : Boolean read GetOldDIST_VALIDEZIsNull;
+    property DIST_FORMA_PAGO : IROStrings read GetDIST_FORMA_PAGOValue;
+    property DIST_FORMA_PAGOIsNull : Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull;
+    property OldDIST_FORMA_PAGO : IROStrings read GetOldDIST_FORMA_PAGOValue;
+    property OldDIST_FORMA_PAGOIsNull : Boolean read GetOldDIST_FORMA_PAGOIsNull;
+    property DIST_NOTAS : IROStrings read GetDIST_NOTASValue;
+    property DIST_NOTASIsNull : Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull;
+    property OldDIST_NOTAS : IROStrings read GetOldDIST_NOTASValue;
+    property OldDIST_NOTASIsNull : Boolean read GetOldDIST_NOTASIsNull;
+    property DIST_LOPD : IROStrings read GetDIST_LOPDValue;
+    property DIST_LOPDIsNull : Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull;
+    property OldDIST_LOPD : IROStrings read GetOldDIST_LOPDValue;
+    property OldDIST_LOPDIsNull : Boolean read GetOldDIST_LOPDIsNull;
+    property DIST_CONDICIONES : IROStrings read GetDIST_CONDICIONESValue;
+    property DIST_CONDICIONESIsNull : Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull;
+    property OldDIST_CONDICIONES : IROStrings read GetOldDIST_CONDICIONESValue;
+    property OldDIST_CONDICIONESIsNull : Boolean read GetOldDIST_CONDICIONESIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1719,7 +1807,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{F4211FE5-B711-4A6F-BD50-1362FBE58A63}']
+  ['{606CCCEF-0525-4B8C-AFDF-B69086176948}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -2282,7 +2370,7 @@ type
 
   { IComercialesDelta }
   IComercialesDelta = interface(IComerciales)
-  ['{E1E60EEC-3987-4A5F-945E-3254A717DAF0}']
+  ['{4E7845A8-6516-46DC-8B41-5FC78B1A4D2B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -2701,7 +2789,7 @@ type
 
   { IInstaladoresDelta }
   IInstaladoresDelta = interface(IInstaladores)
-  ['{9E6D5095-74E3-46F4-A0BD-9978B1764CC3}']
+  ['{27299B3D-AF60-4409-B0F1-01D3C70B3A78}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -3060,7 +3148,7 @@ type
 
   { IVendedoresDelta }
   IVendedoresDelta = interface(IVendedores)
-  ['{B0DBA7AF-A835-48FD-A7CC-1D0FFCDAF2EC}']
+  ['{2356F78C-D158-4718-B0D5-7908F364710D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -3443,7 +3531,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{BE093FC9-3ECB-4D20-83E7-C65A2B28F787}']
+  ['{586C0AF6-F3F1-4AEF-A20D-538A864F8C9E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -3682,7 +3770,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{971706C8-35EA-4642-A2C2-67D8733848E3}']
+  ['{E751E876-C504-4667-9E86-3C1C2F6126BE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -3764,7 +3852,7 @@ type
 
   { IProcedenciasClienteDelta }
   IProcedenciasClienteDelta = interface(IProcedenciasCliente)
-  ['{B1CB95E2-06FE-4612-9DAB-8266C1544841}']
+  ['{8D68A2B8-266F-425C-9C9B-59AB0F2C0536}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -3810,7 +3898,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{C818ADEB-6295-4D86-97A9-0B76F573D404}']
+  ['{79D969BC-F86A-4FED-8F21-89818C75814F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -3856,7 +3944,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{A915B623-C44A-4698-A8D7-A5EF90EA74C7}']
+  ['{C09DCED2-2FF9-4475-91BA-AAB42A6F40AD}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -6523,6 +6611,22 @@ begin
   StrList := TStringList.Create;
   StrList.OnChange := NOTAS_OnChange;
   f_NOTAS := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_FORMA_PAGO_OnChange;
+  f_DIST_FORMA_PAGO := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_NOTAS_OnChange;
+  f_DIST_NOTAS := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_LOPD_OnChange;
+  f_DIST_LOPD := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := DIST_CONDICIONES_OnChange;
+  f_DIST_CONDICIONES := NewROStrings(StrList,True);
 end;
 
 destructor TClientesBusinessProcessorRules.Destroy;
@@ -6535,6 +6639,26 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOTAS] := TStringList(Sender).Text;
 end;
 
+procedure TClientesBusinessProcessorRules.DIST_FORMA_PAGO_OnChange(Sender: TObject);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO] := TStringList(Sender).Text;
+end;
+
+procedure TClientesBusinessProcessorRules.DIST_NOTAS_OnChange(Sender: TObject);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS] := TStringList(Sender).Text;
+end;
+
+procedure TClientesBusinessProcessorRules.DIST_LOPD_OnChange(Sender: TObject);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD] := TStringList(Sender).Text;
+end;
+
+procedure TClientesBusinessProcessorRules.DIST_CONDICIONES_OnChange(Sender: TObject);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES] := TStringList(Sender).Text;
+end;
+
 function TClientesBusinessProcessorRules.GetIDValue: Integer;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID];
@@ -8113,6 +8237,211 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO] := Null;
 end;
 
+function TClientesBusinessProcessorRules.GetDIST_EMAILValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_EMAILIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_EMAILValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_EMAIL];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_EMAILIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_EMAIL]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_EMAILValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_EMAILIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_PASSWORDValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_PASSWORDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_PASSWORDValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_PASSWORD];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_PASSWORDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_PASSWORD]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_PASSWORDValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_PASSWORDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_VALIDEZValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_VALIDEZIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_VALIDEZValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_VALIDEZ];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_VALIDEZIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_VALIDEZ]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_VALIDEZValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_VALIDEZIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_FORMA_PAGOValue: IROStrings;
+begin
+  result := f_DIST_FORMA_PAGO;
+  result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_FORMA_PAGOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_FORMA_PAGOValue: IROStrings;
+begin
+  result := NewROStrings();
+  result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_FORMA_PAGO];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_FORMA_PAGOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_FORMA_PAGO]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_FORMA_PAGOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_NOTASValue: IROStrings;
+begin
+  result := f_DIST_NOTAS;
+  result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_NOTASIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_NOTASValue: IROStrings;
+begin
+  result := NewROStrings();
+  result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_NOTAS];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_NOTASIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_NOTAS]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_NOTASIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_LOPDValue: IROStrings;
+begin
+  result := f_DIST_LOPD;
+  result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_LOPDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_LOPDValue: IROStrings;
+begin
+  result := NewROStrings();
+  result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_LOPD];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_LOPDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_LOPD]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_LOPDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD] := Null;
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_CONDICIONESValue: IROStrings;
+begin
+  result := f_DIST_CONDICIONES;
+  result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES];
+end;
+
+function TClientesBusinessProcessorRules.GetDIST_CONDICIONESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_CONDICIONESValue: IROStrings;
+begin
+  result := NewROStrings();
+  result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_CONDICIONES];
+end;
+
+function TClientesBusinessProcessorRules.GetOldDIST_CONDICIONESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_CONDICIONES]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetDIST_CONDICIONESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES] := Null;
+end;
+
 
 { TProveedoresBusinessProcessorRules }
 constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contactos/Model/uBizClientesServer.pas

@@ -189,6 +189,14 @@ begin
       ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO];
       ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO];
 
+      ParamByName('DIST_EMAIL').Value := aChange.NewValueByName[fld_ClientesDIST_EMAIL];
+      ParamByName('DIST_PASSWORD').Value := aChange.NewValueByName[fld_ClientesDIST_PASSWORD];
+      ParamByName('DIST_VALIDEZ').Value := aChange.NewValueByName[fld_ClientesDIST_VALIDEZ];
+      ParamByName('DIST_FORMA_PAGO').Value := aChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO];
+      ParamByName('DIST_NOTAS').Value := aChange.NewValueByName[fld_ClientesDIST_NOTAS];
+      ParamByName('DIST_LOPD').Value := aChange.NewValueByName[fld_ClientesDIST_LOPD];
+      ParamByName('DIST_CONDICIONES').Value := aChange.NewValueByName[fld_ClientesDIST_CONDICIONES];
+
       Execute;
     end;
 
@@ -248,6 +256,14 @@ begin
       ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO];
       ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO];
 
+      ParamByName('DIST_EMAIL').Value := aChange.NewValueByName[fld_ClientesDIST_EMAIL];
+      ParamByName('DIST_PASSWORD').Value := aChange.NewValueByName[fld_ClientesDIST_PASSWORD];
+      ParamByName('DIST_VALIDEZ').Value := aChange.NewValueByName[fld_ClientesDIST_VALIDEZ];
+      ParamByName('DIST_FORMA_PAGO').Value := aChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO];
+      ParamByName('DIST_NOTAS').Value := aChange.NewValueByName[fld_ClientesDIST_NOTAS];
+      ParamByName('DIST_LOPD').Value := aChange.NewValueByName[fld_ClientesDIST_LOPD];
+      ParamByName('DIST_CONDICIONES').Value := aChange.NewValueByName[fld_ClientesDIST_CONDICIONES];
+      
       Execute;
     end;
 

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -118,6 +118,28 @@ type
     function GetPAISValue: String;
     procedure SetPAISValue(const aValue: String);
 
+    function GetDIST_EMAILValue: String;
+    procedure SetDIST_EMAILValue(const aValue: String);
+
+    function GetDIST_PASSWORDValue: String;
+    procedure SetDIST_PASSWORDValue(const aValue: String);
+
+    function GetDIST_VALIDEZValue: String;
+    procedure SetDIST_VALIDEZValue(const Value: String);
+
+    function GetDIST_FORMA_PAGOValue: String;
+    procedure SetDIST_FORMA_PAGOValue(const aValue: String);
+
+    function GetDIST_LOPDValue: String;
+    procedure SetDIST_LOPDValue(const aValue: String);
+
+    function GetDIST_NOTASValue: String;
+    procedure SetDIST_NOTASValue(const aValue: String);
+
+    function GetDIST_CONDICIONESValue: String;
+    procedure SetDIST_CONDICIONESValue(const aValue: String);
+
+
     property Descuentos: IBizClienteDescuentos read GetDescuentos write SetDescuentos;
     property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue;
     property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
@@ -141,6 +163,15 @@ type
     property DELEGACION: String read GetDELEGACIONValue write SetDELEGACIONValue;
     property PAIS: String read GetPAISValue write SetPAISValue;
 
+    property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue;
+    property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue;
+    property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue;
+    property DIST_FORMA_PAGO: String read GetDIST_FORMA_PAGOValue write SetDIST_FORMA_PAGOValue;
+    property DIST_NOTAS: String read GetDIST_NOTASValue write SetDIST_NOTASValue;
+    property DIST_LOPD: String read GetDIST_LOPDValue write SetDIST_LOPDValue;
+    property DIST_CONDICIONES: String read GetDIST_CONDICIONESValue write SetDIST_CONDICIONESValue;
+
+
     function GetSubCuentas: IBizSubCuentasContacto;
     procedure SetSubCuentas(const Value: IBizSubCuentasContacto);
     property SubCuentas : IBizSubCuentasContacto read GetSubCuentas write SetSubCuentas;
@@ -384,6 +415,27 @@ type
     function GetDELEGACIONValue: String;
     procedure SetDELEGACIONValue(const aValue: String);
 
+    function GetDIST_EMAILValue: String;
+    procedure SetDIST_EMAILValue(const aValue: String);
+
+    function GetDIST_PASSWORDValue: String;
+    procedure SetDIST_PASSWORDValue(const aValue: String);
+
+    function GetDIST_VALIDEZValue: String;
+    procedure SetDIST_VALIDEZValue(const aValue: String);
+
+    function GetDIST_FORMA_PAGOValue: String;
+    procedure SetDIST_FORMA_PAGOValue(const aValue: String);
+
+    function GetDIST_LOPDValue: String;
+    procedure SetDIST_LOPDValue(const aValue: String);
+
+    function GetDIST_NOTASValue: String;
+    procedure SetDIST_NOTASValue(const aValue: String);
+
+    function GetDIST_CONDICIONESValue: String;
+    procedure SetDIST_CONDICIONESValue(const aValue: String);
+
   public
     procedure IniciarValoresContactoNuevo; override;
     constructor Create(aDataTable: TDADataTable); override;
@@ -413,6 +465,13 @@ type
     property AGENTE: String read GetAGENTEValue write SetAGENTEValue;
     property DELEGACION: String read GetDELEGACIONValue write SetDELEGACIONValue;
 
+    property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue;
+    property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue;
+    property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue;
+    property DIST_FORMA_PAGO: String read GetDIST_FORMA_PAGOValue write SetDIST_FORMA_PAGOValue;
+    property DIST_NOTAS: String read GetDIST_NOTASValue write SetDIST_NOTASValue;
+    property DIST_LOPD: String read GetDIST_LOPDValue write SetDIST_LOPDValue;
+    property DIST_CONDICIONES: String read GetDIST_CONDICIONESValue write SetDIST_CONDICIONESValue;
   end;
 
 
@@ -703,6 +762,41 @@ begin
   result := DataTable.Fields[idx_ClientesDESCUENTO_LINEA].AsFloat;
 end;
 
+function TBizCliente.GetDIST_CONDICIONESValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString;
+end;
+
+function TBizCliente.GetDIST_EMAILValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_EMAIL].AsString;
+end;
+
+function TBizCliente.GetDIST_FORMA_PAGOValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString;
+end;
+
+function TBizCliente.GetDIST_LOPDValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_LOPD].AsString;
+end;
+
+function TBizCliente.GetDIST_NOTASValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_NOTAS].AsString;
+end;
+
+function TBizCliente.GetDIST_PASSWORDValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString;
+end;
+
+function TBizCliente.GetDIST_VALIDEZValue: String;
+begin
+  Result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString;
+end;
+
 function TBizCliente.GetDESCUENTO_CAPITULOValue: Float;
 begin
   result := DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsFloat;
@@ -784,6 +878,41 @@ begin
   DataTable.Fields[idx_ClientesDESCUENTO_LINEA].AsFloat := aValue;
 end;
 
+procedure TBizCliente.SetDIST_CONDICIONESValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_EMAILValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_EMAIL].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_FORMA_PAGOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_LOPDValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_LOPD].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_NOTASValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_NOTAS].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_PASSWORDValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString := aValue;
+end;
+
+procedure TBizCliente.SetDIST_VALIDEZValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString := aValue;
+end;
+
 procedure TBizCliente.SetDESCUENTO_CAPITULOValue(const aValue: Float);
 begin
   DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsFloat := aValue;

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -1058,6 +1058,34 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'DESCUENTO_CAPITULO'
                 TableField = 'DESCUENTO_CAPITULO'
+              end
+              item
+                DatasetField = 'DIST_EMAIL'
+                TableField = 'DIST_EMAIL'
+              end
+              item
+                DatasetField = 'DIST_PASSWORD'
+                TableField = 'DIST_PASSWORD'
+              end
+              item
+                DatasetField = 'DIST_VALIDEZ'
+                TableField = 'DIST_VALIDEZ'
+              end
+              item
+                DatasetField = 'DIST_FORMA_PAGO'
+                TableField = 'DIST_FORMA_PAGO'
+              end
+              item
+                DatasetField = 'DIST_NOTAS'
+                TableField = 'DIST_NOTAS'
+              end
+              item
+                DatasetField = 'DIST_LOPD'
+                TableField = 'DIST_LOPD'
+              end
+              item
+                DatasetField = 'DIST_CONDICIONES'
+                TableField = 'DIST_CONDICIONES'
               end>
           end>
         Name = 'Clientes'
@@ -1354,6 +1382,37 @@ object srvContactos: TsrvContactos
           item
             Name = 'DESCUENTO_CAPITULO'
             DataType = datFloat
+          end
+          item
+            Name = 'DIST_EMAIL'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'DIST_PASSWORD'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'DIST_VALIDEZ'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'DIST_FORMA_PAGO'
+            DataType = datMemo
+          end
+          item
+            Name = 'DIST_NOTAS'
+            DataType = datMemo
+          end
+          item
+            Name = 'DIST_LOPD'
+            DataType = datMemo
+          end
+          item
+            Name = 'DIST_CONDICIONES'
+            DataType = datMemo
           end>
       end
       item
@@ -3441,12 +3500,12 @@ object srvContactos: TsrvContactos
               'INSERT'#10'  INTO CONTACTOS'#10'    (ID, NIF_CIF, NOMBRE, PERSONA_CONTAC' +
               'TO, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL,'#10'     PAIS, IDIOM' +
               'A_ISO, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1,'#10' ' +
-              '    EMAIL_2, PAGINA_WEB, NOTAS, USUARIO, REFERENCIA, ID_TIENDA)'#10 +
+              '    EMAIL_2, PAGINA_WEB, NOTAS, USUARIO, REFERENCIA, ID_TIENDA, ' +
-              '  VALUES'#10'    (:ID, :NIF_CIF, :NOMBRE, :PERSONA_CONTACTO, :CALLE,' +
+              'FECHA_ALTA)'#10'  VALUES'#10'    (:ID, :NIF_CIF, :NOMBRE, :PERSONA_CONTA' +
-              ' :POBLACION, :PROVINCIA,'#10'     :CODIGO_POSTAL, :PAIS, :IDIOMA_ISO' +
+              'CTO, :CALLE, :POBLACION, :PROVINCIA,'#10'     :CODIGO_POSTAL, :PAIS,' +
-              ', :TELEFONO_1, :TELEFONO_2, :MOVIL_1,'#10'     :MOVIL_2, :FAX, :EMAI' +
+              ' :IDIOMA_ISO, :TELEFONO_1, :TELEFONO_2, :MOVIL_1,'#10'     :MOVIL_2,' +
-              'L_1, :EMAIL_2, :PAGINA_WEB, :NOTAS, '#10'     :USUARIO, :REFERENCIA,' +
+              ' :FAX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, :NOTAS, '#10'     :USUARIO, ' +
-              ' :ID_TIENDA)'#10
+              ':REFERENCIA, :ID_TIENDA, CURRENT_TIMESTAMP)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3619,7 +3678,8 @@ object srvContactos: TsrvContactos
               'OVIL_2 = :MOVIL_2, '#10'    FAX = :FAX, '#10'    EMAIL_1 = :EMAIL_1, '#10'  ' +
               '  EMAIL_2 = :EMAIL_2, '#10'    PAGINA_WEB = :PAGINA_WEB, '#10'    NOTAS ' +
               '= :NOTAS, '#10'    USUARIO = :USUARIO,'#10'    REFERENCIA = :REFERENCIA,' +
-              #10'    ID_TIENDA = :ID_TIENDA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              #10'    ID_TIENDA = :ID_TIENDA,'#10'    FECHA_MODIFICACION = CURRENT_TI' +
+              'MESTAMP'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -4067,6 +4127,44 @@ object srvContactos: TsrvContactos
             Name = 'DESCUENTO_CAPITULO'
             DataType = datFloat
             Value = ''
+          end
+          item
+            Name = 'DIST_EMAIL'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_PASSWORD'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_VALIDEZ'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_FORMA_PAGO'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_NOTAS'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_LOPD'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_CONDICIONES'
+            DataType = datMemo
+            Value = ''
           end>
         Statements = <
           item
@@ -4079,14 +4177,17 @@ object srvContactos: TsrvContactos
               'ODIGO_ASIGNADO, IGNORAR_CONTABILIDAD, PROCEDENCIA_CLIENTE, TIENE' +
               '_SUBCUENTA,'#10'     VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2,' +
               ' VENCIMIENTO_FACTURAS_3,'#10'     DESCUENTO, DESCUENTO_LINEA, PRECIO' +
-              '_PUNTO, ID_AGENTE, DESCUENTO_CAPITULO)'#10'  VALUES'#10'    (:ID_CLIENTE' +
+              '_PUNTO, ID_AGENTE, DESCUENTO_CAPITULO,'#10'     DIST_EMAIL, DIST_PAS' +
-              ', :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMERCIAL, :BLO' +
+              'SWORD, DIST_VALIDEZ, DIST_FORMA_PAGO, DIST_NOTAS, DIST_LOPD, DIS' +
-              'QUEADO,'#10'     :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FO' +
+              'T_CONDICIONES)'#10'  VALUES'#10'    (:ID_CLIENTE, :GRUPO_CLIENTE, :RECAR' +
-              'RMA_PAGO, :TIENDA_WEB,'#10'     :CODIGO_ASIGNADO, :IGNORAR_CONTABILI' +
+              'GO_EQUIVALENCIA, :NOMBRE_COMERCIAL, :BLOQUEADO,'#10'     :MOTIVO_BLO' +
-              'DAD, :PROCEDENCIA_CLIENTE, :TIENE_SUBCUENTA,'#10'     :VENCIMIENTO_F' +
+              'QUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO, :TIENDA_WEB,'#10' ' +
-              'ACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10'   ' +
+              '    :CODIGO_ASIGNADO, :IGNORAR_CONTABILIDAD, :PROCEDENCIA_CLIENT' +
-              '  :DESCUENTO, :DESCUENTO_LINEA, :PRECIO_PUNTO, :ID_AGENTE, :DESC' +
+              'E, :TIENE_SUBCUENTA,'#10'     :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_' +
-              'UENTO_CAPITULO)'#10
+              'FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10'     :DESCUENTO, :DESCUENTO' +
+              '_LINEA, :PRECIO_PUNTO, :ID_AGENTE, :DESCUENTO_CAPITULO,'#10'     :DI' +
+              'ST_EMAIL, :DIST_PASSWORD, :DIST_VALIDEZ, :DIST_FORMA_PAGO, :DIST' +
+              '_NOTAS, :DIST_LOPD, :DIST_CONDICIONES)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -4230,6 +4331,44 @@ object srvContactos: TsrvContactos
             DataType = datFloat
             Value = ''
           end
+          item
+            Name = 'DIST_EMAIL'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_PASSWORD'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_VALIDEZ'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DIST_FORMA_PAGO'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_NOTAS'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_LOPD'
+            DataType = datMemo
+            Value = ''
+          end
+          item
+            Name = 'DIST_CONDICIONES'
+            DataType = datMemo
+            Value = ''
+          end
           item
             Name = 'OLD_ID_CLIENTE'
             Value = ''
@@ -4253,7 +4392,11 @@ object srvContactos: TsrvContactos
               'IMIENTO_FACTURAS_3,'#10'    DESCUENTO = :DESCUENTO,'#10'    DESCUENTO_LI' +
               'NEA = :DESCUENTO_LINEA,'#10'    PRECIO_PUNTO = :PRECIO_PUNTO,'#10'    ID' +
               '_AGENTE = :ID_AGENTE,'#10'    DESCUENTO_CAPITULO = :DESCUENTO_CAPITU' +
-              'LO'#10'  WHERE'#10'    (ID_CLIENTE = :OLD_ID_CLIENTE)'#10
+              'LO,'#10'    DIST_EMAIL = :DIST_EMAIL,'#10'    DIST_PASSWORD = :DIST_PASS' +
+              'WORD,'#10'    DIST_VALIDEZ = :DIST_VALIDEZ,'#10'    DIST_FORMA_PAGO = :D' +
+              'IST_FORMA_PAGO,'#10'    DIST_NOTAS = :DIST_NOTAS,'#10'    DIST_LOPD = :D' +
+              'IST_LOPD,'#10'    DIST_CONDICIONES = :DIST_CONDICIONES'#10'  WHERE'#10'    (' +
+              'ID_CLIENTE = :OLD_ID_CLIENTE)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -137,6 +137,7 @@ contains
   uEditorElegirComerciales in 'uEditorElegirComerciales.pas' {fEditorElegirComerciales: TCustomEditor},
   uViewDatosYSeleccionInstalador in 'uViewDatosYSeleccionInstalador.pas' {frViewDatosYSeleccionInstalador: TFrame},
   uEditorElegirInstaladores in 'uEditorElegirInstaladores.pas' {fEditorElegirInstaladores: TCustomEditor},
-  uEditorAsignarDescuentoCapitulo in 'uEditorAsignarDescuentoCapitulo.pas' {fEditorAsignarDescuentoCapitulo: TCustomEditor};
+  uEditorAsignarDescuentoCapitulo in 'uEditorAsignarDescuentoCapitulo.pas' {fEditorAsignarDescuentoCapitulo: TCustomEditor},
+  uViewClienteDatosDistribuidor in 'uViewClienteDatosDistribuidor.pas' {frViewClienteDatosDistribuidor: TFrame};
 
 end.

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -47,57 +47,64 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\adortl.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
+    <DCCReference Include="..\..\..\Servidor\ApplicationBase.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\..\..\Servidor\Base.dcp" />
-    <DCCReference Include="bdertl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\bdertl.dcp" />
-    <DCCReference Include="Contactos_controller.dcp" />
+    <DCCReference Include="..\..\..\Servidor\Contactos_controller.dcp" />
-    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="..\..\..\Servidor\Contactos_model.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="dclcxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dclcxLibraryD11.dcp" />
-    <DCCReference Include="dcldxCoreD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dcldxCoreD11.dcp" />
-    <DCCReference Include="Delegaciones_controller.dcp" />
+    <DCCReference Include="..\..\..\Servidor\Delegaciones_controller.dcp" />
-    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="..\..\..\Servidor\designide.dcp" />
-    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dsnap.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxComnD11.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPSCoreD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxPSCoreD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPSLnksD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxPSLnksD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="FormasPago_controller.dcp" />
+    <DCCReference Include="..\..\..\Servidor\FormasPago_controller.dcp" />
-    <DCCReference Include="FormasPago_model.dcp" />
+    <DCCReference Include="..\..\..\Servidor\FormasPago_model.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
+    <DCCReference Include="..\..\..\Servidor\GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JclVcl.dcp" />
-    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JSDialog100.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvCoreD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="JvGlobusD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvGlobusD11R.dcp" />
-    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\..\Servidor\JvSystemD11R.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="..\..\..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\rtl.dcp" />
-    <DCCReference Include="tb2k_d10.dcp" />
+    <DCCReference Include="..\..\..\Servidor\tb2k_d10.dcp" />
-    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="..\..\..\Servidor\tbx_d10.dcp" />
-    <DCCReference Include="TiposIVA_controller.dcp" />
+    <DCCReference Include="..\..\..\Servidor\TiposIVA_controller.dcp" />
-    <DCCReference Include="TiposIVA_model.dcp" />
+    <DCCReference Include="..\..\..\Servidor\TiposIVA_model.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vcl.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vclshlctrls.dcp" />
+    <DCCReference Include="..\..\..\Servidor\vclx.dcp" />
+    <DCCReference Include="..\..\..\Servidor\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorAsignarComercial.pas">
       <Form>fEditorAsignarComercial</Form>
@@ -218,6 +225,10 @@
       <Form>frViewClienteDatosComerciales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="uViewClienteDatosDistribuidor.pas">
+      <Form>frViewClienteDatosDistribuidor</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
     <DCCReference Include="uViewClienteDescuentos.pas">
       <Form>frViewClienteDescuentos</Form>
       <DesignClass>TFrame</DesignClass>
@@ -305,13 +316,6 @@
       <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="vclshlctrls.dcp" />
-    <DCCReference Include="vclx.dcp" />
-    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contactos/Views/uEditorCliente.dfm

@@ -70,7 +70,7 @@ inherited fEditorCliente: TfEditorCliente
   inherited pgPaginas: TPageControl
     Width = 1057
     Height = 805
-    ActivePage = pagDatosComerciales
+    ActivePage = pagDistribuidor
     ExplicitWidth = 1057
     ExplicitHeight = 805
     inherited pagGeneral: TTabSheet
@@ -178,16 +178,6 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 428
             Width = 428
           end
-          inherited cbClienteBloqueado: TcxDBCheckBox
-            Top = 375
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 375
-            ExplicitWidth = 538
-            Width = 538
-          end
           inherited eTlfTrabajo: TcxDBTextEdit
             Left = 793
             Top = 30
@@ -200,16 +190,6 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 177
             Width = 177
           end
-          inherited eBloqueo: TcxDBTextEdit
-            Top = 402
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 402
-            ExplicitWidth = 428
-            Width = 428
-          end
           inherited eCodigoAsignado: TcxDBTextEdit
             Top = 111
             Style.LookAndFeel.SkinName = ''
@@ -351,16 +331,15 @@ inherited fEditorCliente: TfEditorCliente
             end
           end
           inherited frViewObservaciones1: TfrViewObservaciones
-            Top = 453
+            Top = 375
             Width = 521
             Height = 127
-            ExplicitTop = 453
+            ExplicitTop = 375
             ExplicitWidth = 521
             ExplicitHeight = 127
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewCliente1.dsContacto
-              ExplicitWidth = 1005
+              ExplicitWidth = 521
-              ExplicitHeight = 308
               Height = 127
               Width = 521
             end
@@ -399,6 +378,7 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     object pagDirecciones: TTabSheet [1]
+      Tag = 1
       Caption = 'Direcciones'
       ImageIndex = 1
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
@@ -432,10 +412,23 @@ inherited fEditorCliente: TfEditorCliente
         inherited ToolBar1: TToolBar
           Width = 1049
           ExplicitWidth = 1049
+          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
     inherited pagPersonal: TTabSheet [2]
+      Tag = 2
       ExplicitWidth = 1049
       ExplicitHeight = 777
       inherited frViewPersonalContacto1: TfrViewPersonalContacto
@@ -468,6 +461,7 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     object pagDatosComerciales: TTabSheet [3]
+      Tag = 3
       Caption = 'Datos comerciales'
       ImageIndex = 4
       inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales
@@ -646,6 +640,7 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     inherited pagDatosBancarios: TTabSheet [4]
+      Tag = 4
       ExplicitWidth = 1049
       ExplicitHeight = 777
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
@@ -697,21 +692,13 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 743
             Width = 743
           end
-          inherited eIBAN: TcxDBTextEdit
-            ExplicitWidth = 782
-            Width = 782
-          end
-          inherited eSWIFT: TcxDBTextEdit
-            ExplicitWidth = 782
-            Width = 782
-          end
         end
       end
     end
     object pagDescuentos: TTabSheet
+      Tag = 5
       Caption = 'Descuentos'
       ImageIndex = 2
-      TabVisible = False
       inline frViewClienteDescuentos1: TfrViewClienteDescuentos
         Left = 0
         Top = 0
@@ -753,9 +740,9 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     object pagContabilidad: TTabSheet
+      Tag = 6
       Caption = 'Contabilidad'
       ImageIndex = 5
-      TabVisible = False
       inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto
         Left = 0
         Top = 0
@@ -828,6 +815,94 @@ inherited fEditorCliente: TfEditorCliente
         end
       end
     end
+    object pagDistribuidor: TTabSheet
+      Tag = 7
+      Caption = 'Datos distribuci'#243'n'
+      ImageIndex = 7
+      inline frViewClienteDatosDistribuidor1: TfrViewClienteDatosDistribuidor
+        Left = 0
+        Top = 0
+        Width = 1049
+        Height = 777
+        Align = alClient
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 0
+        ReadOnly = False
+        ExplicitWidth = 1049
+        ExplicitHeight = 777
+        inherited dxLayoutControl1: TdxLayoutControl
+          Width = 1049
+          Height = 777
+          ExplicitWidth = 1049
+          ExplicitHeight = 777
+          inherited cbEsDistribuidor: TcxDBCheckBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited eUsuario: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 305
+            Width = 305
+          end
+          inherited eContrasena: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 204
+            Width = 204
+          end
+          inherited eBloqueado: TcxDBCheckBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited eFormaPagoDistribuidor: TcxDBMemo
+            ExplicitWidth = 901
+            Width = 901
+          end
+          inherited eValidezDistribuidor: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 855
+            Width = 855
+          end
+          inherited eNotasDistribuidor: TcxDBMemo
+            ExplicitWidth = 952
+            Width = 952
+          end
+          inherited eLOPDDistribuidor: TcxDBMemo
+            ExplicitWidth = 952
+            Width = 952
+          end
+          inherited eCondicionesDistribuidor: TcxDBMemo
+            ExplicitWidth = 952
+            Width = 952
+          end
+          inherited eMotivoBloqueo: TcxDBTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 300
+            Width = 300
+          end
+        end
+      end
+    end
   end
   inherited PnlComentario: TPanel
     Width = 1063
@@ -841,10 +916,18 @@ inherited fEditorCliente: TfEditorCliente
     Left = 16
     Top = 240
   end
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage
+    Left = 536
+    Top = 136
+  end
   inherited StatusBarImages: TPngImageList
     Left = 48
     Top = 248
   end
+  inherited LargeImages: TPngImageList
+    Left = 547
+    Top = 104
+  end
   inherited SmallImages: TPngImageList
     PngImages = <
       item
@@ -1349,9 +1432,15 @@ inherited fEditorCliente: TfEditorCliente
         Name = 'PngImage21'
         Background = clWindow
       end>
+    Left = 483
     Bitmap = {}
   end
+  inherited JvFormStorage: TJvFormStorage
+    Left = 488
+  end
   inherited EditorActionList: TActionList
+    Left = 56
+    Top = 144
     object actGruposCliente: TAction
       Category = 'Acciones'
       Caption = 'Grupos de cliente'

Source/Modulos/Contactos/Views/uEditorCliente.pas

@@ -15,7 +15,7 @@ uses
   uViewDireccionesEntrega, uViewDetallesGenerico, uViewClienteDescuentos,
   uViewContactoDatosBancarios, dxLayoutLookAndFeels,
   uViewClienteDatosComerciales, uDAInterfaces, uViewSubCuentaContacto,
-  uViewPersonalContacto, Grids, DBGrids;
+  uViewPersonalContacto, Grids, DBGrids, uViewClienteDatosDistribuidor;
 
 type
   TfEditorCliente = class(TfEditorContacto, IEditorCliente)
@@ -30,6 +30,8 @@ type
     frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales;
     pagContabilidad: TTabSheet;
     frViewSubCuentaContacto1: TfrViewSubCuentaContacto;
+    pagDistribuidor: TTabSheet;
+    frViewClienteDatosDistribuidor1: TfrViewClienteDatosDistribuidor;
     procedure FormShow(Sender: TObject);
     procedure actGruposClienteExecute(Sender: TObject);
   protected
@@ -46,7 +48,7 @@ implementation
 {$INCLUDE ..\..\..\FactuGES.inc}
 
 uses
-  uEditorItem, uEditorBase, uDataModuleUsuarios, uEditorDBItem, cxDBEdit,
+  uFactuGES_App, uEditorItem, uEditorBase, uDataModuleUsuarios, uEditorDBItem, cxDBEdit,
   uGruposClienteController, uBizGruposCliente, uEditorDBBase, uDialogUtils,
   uClientesController;
 
@@ -70,6 +72,14 @@ begin
   inherited;
   ViewContacto := frViewCliente1;
 
+  pagDescuentos.TabVisible := False;
+  pagDescuentos.Visible := False;
+  pagDescuentos.Enabled := False;
+
+  pagContabilidad.TabVisible := False;
+  pagContabilidad.Visible := False;
+  pagContabilidad.Enabled := False;
+
   {$IFDEF CONTABILIDAD}
 // pagContabilidad.TabVisible := true;
    pagContabilidad.TabVisible := false;
@@ -87,6 +97,20 @@ end;
 procedure TfEditorCliente.FormShow(Sender: TObject);
 begin
   inherited;
+  //Solo se ve la pestaña distribuidor en abeto
+  if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO) then
+  begin
+     pagDistribuidor.Enabled := True;
+     pagDistribuidor.Visible := True;
+     pagDistribuidor.TabVisible := True;
+  end
+  else
+  begin
+     pagDistribuidor.Enabled := False;
+     pagDistribuidor.Visible := False;
+     pagDistribuidor.TabVisible := False;
+  end;
+
   pgPaginas.ActivePageIndex := 0;
 end;
 
@@ -138,12 +162,14 @@ begin
     frViewClienteDescuentos1.dsDetalles.DataTable := (Contacto as IBizCliente).Descuentos.DataTable;
     frViewClienteDatosComerciales1.Contacto := Contacto;
     frViewSubCuentaContacto1.Contacto := Contacto;
+    frViewClienteDatosDistribuidor1.Contacto := Contacto;
   end
   else begin
     frViewDireccionesEntrega1.dsDetalles.DataTable := NIL;
     frViewClienteDescuentos1.dsDetalles.DataTable := NIL;
     frViewClienteDatosComerciales1.Contacto := NIL;
     frViewSubCuentaContacto1.Contacto := NIL;
+    frViewClienteDatosDistribuidor1.Contacto := NIL;    
   end;
 end;
 

Source/Modulos/Contactos/Views/uEditorContacto.dfm

@@ -15,7 +15,7 @@ inherited fEditorContacto: TfEditorContacto
     Width = 924
     Caption = 'Contacto'
     ExplicitTop = 52
-    ExplicitWidth = 632
+    ExplicitWidth = 924
     inherited Image1: TImage
       Left = 897
       ExplicitLeft = 607
@@ -23,7 +23,7 @@ inherited fEditorContacto: TfEditorContacto
   end
   inherited TBXDock: TTBXDock
     Width = 924
-    ExplicitWidth = 632
+    ExplicitWidth = 924
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 370
       inherited TBXItem2: TTBXItem
@@ -83,19 +83,19 @@ inherited fEditorContacto: TfEditorContacto
         Width = 200
       end>
     ExplicitTop = 722
-    ExplicitWidth = 632
+    ExplicitWidth = 924
   end
   inherited pgPaginas: TPageControl
     Width = 918
     Height = 607
     ExplicitTop = 112
-    ExplicitWidth = 626
+    ExplicitWidth = 918
-    ExplicitHeight = 325
+    ExplicitHeight = 607
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 618
+      ExplicitWidth = 910
-      ExplicitHeight = 297
+      ExplicitHeight = 579
     end
     object pagDatosBancarios: TTabSheet
       Caption = 'Datos bancarios'
@@ -127,6 +127,8 @@ inherited fEditorContacto: TfEditorContacto
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 57
+            ExplicitWidth = 114
+            Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
             Left = 560
@@ -137,6 +139,8 @@ inherited fEditorContacto: TfEditorContacto
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 560
             ExplicitTop = 57
+            ExplicitWidth = 112
+            Width = 112
           end
           inherited eCuenta: TcxDBTextEdit
             Top = 84
@@ -145,6 +149,8 @@ inherited fEditorContacto: TfEditorContacto
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 84
+            ExplicitWidth = 194
+            Width = 194
           end
           inherited eDC: TcxDBTextEdit
             Top = 84
@@ -161,14 +167,20 @@ inherited fEditorContacto: TfEditorContacto
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 30
+            ExplicitWidth = 194
+            Width = 194
           end
           inherited eIBAN: TcxDBTextEdit
             Top = 111
             ExplicitTop = 111
+            ExplicitWidth = 782
+            Width = 782
           end
           inherited eSWIFT: TcxDBTextEdit
             Top = 138
             ExplicitTop = 138
+            ExplicitWidth = 782
+            Width = 782
           end
         end
       end
@@ -220,7 +232,7 @@ inherited fEditorContacto: TfEditorContacto
   inherited PnlComentario: TPanel
     Width = 924
     ExplicitTop = 79
-    ExplicitWidth = 632
+    ExplicitWidth = 924
   end
   inherited dsDataTable: TDADataSource [5]
     Left = 168

Source/Modulos/Contactos/Views/uEditorProveedor.dfm

@@ -333,8 +333,6 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitHeight = 228
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewProveedor1.dsContacto
-              ExplicitWidth = 571
-              ExplicitHeight = 20
               Height = 228
               Width = 521
             end
@@ -381,23 +379,11 @@ inherited fEditorProveedor: TfEditorProveedor
           Width = 634
           Height = 403
           ExplicitWidth = 634
-          ExplicitHeight = 406
+          ExplicitHeight = 403
         end
         inherited ToolBar1: TToolBar
           Width = 634
           ExplicitWidth = 634
-          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

Source/Modulos/Contactos/Views/uViewCliente.dfm

@@ -33,6 +33,8 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 6
       ExplicitLeft = 132
       ExplicitTop = 193
+      ExplicitWidth = 181
+      Width = 181
     end
     inherited cbProvincia: TcxDBComboBox
       Left = 132
@@ -77,7 +79,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
+      TabOrder = 14
       ExplicitLeft = 618
       ExplicitWidth = 233
       Width = 233
@@ -106,69 +108,18 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 3
       Width = 143
     end
-    object cbClienteBloqueado: TcxDBCheckBox [9]
-      Left = 22
-      Top = 385
-      Action = actBloqueoCliente
-      DataBinding.DataField = 'BLOQUEADO'
-      DataBinding.DataSource = dsContacto
-      Properties.ImmediatePost = True
-      Properties.NullStyle = nssUnchecked
-      Properties.ValueChecked = 1
-      Properties.ValueUnchecked = 0
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
-      Width = 163
-    end
     inherited eTlfTrabajo: TcxDBTextEdit
       Left = 618
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
+      TabOrder = 13
       ExplicitLeft = 618
       ExplicitWidth = 233
       Width = 233
     end
-    object eBloqueo: TcxDBTextEdit [11]
+    object eCodigoAsignado: TcxDBTextEdit [10]
-      Left = 132
-      Top = 412
-      DataBinding.DataField = 'MOTIVO_BLOQUEO'
-      DataBinding.DataSource = dsContacto
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
-      Width = 113
-    end
-    object eCodigoAsignado: TcxDBTextEdit [12]
       Left = 132
       Top = 109
       DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -193,7 +144,7 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 4
       Width = 227
     end
-    object cbProcedenciaCliente: TcxDBComboBox [13]
+    object cbProcedenciaCliente: TcxDBComboBox [11]
       Left = 132
       Top = 136
       DataBinding.DataField = 'PROCEDENCIA_CLIENTE'
@@ -227,7 +178,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 17
+      TabOrder = 15
       ExplicitLeft = 618
       ExplicitWidth = 233
       Width = 233
@@ -238,7 +189,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
+      TabOrder = 16
       ExplicitLeft = 618
       ExplicitWidth = 233
       Width = 233
@@ -270,7 +221,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
+      TabOrder = 17
       ExplicitLeft = 618
       ExplicitWidth = 204
       Width = 204
@@ -282,7 +233,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 20
+      TabOrder = 18
       ExplicitLeft = 618
       ExplicitWidth = 204
       Width = 204
@@ -293,7 +244,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 21
+      TabOrder = 19
       ExplicitLeft = 618
       ExplicitWidth = 204
       Width = 204
@@ -305,6 +256,8 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       ExplicitLeft = 132
+      ExplicitWidth = 38
+      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 132
@@ -316,12 +269,14 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 11
       ExplicitLeft = 132
       ExplicitTop = 301
+      ExplicitWidth = 256
+      Width = 256
     end
     inherited frViewTienda1: TfrViewTienda
       Left = 523
       Width = 270
       AutoSize = True
-      TabOrder = 22
+      TabOrder = 20
       ExplicitLeft = 523
       ExplicitWidth = 270
       inherited dxLayoutControl1: TdxLayoutControl
@@ -332,15 +287,17 @@ inherited frViewCliente: TfrViewCliente
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 376
+          Width = 376
         end
       end
     end
     inherited frViewObservaciones1: TfrViewObservaciones
-      Top = 469
+      Top = 385
       Width = 585
       Height = 127
-      TabOrder = 23
+      TabOrder = 21
-      ExplicitTop = 469
+      ExplicitTop = 385
       ExplicitWidth = 585
       ExplicitHeight = 127
       inherited memObservaciones: TcxDBMemo
@@ -362,6 +319,8 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 10
       ExplicitLeft = 132
       ExplicitTop = 274
+      ExplicitWidth = 256
+      Width = 256
     end
     inherited cbIdioma: TcxDBLookupComboBox
       Left = 132
@@ -378,12 +337,17 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 12
       ExplicitLeft = 132
       ExplicitTop = 328
+      ExplicitWidth = 256
+      Width = 256
     end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       AutoAligns = [aaHorizontal]
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
           inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
+            inherited dxLayoutControlContactoItem13: TdxLayoutItem
+              Caption = 'Nombre fiscal:'
+            end
             object dxLayoutControlContactoItem24: TdxLayoutItem
               Caption = 'Nombre comercial:'
               Control = eNombreComercial
@@ -413,23 +377,6 @@ inherited frViewCliente: TfrViewCliente
               Visible = True
             end
           end
-          object dxLayoutControlContactoGroup18: TdxLayoutGroup
-            Caption = 'Bloqueo'
-            Visible = False
-            object dxLayoutControlContactoItem26: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              AlignHorz = ahClient
-              Caption = ' '
-              ShowCaption = False
-              Control = cbClienteBloqueado
-              ControlOptions.ShowBorder = False
-            end
-            object dxLayoutControlContactoItem27: TdxLayoutItem
-              Caption = 'Motivo del bloqueo'
-              Control = eBloqueo
-              ControlOptions.ShowBorder = False
-            end
-          end
         end
         inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
           inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
@@ -460,7 +407,6 @@ inherited frViewCliente: TfrViewCliente
     object actBloqueoCliente: TAction
       Category = 'Bloqueo'
       Caption = 'Este cliente est'#225' bloqueado'
-      OnExecute = actBloqueoClienteExecute
     end
   end
 end

Source/Modulos/Contactos/Views/uViewCliente.pas

@@ -22,22 +22,16 @@ type
   TfrViewCliente = class(TfrViewContacto, IViewCliente)
     dxLayoutControlContactoItem24: TdxLayoutItem;
     eNombreComercial: TcxDBTextEdit;
-    dxLayoutControlContactoItem26: TdxLayoutItem;
-    cbClienteBloqueado: TcxDBCheckBox;
-    dxLayoutControlContactoGroup18: TdxLayoutGroup;
-    eBloqueo: TcxDBTextEdit;
     actBloqueoCliente: TAction;
     dxLayoutControlContactoItem22: TdxLayoutItem;
     eCodigoAsignado: TcxDBTextEdit;
     dxLayoutControlContactoItem23: TdxLayoutItem;
     cbProcedenciaCliente: TcxDBComboBox;
-    dxLayoutControlContactoItem27: TdxLayoutItem;
     procedure cbGrupoClientePropertiesInitPopup(Sender: TObject);
     procedure cbGrupoClientePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
-    procedure actBloqueoClienteExecute(Sender: TObject);
     procedure cbProcedenciaClientePropertiesInitPopup(Sender: TObject);
     procedure cbProcedenciaClientePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
@@ -57,12 +51,6 @@ uses
 
 { TfrViewCliente }
 
-procedure TfrViewCliente.actBloqueoClienteExecute(Sender: TObject);
-begin
-  inherited;
-  eBloqueo.Enabled := cbClienteBloqueado.Checked;
-end;
-
 procedure TfrViewCliente.cbGrupoClientePropertiesInitPopup(Sender: TObject);
 begin
   inherited;
@@ -182,7 +170,7 @@ procedure TfrViewCliente.SetContacto(const Value: IBizContacto);
 begin
   inherited;
   if Assigned(FContacto) then
-    eBloqueo.Enabled := cbClienteBloqueado.Checked;
+//    eBloqueo.Enabled := cbClienteBloqueado.Checked;
 end;
 
 end.

Source/Modulos/Contactos/Views/uViewClienteDatosDistribuidor.dfm

@@ -0,0 +1,389 @@
+inherited frViewClienteDatosDistribuidor: TfrViewClienteDatosDistribuidor
+  Width = 1123
+  Height = 650
+  OnCreate = CustomViewCreate
+  OnDestroy = CustomViewDestroy
+  OnShow = CustomViewShow
+  ExplicitWidth = 1123
+  ExplicitHeight = 650
+  object dxLayoutControl1: TdxLayoutControl
+    Left = 0
+    Top = 0
+    Width = 1123
+    Height = 650
+    Align = alClient
+    ParentBackground = True
+    TabOrder = 0
+    TabStop = False
+    AutoContentSizes = [acsWidth]
+    DesignSize = (
+      1123
+      650)
+    object cbEsDistribuidor: TcxDBCheckBox
+      Left = 22
+      Top = 28
+      Action = actEsDistribuidor
+      DataBinding.DataField = 'TIENDA_WEB'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 0
+      Width = 180
+    end
+    object eUsuario: TcxDBTextEdit
+      Left = 91
+      Top = 55
+      DataBinding.DataField = 'DIST_EMAIL'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 3
+      Width = 305
+    end
+    object eContrasena: TcxDBTextEdit
+      Left = 91
+      Top = 82
+      DataBinding.DataField = 'DIST_PASSWORD'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 4
+      Width = 204
+    end
+    object eBloqueado: TcxDBCheckBox
+      Left = 208
+      Top = 28
+      Caption = '   Bloqueado'
+      DataBinding.DataField = 'BLOQUEADO'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 1
+      OnClick = actBloqueoClienteExecute
+      Width = 110
+    end
+    object eFormaPagoDistribuidor: TcxDBMemo
+      Left = 22
+      Top = 196
+      Anchors = [akLeft, akTop, akRight, akBottom]
+      DataBinding.DataField = 'DIST_FORMA_PAGO'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Height = 50
+      Width = 901
+    end
+    object eValidezDistribuidor: TcxDBTextEdit
+      Left = 22
+      Top = 139
+      DataBinding.DataField = 'DIST_VALIDEZ'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 5
+      Width = 855
+    end
+    object eNotasDistribuidor: TcxDBMemo
+      Left = 22
+      Top = 282
+      Anchors = [akLeft, akTop, akRight, akBottom]
+      DataBinding.DataField = 'DIST_NOTAS'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Height = 50
+      Width = 952
+    end
+    object eLOPDDistribuidor: TcxDBMemo
+      Left = 22
+      Top = 368
+      Anchors = [akLeft, akTop, akRight, akBottom]
+      DataBinding.DataField = 'DIST_LOPD'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 8
+      Height = 50
+      Width = 952
+    end
+    object eCondicionesDistribuidor: TcxDBMemo
+      Left = 22
+      Top = 454
+      Anchors = [akLeft, akTop, akRight, akBottom]
+      DataBinding.DataField = 'DIST_CONDICIONES'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 9
+      Height = 100
+      Width = 952
+    end
+    object eMotivoBloqueo: TcxDBTextEdit
+      Left = 421
+      Top = 28
+      DataBinding.DataField = 'MOTIVO_BLOQUEO'
+      DataBinding.DataSource = dsDatosDistribuidor
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 2
+      Width = 300
+    end
+    object dxLayoutGroup1: TdxLayoutGroup
+      ShowCaption = False
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Group10: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        ShowBorder = False
+        object dxLayoutControl1Group8: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Group2: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            ShowBorder = False
+            object dxLayoutControl1Group3: TdxLayoutGroup
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Usuario y contrase'#241'a'
+              object dxLayoutControl1Group7: TdxLayoutGroup
+                ShowCaption = False
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControl1Item4: TdxLayoutItem
+                  Caption = ' '
+                  ShowCaption = False
+                  Control = cbEsDistribuidor
+                  ControlOptions.ShowBorder = False
+                end
+                object dlbloquear: TdxLayoutItem
+                  Enabled = False
+                  ShowCaption = False
+                  Control = eBloqueado
+                  ControlOptions.ShowBorder = False
+                end
+                object dlmotivo: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Motivo de bloqueo:'
+                  Enabled = False
+                  Control = eMotivoBloqueo
+                  ControlOptions.ShowBorder = False
+                end
+              end
+              object dlusuario: TdxLayoutItem
+                Caption = 'email acceso:'
+                Enabled = False
+                Control = eUsuario
+                ControlOptions.ShowBorder = False
+              end
+              object dlcontrasena: TdxLayoutItem
+                Caption = 'Contrase'#241'a:'
+                Enabled = False
+                Control = eContrasena
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dlvalidez: TdxLayoutGroup
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Validez presupuestos por defecto'
+              Enabled = False
+              object dxLayoutControl1Item1: TdxLayoutItem
+                Control = eValidezDistribuidor
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dlformapago: TdxLayoutGroup
+              Caption = 'Forma de pago por defecto'
+              Enabled = False
+              object dxLayoutControl1Item3: TdxLayoutItem
+                Control = eFormaPagoDistribuidor
+                ControlOptions.ShowBorder = False
+              end
+            end
+          end
+          object dlnotas: TdxLayoutGroup
+            Caption = 'Notas por defecto'
+            Enabled = False
+            object dxLayoutControl1Item2: TdxLayoutItem
+              Control = eNotasDistribuidor
+              ControlOptions.ShowBorder = False
+            end
+          end
+        end
+        object dllopd: TdxLayoutGroup
+          Caption = 'LOPD del distribuidor'
+          Enabled = False
+          object dxLayoutControl1Item5: TdxLayoutItem
+            Control = eLOPDDistribuidor
+            ControlOptions.ShowBorder = False
+          end
+        end
+      end
+      object dlcondiciones: TdxLayoutGroup
+        Caption = 'Condiciones por defecto'
+        Enabled = False
+        object dxLayoutControl1Item6: TdxLayoutItem
+          Control = eCondicionesDistribuidor
+          ControlOptions.ShowBorder = False
+        end
+      end
+    end
+  end
+  object dsDatosDistribuidor: TDADataSource
+    Left = 8
+    Top = 8
+  end
+  object ActionListDist: TActionList
+    Left = 8
+    Top = 48
+    object actEsDistribuidor: TAction
+      Category = 'Distribuidor'
+      Caption = '  Este cliente es distribuidor'
+      ImageIndex = 1
+      OnExecute = actEsDistribuidorExecute
+    end
+    object actBloqueoCliente: TAction
+      Category = 'Distribuidor'
+      Caption = 'Este cliente est'#225' bloqueado'
+      OnExecute = actBloqueoClienteExecute
+    end
+  end
+end

Source/Modulos/Contactos/Views/uViewClienteDatosDistribuidor.pas

@@ -0,0 +1,182 @@
+unit uViewClienteDatosDistribuidor;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uViewBase, cxGraphics, DB, uDADataTable, dxLayoutControl,
+  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
+  cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
+  uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
+  uDAInterfaces, uBizFormasPago, uBizTiposIVA, cxCurrencyEdit, uComercialesController,
+  cxMemo, ActnList;
+
+type
+  IViewClienteDatosComerciales = interface(IViewBase)
+    ['{50D671FA-1109-4D7D-B3F8-8E7DCFEB32A4}']
+    function GetContacto: IBizContacto;
+    procedure SetContacto(const Value: IBizContacto);
+    property Contacto: IBizContacto read GetContacto write SetContacto;
+  end;
+
+  TfrViewClienteDatosDistribuidor = class(TfrViewBase, IViewClienteDatosComerciales)
+    dxLayoutControl1: TdxLayoutControl;
+    dxLayoutGroup1: TdxLayoutGroup;
+    dxLayoutControl1Group3: TdxLayoutGroup;
+    dsDatosDistribuidor: TDADataSource;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    cbEsDistribuidor: TcxDBCheckBox;
+    dlvalidez: TdxLayoutGroup;
+    dlformapago: TdxLayoutGroup;
+    dlusuario: TdxLayoutItem;
+    eUsuario: TcxDBTextEdit;
+    dlcontrasena: TdxLayoutItem;
+    eContrasena: TcxDBTextEdit;
+    dlbloquear: TdxLayoutItem;
+    eBloqueado: TcxDBCheckBox;
+    dxLayoutControl1Group7: TdxLayoutGroup;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    eFormaPagoDistribuidor: TcxDBMemo;
+    dxLayoutControl1Item1: TdxLayoutItem;
+    eValidezDistribuidor: TcxDBTextEdit;
+    dlnotas: TdxLayoutGroup;
+    dxLayoutControl1Group2: TdxLayoutGroup;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    eNotasDistribuidor: TcxDBMemo;
+    dxLayoutControl1Item5: TdxLayoutItem;
+    eLOPDDistribuidor: TcxDBMemo;
+    dllopd: TdxLayoutGroup;
+    dxLayoutControl1Group8: TdxLayoutGroup;
+    dlcondiciones: TdxLayoutGroup;
+    dxLayoutControl1Group10: TdxLayoutGroup;
+    dxLayoutControl1Item6: TdxLayoutItem;
+    eCondicionesDistribuidor: TcxDBMemo;
+    dlmotivo: TdxLayoutItem;
+    eMotivoBloqueo: TcxDBTextEdit;
+    ActionListDist: TActionList;
+    actEsDistribuidor: TAction;
+    actBloqueoCliente: TAction;
+    procedure CustomViewCreate(Sender: TObject);
+    procedure CustomViewDestroy(Sender: TObject);
+    procedure cbEsDistribuidorPropertiesEditValueChanged(Sender: TObject);
+    procedure actBloqueoClienteExecute(Sender: TObject);
+    procedure actEsDistribuidorExecute(Sender: TObject);
+    procedure CustomViewShow(Sender: TObject);
+  protected
+    FContacto : IBizContacto;
+    function GetContacto: IBizContacto;
+    procedure SetContacto(const Value: IBizContacto);
+    procedure refrescarVista;
+  public
+    property Contacto: IBizContacto read GetContacto write SetContacto;
+  end;
+
+
+implementation
+
+{$R *.dfm}
+
+uses
+  uRegimenIVAUtils, uFactuGES_App;
+
+{ TfrViewClienteDatosComerciales }
+
+procedure TfrViewClienteDatosDistribuidor.actBloqueoClienteExecute(
+  Sender: TObject);
+begin
+  inherited;
+  dlmotivo.Enabled := eBloqueado.Checked;
+end;
+
+procedure TfrViewClienteDatosDistribuidor.actEsDistribuidorExecute(Sender: TObject);
+begin
+  inherited;
+  refrescarVista;
+end;
+
+procedure TfrViewClienteDatosDistribuidor.cbEsDistribuidorPropertiesEditValueChanged(
+  Sender: TObject);
+begin
+  inherited;
+//
+end;
+
+procedure TfrViewClienteDatosDistribuidor.CustomViewCreate(Sender: TObject);
+begin
+  inherited;
+  FContacto := Nil;
+end;
+
+procedure TfrViewClienteDatosDistribuidor.CustomViewDestroy(Sender: TObject);
+begin
+  inherited;
+  FContacto := Nil;
+end;
+
+procedure TfrViewClienteDatosDistribuidor.CustomViewShow(Sender: TObject);
+begin
+  inherited;
+  refrescarVista;
+end;
+
+function TfrViewClienteDatosDistribuidor.GetContacto: IBizContacto;
+begin
+  Result := FContacto;
+end;
+
+procedure TfrViewClienteDatosDistribuidor.refrescarVista;
+begin
+  if cbEsDistribuidor.Checked then
+  begin
+    dlBloquear.Enabled := True;
+    dlusuario.Enabled := True;
+    dlcontrasena.Enabled := True;
+    dlValidez.Enabled := True;
+    dlFormaPago.Enabled := True;
+    dlNotas.Enabled := True;
+    dlLOPD.Enabled := True;
+    dlCondiciones.Enabled := True;
+  end
+  else
+  begin
+    dlBloquear.Enabled := False;
+    dlusuario.Enabled := False;
+    dlcontrasena.Enabled := False;
+    dlValidez.Enabled := False;
+    dlFormaPago.Enabled := False;
+    dlNotas.Enabled := False;
+    dlLOPD.Enabled := False;
+    dlCondiciones.Enabled := False;
+  end;
+
+  if eBloqueado.Checked then
+     dlmotivo.Enabled := True
+  else
+     dlmotivo.Enabled := False;
+
+end;
+
+procedure TfrViewClienteDatosDistribuidor.SetContacto(const Value: IBizContacto);
+begin
+  FContacto := Value;
+  if Assigned(FContacto) then
+  begin
+    dsDatosDistribuidor.DataTable := FContacto.DataTable;
+    //    eBloqueo.Enabled := cbClienteBloqueado.Checked;
+{    FFormasPago := FFormasPagoController.BuscarTodos;
+    dsFormaPago.DataTable := FFormasPago.DataTable;
+    dsFormaPago.DataTable.Active := True;
+    FTiposIVA := FTiposIVAController.BuscarTodos;
+    dsTiposIVA.DataTable := FTiposIVA.DataTable;
+    dsTiposIVA.DataTable.Active := True;
+    FComerciales := (FComercialesController.BuscarTodos as IBizComercial);
+    dsAgentes.DataTable := FComerciales.DataTable;
+    dsAgentes.DataTable.Active := True;
+}
+  end
+  else begin
+    dsDatosDistribuidor.DataTable := NIL;
+  end
+end;
+
+end.

Source/Modulos/Contactos/Views/uViewClientes.dfm

@@ -20,7 +20,7 @@ inherited frViewClientes: TfrViewClientes
         Width = 22
       end
       object cxGridViewTiendaWeb: TcxGridDBColumn [2]
-        Caption = 'Acceso a tienda web'
+        Caption = 'Distribuidor'
         DataBinding.FieldName = 'TIENDA_WEB'
         PropertiesClassName = 'TcxImageComboBoxProperties'
         Properties.Images = PngImageList
@@ -43,6 +43,9 @@ inherited frViewClientes: TfrViewClientes
         DataBinding.FieldName = 'NOMBRE_COMERCIAL'
         Width = 164
       end
+      inherited cxGridViewNOMBRE: TcxGridDBColumn
+        Caption = 'Nombre fiscal'
+      end
       object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn [8]
         Caption = 'Persona contacto'
         DataBinding.FieldName = 'PERSONA_CONTACTO'

Source/Modulos/Contactos/Views/uViewClientes.pas

@@ -46,9 +46,6 @@ type
     TBXSeparatorItem5: TTBXSeparatorItem;
     TBXItem6: TTBXItem;
     cxGridViewDescuentoCapitulo: TcxGridDBColumn;
-    procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
-      var ADone: Boolean);
     procedure actProcedenciaExecute(Sender: TObject);
     procedure actProcedenciaUpdate(Sender: TObject);
     procedure actPrecioPuntoExecute(Sender: TObject);
@@ -60,6 +57,9 @@ type
     procedure ConfigView; override;
     procedure actPaisExecute(Sender: TObject);
     procedure actPaisUpdate(Sender: TObject);
+    procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      var ADone: Boolean);
   end;
 
 
@@ -192,6 +192,9 @@ begin
   begin
     cxGridViewTIENDA.Visible := False;
     cxGridViewTIENDA.VisibleForCustomization := False;
+
+    cxGridViewTiendaWeb.Visible := True;
+    cxGridViewTiendaWeb.VisibleForCustomization := True;
   end;
 
 //FILTRO DE EMPRESAS COMERCIALES
@@ -208,7 +211,7 @@ begin
   end;
 end;
 
-procedure TfrViewClientes.cxGridViewCODIGOCustomDrawCell(
+procedure TfrViewClientes.cxGridViewICONOCustomDrawCell(
   Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
@@ -219,9 +222,9 @@ begin
   ACanvas.FillRect(R);
   if (cxGridView.DataController.DisplayTexts[AViewInfo.GridRecord.RecordIndex,
     cxGridViewBLOQUEADO.Index] = '1') then
-    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 2)
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 1)
   else
-    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 1);
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 0);
   ADone := True;
 end;
 

Source/Modulos/Contactos/Views/uViewProveedor.dfm

@@ -358,6 +358,9 @@ inherited frViewProveedor: TfrViewProveedor
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
           inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
+            inherited dxLayoutControlContactoItem13: TdxLayoutItem
+              Caption = 'Nombre fiscal:'
+            end
             object dxLayoutControlContactoItem27: TdxLayoutItem
               Caption = 'Nombre comercial:'
               Control = eNombreComercial

Source/Modulos/Contactos/Views/uViewProveedores.dfm

@@ -34,6 +34,9 @@ inherited frViewProveedores: TfrViewProveedores
         Options.HorzSizing = False
         Width = 22
       end
+      inherited cxGridViewNOMBRE: TcxGridDBColumn
+        Caption = 'Nombre fiscal'
+      end
       object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [6]
         Caption = 'Nombre comercial'
         DataBinding.FieldName = 'NOMBRE_COMERCIAL'

Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas

@@ -885,7 +885,7 @@ begin
 
     // Hay que dejar algunos campos como si fuera un contrato nuevo
     Result.Edit;
-    with Result do
+    with (Result as IBizContratoCliente) do
     begin
       ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
       ID_TIENDA := AppFactuGES.TiendaActiva.ID;
@@ -900,6 +900,13 @@ begin
       SITUACION := SITUACION_CONTRATO_PENDIENTE;
 //EL PRECIO PUNTO SIEMPRE SERA ESTABLECIDO POR LA FICHA DEL CLIENTE
 //      PRECIO_PUNTO := AppFactuGES.EmpresaActiva.PRECIO_PUNTO;
+
+      AsignarVendedor;
+//      ID_TIENDA := AppFactuGES.TiendaActiva.ID;
+//      TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
+      ID_INSTALADORIsNull := True;
+      NOMBRE_INSTALADORIsNull := True;
+
     end;
     Result.Post;
   finally

Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas

@@ -42,6 +42,7 @@ type
 
     procedure CalcularImporteTotal;
 
+    procedure AsignarVendedor;    
     function EsNuevo : Boolean;
     function DarListaSituaciones: TStringList;
   end;
@@ -56,7 +57,6 @@ type
     procedure CalcularIVA;
     procedure CalcularRE;
     procedure AsignarTipoIVA (IDTipoIVA : Integer);
-    procedure AsignarVendedor;
 
   protected
     FSeleccionableInterface : ISeleccionable;
@@ -91,6 +91,7 @@ type
 
   public
     function DarListaSituaciones: TStringList;
+    procedure AsignarVendedor;
     function EsNuevo : Boolean;
     procedure CalcularImporteTotal;
     property Cliente : IBizCliente read GetCliente write SetCliente;

Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas

@@ -699,12 +699,10 @@ begin
   begin
     actMandarFabrica.Visible := False;
     actAceptado.Visible := True;
-    actTerminar.Visible := False;
   end
   else begin
     actMandarFabrica.Visible := True;
     actAceptado.Visible := False;
-    actTerminar.Visible := True;
   end;
 
   Contratos.DataTable.Active := True;

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

@@ -45,6 +45,7 @@ type
 
     procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; VerLogotipo: Boolean = true);
     procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; VerLogotipo: Boolean = true);
+    procedure GenerarPDF(AFactura : IBizFacturaCliente; AllItems: Boolean = false; AFirmado: Boolean = False);
 
     procedure RecalcularImportes(AFactura: IBizFacturaCliente);
 
@@ -118,6 +119,7 @@ type
 
     procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; VerLogotipo: Boolean = true);
     procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; VerLogotipo: Boolean = true);
+    procedure GenerarPDF(AFactura : IBizFacturaCliente; AllItems: Boolean = false; AFirmado: Boolean = False);
 
     procedure RecalcularImportes(AFactura: IBizFacturaCliente);
     function EsModificable(AFactura: IBizFacturaCliente; var AComentario: Variant): Boolean;
@@ -152,7 +154,7 @@ uses
   Dialogs, uIntegerListUtils, uIEditorElegirFacturasCliente, uStringsUtils,
   uFormasPagoController, uBizFormasPago,  uTiposIVAController, uBizTiposIVA,
   uBizEjercicios, uRecibosClienteController, uBizRecibosCliente, uTiposOperacionVentaController,
-  uDialogUtils;
+  uDialogUtils, uSistemaFunc;
 
 
 procedure CopiarArticulosAlbaran(AOrigen: IBizDetallesAlbaranCliente;
@@ -1533,6 +1535,64 @@ begin
   end;
 end;
 
+procedure TFacturasClienteController.GenerarPDF(AFactura: IBizFacturaCliente;
+  AllItems, AFirmado: Boolean);
+var
+  AReportController : IFacturasClienteReportController;
+  AFile : String;
+  bEliminado: Boolean;
+  ACausa: Variant;
+
+begin
+  if not Assigned(AFactura) then
+    raise Exception.Create ('Factura no asignado (GenerarPDF)');
+
+  if AFactura.DataTable.Active then
+    AFactura.DataTable.Active := True;
+
+  //En el caso de querer eliminar todos los items del objeto AAlbaran
+  if AllItems then
+  begin
+    with AFactura.DataTable do
+    begin
+      First;
+      while not EOF do
+      begin
+        AFile := EscapeIllegalChars(AFactura.REFERENCIA + ' - ' + AFactura.NOMBRE_CLIENTE);
+        if (not PreguntarFicheroPDFExportar(AFile)) then
+          Next
+        else
+        begin
+          ShowHourglassCursor;
+          try
+            AReportController := TFacturasClienteReportController.Create;
+            AReportController.ExportToPDF(AFactura.ID, AFile, AFirmado);
+          finally
+            AReportController := NIL;
+            HideHourglassCursor;
+          end;
+          Next;          
+        end;
+      end;
+    end;
+  end
+  else
+  begin
+    AFile := EscapeIllegalChars(AFactura.REFERENCIA + ' - ' + AFactura.NOMBRE_CLIENTE);
+    if (not PreguntarFicheroPDFExportar(AFile)) then
+      Exit;
+
+    ShowHourglassCursor;
+    try
+      AReportController := TFacturasClienteReportController.Create;
+      AReportController.ExportToPDF(AFactura.ID, AFile, AFirmado);
+    finally
+      AReportController := NIL;
+      HideHourglassCursor;
+    end;
+  end;
+end;
+
 procedure TFacturasClienteController.GenerarRecibos(AFactura: IBizFacturaCliente);
 var
   AFormasPagoController : IFormasPagoController;

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

@@ -12,6 +12,7 @@ type
   ['{A0F41767-4FF6-4BAE-9FC9-894DD721D756}']
     procedure Preview(const AListaID : TIntegerList; const VerLogotipo: Boolean);
     procedure Print(const AListaID : TIntegerList; const VerLogotipo: Boolean);
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''; const AFirmado: Boolean = False): Boolean;
   end;
 
   TFacturasClienteReportController = class(TControllerBase, IFacturasClienteReportController)
@@ -24,13 +25,14 @@ type
 
     procedure Preview(const AListaID : TIntegerList; const VerLogotipo: Boolean);
     procedure Print(const AListaID : TIntegerList; const VerLogotipo: Boolean);
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''; const AFirmado: Boolean = False): Boolean;
   end;
 
 
 implementation
 
 uses
-  uROTypes, uEditorRegistryUtils, uIEditorFacturasClientePreview,
+  uStringsUtils, uROTypes, uEditorRegistryUtils, uIEditorFacturasClientePreview,
   uEditorPreview, uDataModuleFacturasCliente, uEditorBase, cxControls;
 
 { TFacturasClienteReportController }
@@ -54,6 +56,28 @@ begin
   inherited;
 end;
 
+function TFacturasClienteReportController.ExportToPDF(const AID: Integer; const AFileName: String; const AFirmado: Boolean): Boolean;
+var
+  AStream: Binary;
+begin
+  Result := False;
+  if EsCadenaVacia(AFileName) then
+    Exit;
+
+  ShowHourglassCursor;
+  try
+    AStream := FDataModule.GetRptPDFFactura(AID, AFirmado);
+    try
+      AStream.SaveToFile(AFileName);
+      Result := True;
+    finally
+      FreeAndNil(AStream);
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TFacturasClienteReportController.Preview(const AListaID : TIntegerList; const VerLogotipo: Boolean);
 var
   AStream: Binary;

Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas

@@ -37,6 +37,7 @@ type
 
     // Report
     function GetReport(const AListaID: TIntegerList; const VerLogotipo: Boolean): Binary;
+    function GetRptPDFFactura(const AID: Integer; const Firmado: Boolean = false): Binary;    
   end;
 
 implementation
@@ -44,7 +45,7 @@ implementation
 {$R *.DFM}
 
 uses
-  FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, 
+  FactuGES_Intf, uFactuGES_App, uDataModuleConexion, uDataTableUtils, cxControls, 
   schFacturasClienteClient_Intf, uBizContactos, Dialogs;
 
 { TdmPresupuestos }
@@ -67,6 +68,19 @@ begin
   end;
 end;
 
+function TDataModuleFacturasCliente.GetRptPDFFactura(const AID: Integer; const Firmado: Boolean): Binary;
+var
+  AParam : TIntegerArray;
+begin
+  AParam := TIntegerArray.Create;
+  try
+    AParam.Add(AID);
+    Result := (RORemoteService as IsrvFacturasCliente).GenerarInformeEnPDF(AParam, AppFactuGES.UsuarioActivo.USERNAME, Firmado)
+  finally
+    FreeANDNIL(AParam)
+  end;
+end;
+
 function TDataModuleFacturasCliente.NewItem: IBizFacturaCliente;
 begin
   Result := GetItem(ID_NULO)

Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj

@@ -9,6 +9,9 @@
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" />
+    <Projects Include="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" />
+    <Projects Include="..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" />
     <Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
@@ -18,6 +21,7 @@
     <Projects Include="..\Contactos\Model\Contactos_model.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
     <Projects Include="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" />
+    <Projects Include="..\Contratos de cliente\Model\ContratosCliente_model.dproj" />
     <Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" />
     <Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
     <Projects Include="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" />
@@ -29,8 +33,11 @@
     <Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.dproj" />
     <Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" />
     <Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" />
+    <Projects Include="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" />
     <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" />
+    <Projects Include="..\Recibos de cliente\Data\RecibosCliente_data.dproj" />
+    <Projects Include="..\Recibos de cliente\Model\RecibosCliente_model.dproj" />
     <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
     <Projects Include="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" />
     <Projects Include="..\Relaciones\Contratos de cliente - Recibos de cliente\ConCli_RecCli_relation.dproj" />
@@ -192,6 +199,78 @@
   <Target Name="FacturasCliente_data:Make">
     <MSBuild Projects="Data\FacturasCliente_data.dproj" Targets="Make" />
   </Target>
+  <Target Name="AlbaranesCliente_model">
+    <MSBuild Projects="..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Clean">
+    <MSBuild Projects="..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Make">
+    <MSBuild Projects="..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_data">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Clean">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Make">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ContratosCliente_model">
+    <MSBuild Projects="..\Contratos de cliente\Model\ContratosCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="ContratosCliente_model:Clean">
+    <MSBuild Projects="..\Contratos de cliente\Model\ContratosCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ContratosCliente_model:Make">
+    <MSBuild Projects="..\Contratos de cliente\Model\ContratosCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ContratosCliente_controller">
+    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="ContratosCliente_controller:Clean">
+    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ContratosCliente_controller:Make">
+    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller">
+    <MSBuild Projects="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Clean">
+    <MSBuild Projects="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Make">
+    <MSBuild Projects="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="RecibosCliente_model">
+    <MSBuild Projects="..\Recibos de cliente\Model\RecibosCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="RecibosCliente_model:Clean">
+    <MSBuild Projects="..\Recibos de cliente\Model\RecibosCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="RecibosCliente_model:Make">
+    <MSBuild Projects="..\Recibos de cliente\Model\RecibosCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="RecibosCliente_data">
+    <MSBuild Projects="..\Recibos de cliente\Data\RecibosCliente_data.dproj" Targets="" />
+  </Target>
+  <Target Name="RecibosCliente_data:Clean">
+    <MSBuild Projects="..\Recibos de cliente\Data\RecibosCliente_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="RecibosCliente_data:Make">
+    <MSBuild Projects="..\Recibos de cliente\Data\RecibosCliente_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="RecibosCliente_controller">
+    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="RecibosCliente_controller:Clean">
+    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="RecibosCliente_controller:Make">
+    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="Make" />
+  </Target>
   <Target Name="FacturasCliente_controller">
     <MSBuild Projects="Controller\FacturasCliente_controller.dproj" Targets="" />
   </Target>
@@ -354,24 +433,6 @@
   <Target Name="TiposOperacionVenta_controller:Make">
     <MSBuild Projects="..\Tipos de operacion venta\Controller\TiposOperacionVenta_controller.dproj" Targets="Make" />
   </Target>
-  <Target Name="ContratosCliente_controller">
-    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="" />
-  </Target>
-  <Target Name="ContratosCliente_controller:Clean">
-    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="ContratosCliente_controller:Make">
-    <MSBuild Projects="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" Targets="Make" />
-  </Target>
-  <Target Name="RecibosCliente_controller">
-    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="" />
-  </Target>
-  <Target Name="RecibosCliente_controller:Clean">
-    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="RecibosCliente_controller:Make">
-    <MSBuild Projects="..\Recibos de cliente\Controller\RecibosCliente_controller.dproj" Targets="Make" />
-  </Target>
   <Target Name="ConCli_RecCli_relation">
     <MSBuild Projects="..\Relaciones\Contratos de cliente - Recibos de cliente\ConCli_RecCli_relation.dproj" Targets="" />
   </Target>
@@ -381,14 +442,23 @@
   <Target Name="ConCli_RecCli_relation:Make">
     <MSBuild Projects="..\Relaciones\Contratos de cliente - Recibos de cliente\ConCli_RecCli_relation.dproj" Targets="Make" />
   </Target>
+  <Target Name="PresupuestosCliente_model">
+    <MSBuild Projects="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="PresupuestosCliente_model:Clean">
+    <MSBuild Projects="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PresupuestosCliente_model:Make">
+    <MSBuild Projects="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;Contabilidad_view;AlbCli_FacCli_relation;FacCli_FacProv_relation;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller;FacturasProveedor_view;FacturasProveedor_model;FacturasProveedor_data;FacturasProveedor_controller;TiposOperacionVenta_controller;ContratosCliente_controller;RecibosCliente_controller;ConCli_RecCli_relation" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;AlbaranesCliente_model;AlbaranesCliente_data;ContratosCliente_model;ContratosCliente_controller;AlbaranesCliente_controller;RecibosCliente_model;RecibosCliente_data;RecibosCliente_controller;FacturasCliente_controller;Contabilidad_view;AlbCli_FacCli_relation;FacCli_FacProv_relation;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller;FacturasProveedor_view;FacturasProveedor_model;FacturasProveedor_data;FacturasProveedor_controller;TiposOperacionVenta_controller;ConCli_RecCli_relation;PresupuestosCliente_model" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;AlbCli_FacCli_relation:Clean;FacCli_FacProv_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;FacturasProveedor_view:Clean;FacturasProveedor_model:Clean;FacturasProveedor_data:Clean;FacturasProveedor_controller:Clean;TiposOperacionVenta_controller:Clean;ContratosCliente_controller:Clean;RecibosCliente_controller:Clean;ConCli_RecCli_relation:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;ContratosCliente_model:Clean;ContratosCliente_controller:Clean;AlbaranesCliente_controller:Clean;RecibosCliente_model:Clean;RecibosCliente_data:Clean;RecibosCliente_controller:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;AlbCli_FacCli_relation:Clean;FacCli_FacProv_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;FacturasProveedor_view:Clean;FacturasProveedor_model:Clean;FacturasProveedor_data:Clean;FacturasProveedor_controller:Clean;TiposOperacionVenta_controller:Clean;ConCli_RecCli_relation:Clean;PresupuestosCliente_model:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;AlbCli_FacCli_relation:Make;FacCli_FacProv_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;FacturasProveedor_view:Make;FacturasProveedor_model:Make;FacturasProveedor_data:Make;FacturasProveedor_controller:Make;TiposOperacionVenta_controller:Make;ContratosCliente_controller:Make;RecibosCliente_controller:Make;ConCli_RecCli_relation:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;ContratosCliente_model:Make;ContratosCliente_controller:Make;AlbaranesCliente_controller:Make;RecibosCliente_model:Make;RecibosCliente_data:Make;RecibosCliente_controller:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;AlbCli_FacCli_relation:Make;FacCli_FacProv_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;FacturasProveedor_view:Make;FacturasProveedor_model:Make;FacturasProveedor_data:Make;FacturasProveedor_controller:Make;TiposOperacionVenta_controller:Make;ConCli_RecCli_relation:Make;PresupuestosCliente_model:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas

@@ -9,6 +9,7 @@ type
   IDataModuleFacturasClienteReport = interface
   ['{F498AC70-AA38-4C06-B301-85A4AC0B210B}']
     function GetReport(const AListaID: TIntegerList; const VerLogotipo: Boolean): Binary;
+    function GetRptPDFFactura(const AID: Integer; const Firmado: Boolean): Binary;    
   end;
 
 implementation

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm

@@ -2547,4 +2547,27 @@ object RptFacturasCliente: TRptFacturasCliente
     Left = 488
     Top = 512
   end
+  object frxPDFExport1: TfrxPDFExport
+    ShowDialog = False
+    UseFileCache = True
+    ShowProgress = False
+    OverwritePrompt = False
+    EmbeddedFonts = True
+    PrintOptimized = True
+    Outline = False
+    Background = False
+    HTMLTags = True
+    Author = 'FactuGES'
+    Subject = 'FactuGES'
+    Creator = 'FactuGES'
+    ProtectionFlags = [ePrint, eAnnot]
+    HideToolbar = False
+    HideMenubar = False
+    HideWindowUI = False
+    FitWindow = False
+    CenterWindow = False
+    PrintScaling = False
+    Left = 256
+    Top = 344
+  end
 end

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas

@@ -8,7 +8,8 @@ uses
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
   uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable,
-  FactuGES_Intf, IBCustomDataSet, IBDatabase, IBQuery, frxIBXComponents;
+  FactuGES_Intf, IBCustomDataSet, IBDatabase, IBQuery, frxIBXComponents,
+  frxExportPDF;
 
 type
   TRptFacturasCliente = class(TDataModule)
@@ -60,6 +61,7 @@ type
     DADSInforme347FacturasProveedor: TDADataSource;
     tbl_Informe347FacturasProveedor: TDAMemDataTable;
     schReport: TDASchema;
+    frxPDFExport1: TfrxPDFExport;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
   private
@@ -88,6 +90,7 @@ type
 
   public
     function GenerarFactura(const ListaID : TIntegerArray; const VerLogotipo: Boolean = True): Binary; overload;
+    function GenerarFacturaEnPDF(const ListaID : TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary;
     function GenerarInformeIVA(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturas(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
@@ -164,6 +167,46 @@ begin
   end;
 end;
 
+function TRptFacturasCliente.GenerarFacturaEnPDF(const ListaID: TIntegerArray;
+  const Usuario: AnsiString; const Firmado: Boolean): Binary;
+var
+  i: Integer;
+  AStream : Binary;
+  ARutaFichero, ANombreFichero, LlamadaBat : String;
+begin
+  Result := Binary.Create;
+  try
+    //Inicializamos parametros
+    FVerLogotipo := True;
+
+    //Vamos generando todos y cada uno de los presupuestos recibidos
+    for i := 0 to ListaID.Count - 1 do
+    begin
+      _GenerarFactura(ListaID.Items[i]);
+      ANombreFichero := frxReport.ReportOptions.Name + '_' + FormatDateTime('yyyymmdd_hhnnss_', now) + Usuario;
+      if Firmado then
+         ANombreFichero := ANombreFichero + 'firmado.pdf'
+      else
+         ANombreFichero := ANombreFichero + '.pdf';
+
+      ANombreFichero := DarRutaPDFS + EscapeIllegalChars(ANombreFichero);
+      frxPDFExport1.Stream := Result;
+      frxReport.Export(frxPDFExport1);
+      Result.SaveToFile(ANombreFichero);
+
+      if Firmado then
+      begin
+
+        ARutaFichero := DarRutaFichero(DarRutaInformes, 'firma.bat ', IntToStr(FIdEmpresa));
+        LlamadaBat := ARutaFichero + '"' + ANombreFichero + '"';
+        if ExecAndWait(LlamadaBat) then
+           Result.LoadFromFile(ANombreFichero);
+      end;
+    end;
+  finally
+  end;
+end;
+
 function TRptFacturasCliente.GenerarInformeIVA(const IdEmpresa: Integer; const FechaInicio,
   FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean;
   const ImporteMinimo: Currency): Binary;
@@ -859,6 +902,7 @@ begin
     tbl_Detalles.Active := True;
     tbl_Vencimientos.Active := True;
 
+    FIdEmpresa := tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger;    
     if (tbl_Cabecera.FieldByName('TIPO').AsString = CTE_TIPO_PROFORMA) then
       AInforme := DarRutaFichero(DarRutaInformes, rptFacturaProformaCliente, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString)
     else
@@ -874,7 +918,7 @@ begin
 
     frxReport.LoadFromFile(AInforme, True);
     frxReport.Variables.Variables['VerLogotipo'] := FVerLogotipo;
-    frxReport.ReportOptions.Name := 'Factura ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString;
+    frxReport.ReportOptions.Name := tbl_Cabecera.FieldByName('REFERENCIA').AsString;
     frxReport.PrepareReport(False);
   finally
     FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"

Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas

@@ -32,10 +32,10 @@ type
     procedure DARemoteServiceCreate(Sender: TObject);
     procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
       var aConnectionName: string);
-  private
   protected
     { IsrvFacturasCliente methods }
     function GenerateReport(const FacturaID: TIntegerArray; const VerLogotipo: Boolean): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString;const Firmado: Boolean = false): Binary;
   public
     function DarListaAnos: StringArray;      
   end;
@@ -97,6 +97,18 @@ begin
   ConnectionName := dmServer.ConnectionName;
 end;
 
+function TsrvFacturasCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary;
+var
+  AReportGenerator : TRptFacturasCliente;
+begin
+  AReportGenerator := TRptFacturasCliente.Create(nil);
+  try
+    Result := AReportGenerator.GenerarFacturaEnPDF(ListaID, Usuario, Firmado);
+  finally
+    FreeAndNIL(AReportGenerator);
+  end;
+end;
+
 function TsrvFacturasCliente.GenerateReport(const FacturaID: TIntegerArray; const VerLogotipo: Boolean): Binary;
 var
   AReportGenerator : TRptFacturasCliente;

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm

@@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     Width = 919
     ExplicitWidth = 919
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 711
+      ExplicitWidth = 810
       object TBXSubmenuItem2: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText
@@ -59,6 +59,10 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       inherited TBXItem2: TTBXItem
         Visible = False
       end
+      object TBXItem45: TTBXItem [13]
+        Action = actGenerarPDF
+        DisplayMode = nbdmImageAndText
+      end
     end
     inherited tbxFiltro: TTBXToolbar
       ExplicitWidth = 379
@@ -341,6 +345,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       OnExecute = actAsignarContratoExecute
       OnUpdate = actAsignarContratoUpdate
     end
+    object actGenerarPDF: TAction
+      Caption = 'Generar PDF'
+      ImageIndex = 27
+      OnExecute = actGenerarPDFExecute
+      OnUpdate = actGenerarPDFUpdate
+    end
   end
   inherited SmallImages: TPngImageList [5]
     PngImages = <
@@ -1105,6 +1115,29 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
           00000049454E44AE426082}
         Name = 'PngImage26'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000001F04944415478DA
+          633CC0C0F09F0109C83939313CDAB70F5988C181818191C1600644DD850C4664
+          3946900162D7AEC1053872721838972E85F36F4A4A323818CC60A82CF062689F
+          B00DB7011C1C1C0C9C9C9C0CDFA3A31924B76E65F8F1E307184B7A6E64583825
+          99E1C69DE70C4B561C64F8F1F3EFC5D7EF7F78030D7A8A6280A0A020D890F7C1
+          C10C826BD7824D17745C09D70C03627C2C0C959D5BBF000DD20019023640FDF9
+          7314CD201AE48DF7EFDF3368451D62F075D365D0D19265B872ED3198FEF3F90D
+          C3C2F597B7BEDA17EF0337000440CEC70694DE85810DD9BCEB32DC305878800D
+          00853C08806CFDFEFD3B42674A0A38462E2FDACE90DBF7102CB4A0568361ED49
+          568663276F31BC3D98883000E66474F04A4B8BC1F6DF3F14B182CEDD0CF3363D
+          66F87A3C8591B15842F33F0301D0F5EC2A0ABF6DC6368629EBDE3148311F6760
+          24A479F2A2EDFFB362DC19983E9D67B8BFDC98412AF402C3EC6DCF19E62DDD04
+          4907C41AF0772D1303AB453CC3FD2D0B197823BE307CFFF18BC13FA19A380372
+          FC2480B61B3228DA3330DC3FC8C0C0E27E95E13B83284344663D7106787FF564
+          50F4896760F8BC90E1FD3B06860F9719183EDA3F61482A6C25CE00BD279E18E2
+          CCEEF71872ABBA893320C4D30AE8E7DF0CDFBEFF66F8FAFD17C337A0FF41A0A8
+          AE8F380360218E0D000074D3EB115697A8140000000049454E44AE426082}
+        Name = 'PngImage27'
+        Background = clWindow
       end>
     Left = 395
     Bitmap = {}

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas

@@ -48,6 +48,8 @@ type
     TBXItem44: TTBXItem;
     TBXSeparatorItem18: TTBXSeparatorItem;
     JsListaFacturasNoAsignadas: TJSDialog;
+    actGenerarPDF: TAction;
+    TBXItem45: TTBXItem;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
@@ -61,6 +63,8 @@ type
     procedure actNuevaProformaExecute(Sender: TObject);
     procedure actAsignarContratoExecute(Sender: TObject);
     procedure actAsignarContratoUpdate(Sender: TObject);
+    procedure actGenerarPDFExecute(Sender: TObject);
+    procedure actGenerarPDFUpdate(Sender: TObject);
 
   private
     FFacturas: IBizFacturaCliente;
@@ -215,6 +219,58 @@ begin
 
 end;
 
+procedure TfEditorFacturasCliente.actGenerarPDFExecute(Sender: TObject);
+var
+  ACadena : String;
+  AFacturas: IBizFacturaCliente;
+  AllItems: Boolean;
+  AListaCausas: TStringList;
+  AFirmar: Boolean;
+
+begin
+  inherited;
+  AFacturas := Nil;
+  AFirmar := False;
+  AllItems := False;
+  AListaCausas := TStringList.Create;
+
+  if MultiSelect and Assigned(ViewGrid) then
+     AllItems :=  (ViewGrid.NumSeleccionados > 1);
+
+  if AllItems then
+  begin
+    SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
+    AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+
+    if (Application.MessageBox('¿Desea firmar digitalmente las facturas/abonos de cliente seleccionados?', 'Atención', MB_YESNO) = IDYES) then
+       AFirmar := True;
+  end
+  else
+  begin
+    AFacturas := Facturas;
+
+    if Facturas.TIPO = CTE_TIPO_FACTURA then
+       ACadena := '¿Desea firmar digitalmente esta factura de cliente?'
+    else
+       ACadena := '¿Desea firmar digitalmente este abono a cliente?';
+
+    if (Application.MessageBox(PChar(ACadena), 'Atención', MB_YESNO) = IDYES) then
+       AFirmar := True;
+  end;
+
+  FController.GenerarPDF(AFacturas, AllItems, AFirmar);
+end;
+
+procedure TfEditorFacturasCliente.actGenerarPDFUpdate(Sender: TObject);
+begin
+  inherited;
+  if HayDatos and Assigned(ViewGrid) then
+    (Sender as TAction).Enabled := ViewGrid.EsSeleccionCeldaDatos
+      and (ViewGrid.NumSeleccionados > 0)
+  else
+    (Sender as TAction).Enabled := False;
+end;
+
 procedure TfEditorFacturasCliente.actInformesExecute(Sender: TObject);
 var
   Respuesta : Integer;

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

@@ -631,10 +631,9 @@ begin
 
     // Hay que dejar algunos campos como si fuera un presupuesto nuevo
     Result.Edit;
-    with Result do
+    with (Result as IBizPresupuestoCliente) do
     begin
       ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
-      ID_TIENDA := AppFactuGES.TiendaActiva.ID;
       USUARIO := AppFactuGES.UsuarioActivo.UserName;
       FECHA_PRESUPUESTO := DateOf(Now);
       FECHA_VIGENCIA := IncMonth(Date, AppFactuGES.EmpresaActiva.VALIDEZ_PRESUPUESTOS);
@@ -644,6 +643,10 @@ begin
       FECHA_DECISIONIsNull := True;
       REFERENCIA := '';
       SITUACION := SITUACION_PRESUPUESTO_PENDIENTE;
+
+      AsignarVendedor;
+      ID_TIENDA := AppFactuGES.TiendaActiva.ID;
+      TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
     end;
     Result.Post;
 

Source/Modulos/Presupuestos de cliente/Model/uBizPresupuestosCliente.pas

@@ -34,6 +34,7 @@ type
 
     procedure CalcularImporteTotal;
     
+    procedure AsignarVendedor;
     function EsNuevo : Boolean;
     function DarListaSituaciones: TStringList;
   end;
@@ -44,7 +45,6 @@ type
     procedure CalcularIVA;
     procedure CalcularRE;
     procedure AsignarTipoIVA (IDTipoIVA : Integer);
-    procedure AsignarVendedor;
 
   protected
     FSeleccionableInterface : ISeleccionable;
@@ -80,6 +80,7 @@ type
 
   public
     function DarListaSituaciones: TStringList;
+    procedure AsignarVendedor;
     function EsNuevo : Boolean;
     procedure CalcularImporteTotal;
     property Cliente : IBizCliente read GetCliente write SetCliente;

Source/Modulos/Tipos de operacion venta/TiposOperacionVenta_Group.groupproj

@@ -0,0 +1,124 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{9a7cc043-5043-46ff-a039-c4103c4aa6b2}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
+    <Projects Include="..\..\Base\Base.dproj" />
+    <Projects Include="..\..\Cliente\FactuGES.dproj" />
+    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="Controller\TiposOperacionVenta_controller.dproj" />
+    <Projects Include="Data\TiposOperacionVenta_data.dproj" />
+    <Projects Include="Model\TiposOperacionVenta_model.dproj" />
+    <Projects Include="Plugin\TiposOperacionVenta_plugin.dproj" />
+    <Projects Include="Views\TiposOperacionVenta_view.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="Base">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
+  </Target>
+  <Target Name="Base:Clean">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Base:Make">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Make" />
+  </Target>
+  <Target Name="GUIBase">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="" />
+  </Target>
+  <Target Name="GUIBase:Clean">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GUIBase:Make">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_model">
+    <MSBuild Projects="Model\TiposOperacionVenta_model.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_model:Clean">
+    <MSBuild Projects="Model\TiposOperacionVenta_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_model:Make">
+    <MSBuild Projects="Model\TiposOperacionVenta_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_data">
+    <MSBuild Projects="Data\TiposOperacionVenta_data.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_data:Clean">
+    <MSBuild Projects="Data\TiposOperacionVenta_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_data:Make">
+    <MSBuild Projects="Data\TiposOperacionVenta_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller">
+    <MSBuild Projects="Controller\TiposOperacionVenta_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller:Clean">
+    <MSBuild Projects="Controller\TiposOperacionVenta_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller:Make">
+    <MSBuild Projects="Controller\TiposOperacionVenta_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_view">
+    <MSBuild Projects="Views\TiposOperacionVenta_view.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_view:Clean">
+    <MSBuild Projects="Views\TiposOperacionVenta_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_view:Make">
+    <MSBuild Projects="Views\TiposOperacionVenta_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_plugin">
+    <MSBuild Projects="Plugin\TiposOperacionVenta_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_plugin:Clean">
+    <MSBuild Projects="Plugin\TiposOperacionVenta_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_plugin:Make">
+    <MSBuild Projects="Plugin\TiposOperacionVenta_plugin.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES:Clean">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES:Make">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES_Server">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES_Server:Clean">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES_Server:Make">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;TiposOperacionVenta_model;TiposOperacionVenta_data;TiposOperacionVenta_controller;TiposOperacionVenta_view;TiposOperacionVenta_plugin;FactuGES;FactuGES_Server" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;TiposOperacionVenta_model:Clean;TiposOperacionVenta_data:Clean;TiposOperacionVenta_controller:Clean;TiposOperacionVenta_view:Clean;TiposOperacionVenta_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;TiposOperacionVenta_model:Make;TiposOperacionVenta_data:Make;TiposOperacionVenta_controller:Make;TiposOperacionVenta_view:Make;TiposOperacionVenta_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>

Source/Servicios/FactuGES.RODL

@@ -316,6 +316,18 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="GenerarInformeEnPDF" UID="{638C5010-8F01-46D6-BE08-AC1751B94CE8}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+<Parameter Name="Usuario" DataType="AnsiString" Flag="In" >
+</Parameter>
+<Parameter Name="Firmado" DataType="Boolean" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 </Operations>
 </Interface>
 </Interfaces>

Source/Servicios/FactuGES_Intf.pas

@@ -530,6 +530,7 @@ type
     ['{56B4FFF0-AB1B-46B2-BA16-ABD5360F6311}']
     function GenerateReport(const FacturaID: TIntegerArray; const VerLogotipo: Boolean): Binary;
     function DarListaAnos: StringArray;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary;
   end;
 
   { CosrvFacturasCliente }
@@ -544,6 +545,7 @@ type
 
     function GenerateReport(const FacturaID: TIntegerArray; const VerLogotipo: Boolean): Binary;
     function DarListaAnos: StringArray;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary;
   end;
 
   { IsrvFacturasProveedor }
@@ -2002,6 +2004,25 @@ begin
   end
 end;
 
+function TsrvFacturasCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF');
+    __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('Usuario', TypeInfo(AnsiString), Usuario, []);
+    __Message.Write('Firmado', TypeInfo(Boolean), Firmado, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 { CosrvFacturasProveedor }
 
 class function CosrvFacturasProveedor.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvFacturasProveedor;

Source/Servicios/FactuGES_Invk.pas

@@ -175,6 +175,7 @@ type
   published
     procedure Invoke_GenerateReport(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarListaAnos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
   TsrvFacturasProveedor_Invoker = class(TDataAbstractService_Invoker)
@@ -1041,6 +1042,40 @@ begin
   end;
 end;
 
+procedure TsrvFacturasCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInformeEnPDF(const ListaID: TIntegerArray; const Usuario: AnsiString; const Firmado: Boolean): Binary; }
+var
+  ListaID: FactuGES_Intf.TIntegerArray;
+  Usuario: AnsiString;
+  Firmado: Boolean;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaID := nil;
+  lResult := nil;
+  try
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('Usuario', TypeInfo(AnsiString), Usuario, []);
+    __Message.Read('Firmado', TypeInfo(Boolean), Firmado, []);
+
+    lResult := (__Instance as IsrvFacturasCliente).GenerarInformeEnPDF(ListaID, Usuario, Firmado);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvFacturasCliente', 'GenerarInformeEnPDFResponse');
+    __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;
+
 { TsrvFacturasProveedor_Invoker }
 
 constructor TsrvFacturasProveedor_Invoker.Create;

Source/Servidor/FactuGES_Server.dpr

@@ -160,12 +160,12 @@ uses
   schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
   schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
-  schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas';
+  schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -26,35 +26,41 @@
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
+    <Borland.ProjectType />
     <BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</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">4.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">4.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 23 de abril de 2024 17:43</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">4</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.7.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.7.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 27 de junio de 2024 12:28</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxLibraryD11.bpl">Express Cross Platform Library by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SDACDriver_D11.bpl">RemObjects Data Abstract - CoreLabs SDAC Driver</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="FactuGES_Server.dpr">
       <MainSource>MainSource</MainSource>
     </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">
       <Form>srvEjercicios</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvEmpresas</Form>
       <DesignClass>TDARemoteService</DesignClass>
     </DCCReference>
-		<DCCReference Include="..\ApplicationBase\Idiomas\Model\schIdiomasClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Idiomas\Model\schIdiomasClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Idiomas\Model\schIdiomasServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Idiomas\Model\schIdiomasServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Idiomas\Model\uBizIdiomasServer.pas"/>
+    <DCCReference Include="..\ApplicationBase\Idiomas\Model\uBizIdiomasServer.pas" />
     <DCCReference Include="..\ApplicationBase\Idiomas\Servidor\srvIdiomas_Impl.pas">
       <Form>srvIdiomas</Form>
       <DesignClass>TDataAbstractService</DesignClass>
@@ -63,25 +69,25 @@
       <Form>srvProvinciasPoblaciones</Form>
       <DesignClass>TRORemoteDataModule</DesignClass>
     </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\Configuracion\uTypesConstConfiguration.pas"/>
+    <DCCReference Include="..\Base\Configuracion\uTypesConstConfiguration.pas" />
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
-		<DCCReference Include="..\Base\Utiles\uNumUtils.pas"/>
+    <DCCReference Include="..\Base\Utiles\uNumUtils.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">
       <Form>srvAlbaranesCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Reports\uRptAlbaranesProveedor_Server.pas">
       <Form>RptAlbaranesProveedor</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -90,18 +96,18 @@
       <Form>srvAlbaranesProveedor</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvAlmacenes</Form>
       <DesignClass>TDARemoteService</DesignClass>
     </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">
       <Form>RptComisiones</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -110,21 +116,21 @@
       <Form>srvComisiones</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvContabilidad</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\uBizComercialesServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizComercialesServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizInstaladoresServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizInstaladoresServer.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\uRptEtiquetasContacto_Server.pas">
       <Form>RptEtiquetasContacto</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -133,9 +139,9 @@
       <Form>srvContactos</Form>
       <DesignClass>TDARemoteService</DesignClass>
     </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">
       <Form>RptContratosCliente</Form>
     </DCCReference>
@@ -143,15 +149,15 @@
       <Form>srvContratosCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </DCCReference>
-		<DCCReference Include="..\Modulos\Delegaciones\Model\schDelegacionesClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Delegaciones\Model\schDelegacionesClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Delegaciones\Model\schDelegacionesServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Delegaciones\Model\schDelegacionesServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Delegaciones\Servidor\srvDelegaciones_Impl.pas">
       <Form>srvDelegaciones</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>RptFacturasCliente</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -160,9 +166,9 @@
       <Form>srvFacturasCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>RptFacturasProveedor</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -171,12 +177,12 @@
       <Form>srvFacturasProveedor</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvGestorDocumentos</Form>
       <DesignClass>TDataAbstractService</DesignClass>
@@ -185,14 +191,14 @@
       <Form>srvGestorInformes</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvHistoricoMovimientos</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Reports\uRptInventario_Server.pas">
       <Form>RptInventario</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -201,9 +207,9 @@
       <Form>srvInventario</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Reports\uRptPedidosProveedor_Server.pas">
       <Form>RptPedidosProveedor</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -212,9 +218,9 @@
       <Form>srvPedidosProveedor</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>RptPresupuestosCliente</Form>
     </DCCReference>
@@ -222,10 +228,10 @@
       <Form>srvPresupuestosCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>RptRecibosCliente</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -234,10 +240,10 @@
       <Form>srvRecibosCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>RptRecibosProveedor</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -246,16 +252,16 @@
       <Form>srvRecibosProveedor</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Model\uBizReferenciasServer.pas"/>
+    <DCCReference Include="..\Modulos\Referencias\Model\uBizReferenciasServer.pas" />
     <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
       <Form>srvReferencias</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Reports\uRptRemesasCliente_Server.pas">
       <Form>RptRemesasCliente</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -264,9 +270,9 @@
       <Form>srvRemesasCliente</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Reports\uRptRemesasProveedor_Server.pas">
       <Form>RptRemesasProveedor</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -275,41 +281,41 @@
       <Form>srvRemesasProveedor</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </DCCReference>
-		<DCCReference Include="..\Modulos\Subfamilias\Model\schSubfamiliasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Subfamilias\Model\schSubfamiliasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Subfamilias\Model\schSubfamiliasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Subfamilias\Model\schSubfamiliasServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Subfamilias\Servidor\srvSubfamilias_Impl.pas">
       <Form>srvSubfamilias</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </DCCReference>
-		<DCCReference Include="..\Modulos\Tarifas\Model\schTarifasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tarifas\Model\schTarifasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tarifas\Model\schTarifasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tarifas\Model\schTarifasServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Tarifas\Servidor\srvTarifas_Impl.pas">
       <Form>srvTarifas</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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\Tipos de operacion compra\Model\schTiposOperacionCompraClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de operacion compra\Model\schTiposOperacionCompraClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de operacion compra\Model\schTiposOperacionCompraServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de operacion compra\Model\schTiposOperacionCompraServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Tipos de operacion compra\Servidor\srvTiposOperacionCompra_Impl.pas">
       <Form>srvTiposOperacionCompra</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </DCCReference>
-		<DCCReference Include="..\Modulos\Tipos de operacion venta\Model\schTiposOperacionVentaClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de operacion venta\Model\schTiposOperacionVentaClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de operacion venta\Model\schTiposOperacionVentaServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de operacion venta\Model\schTiposOperacionVentaServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Tipos de operacion venta\Servidor\srvTiposOperacionVenta_Impl.pas">
       <Form>srvTiposOperacionVenta</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </DCCReference>
-		<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">
       <Form>srvUnidadesMedida</Form>
       <DesignClass>TDataAbstractService</DesignClass>
     </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">
       <Form>srvConfiguracion</Form>
       <DesignClass>TDataAbstractService</DesignClass>
@@ -344,14 +350,14 @@
     <DCCReference Include="uServerMainForm.pas">
       <Form>fServerForm</Form>
     </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>
 </Project>
 <!-- EurekaLog First Line

Source/Servidor/uDataModuleServer.pas

@@ -62,6 +62,7 @@ type
 
 
 function DarRutaInformes : String;
+function DarRutaPDFS : String;
 function Encrypt (const Source : string) : String;
 function Decrypt (const Source : string) : String;
 function GetNextAutoinc(AConnection : IDAConnection; const GeneratorName: string): integer;
@@ -82,6 +83,11 @@ begin
   Result := ExtractFilePath(Application.ExeName) + 'Informes' + PathDelim;
 end;
 
+function DarRutaPDFS : String;
+begin
+  Result := ExtractFilePath(Application.ExeName) + 'PDFS' + PathDelim;
+end;
+
 function GetNextAutoinc(AConnection : IDAConnection; const GeneratorName: string): integer;
 var
   ds: IDADataset;

Tools/Midas/midas.bat

@@ -1,2 +1,2 @@
-copy midas.dll %windir%\system32
+@echo off
-regsvr32 %windir%\system32\midas.dll 
+regsvr32 c:\Cliente\midas.dll /s