From c1edaa5e1baa6895a3c680bcba042f645ea63bea Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Fri, 17 May 2019 16:46:16 +0000
Subject: [PATCH] version 2.9.2. Se revisa y deja ok inventario, pedidos
 proveedor y albaranes de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@676 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Base/Base.dpk                          |   6 +-
 Source/Base/Base.dproj                        | 105 ++--
 Source/Base/Utiles/uReferenciasUtils.pas      |  39 ++
 Source/Cliente/FactuGES.dproj                 |   3 +-
 Source/Cliente/FactuGES.rc                    |   8 +-
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 172156 bytes
 Source/Cliente/uPantallaPrincipal.pas         |   4 -
 Source/Informes/1/InfAlbaranCliente.fr3       |   6 +-
 Source/Informes/2/InfAlbaranCliente.fr3       |   8 +-
 Source/Informes/3/InfAlbaranCliente.fr3       |   8 +-
 Source/Informes/4/InfAlbaranCliente.fr3       |   8 +-
 Source/Informes/5/InfAlbaranCliente.fr3       |   8 +-
 Source/Informes/InfPedidoProveedor.fr3        |  19 +-
 .../AlbaranesCliente_controller.dproj         |  10 +-
 .../uAlbaranesClienteController.pas           |  16 +-
 .../uAlbaranesClienteReportController.pas     |  23 +-
 .../Data/uDataModuleAlbaranesCliente.pas      |  13 +-
 .../uIDataModuleAlbaranesClienteReport.pas    |   4 +-
 .../Reports/uRptAlbaranesCliente_Server.pas   |  18 +-
 .../Servidor/srvAlbaranesCliente_Impl.pas     |   7 +-
 .../Views/uEditorAlbaranesCliente.dfm         |   1 -
 .../Views/uEditorAlbaranesCliente.pas         |   5 +-
 .../ContratosCliente_Group.groupproj          |  36 +-
 .../Data/uDataModuleContratosCliente.dfm      |   5 +
 .../Model/schContratosClienteClient_Intf.pas  |  63 +-
 .../Model/schContratosClienteServer_Intf.pas  |  71 ++-
 .../Servidor/srvContratosCliente_Impl.dfm     |  13 +-
 .../Views/uEditorContratosCliente.dfm         |   4 +-
 .../uEditorContratosClienteBeneficios.dfm     |  13 +
 .../Views/uViewContratosClienteBeneficios.dfm |  31 +
 .../Views/uViewContratosClienteBeneficios.pas |  64 ++
 .../uFacturasProveedorController.pas          |  69 +-
 .../Plugin/uPluginFacturasProveedor.pas       |   2 +-
 .../Inventario/Views/uViewInventario.dfm      |   3 +-
 .../Inventario/Views/uViewInventario.pas      | Bin 5629 -> 6306 bytes
 .../Reports/uRptPedidosProveedor_Server.dfm   |  35 +-
 .../Views/uViewDireccionEntregaPedidoProv.pas |   8 +-
 Source/Servicios/FactuGES.RODL                |   2 +
 Source/Servicios/FactuGES_Intf.pas            |   7 +-
 Source/Servicios/FactuGES_Invk.pas            |   6 +-
 Source/Servicios/RODLFile.res                 | Bin 44947 -> 45022 bytes
 Source/Servidor/FactuGES_Server.dpr           |   6 +-
 Source/Servidor/FactuGES_Server.dproj         | 589 +++++++++---------
 Source/Servidor/FactuGES_Server.rc            |  10 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23340 -> 23552 bytes
 45 files changed, 833 insertions(+), 523 deletions(-)
 create mode 100644 Source/Base/Utiles/uReferenciasUtils.pas

diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index 0dfc9ca3..8d931a5c 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -74,7 +74,8 @@ requires
   cxExtEditorsD11,
   cxGridD11,
   cxPageControlD11,
-  dxPSCoreD11;
+  dxPSCoreD11,
+  dxCoreD11;
 
 contains
   uDataTableUtils in 'Utiles\uDataTableUtils.pas',
@@ -106,7 +107,8 @@ contains
   uAppInfoUtils in 'Utiles\uAppInfoUtils.pas',
   uViewConfiguracionRegistryUtils in 'Utiles\ClassRegistry\uViewConfiguracionRegistryUtils.pas',
   uEMailUtils in 'Utiles\uEMailUtils.pas',
-  uDisplayUtils in 'Utiles\uDisplayUtils.pas';
+  uDisplayUtils in 'Utiles\uDisplayUtils.pas',
+  uReferenciasUtils in 'Utiles\uReferenciasUtils.pas';
 
 end.
  
\ No newline at end of file
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 6d02c690..72861d6d 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,6 +44,13 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -58,54 +65,6 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -130,11 +89,53 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewConfiguracionRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
+    <DCCReference Include="Utiles\cxDataD11.dcp" />
+    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxGridD11.dcp" />
+    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="Utiles\cxPageControlD11.dcp" />
+    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Utiles\dbrtl.dcp" />
+    <DCCReference Include="Utiles\dclIndyCore.dcp" />
+    <DCCReference Include="Utiles\designide.dcp" />
+    <DCCReference Include="Utiles\dsnap.dcp" />
+    <DCCReference Include="Utiles\dxCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="Utiles\GUISDK_D11R.dcp" />
+    <DCCReference Include="Utiles\IndyCore.dcp" />
+    <DCCReference Include="Utiles\IndyProtocols.dcp" />
+    <DCCReference Include="Utiles\IndySystem.dcp" />
+    <DCCReference Include="Utiles\Jcl.dcp" />
+    <DCCReference Include="Utiles\JclVcl.dcp" />
+    <DCCReference Include="Utiles\JSDialog100.dcp" />
+    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
+    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
+    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
+    <DCCReference Include="Utiles\JvMMD11R.dcp" />
+    <DCCReference Include="Utiles\JvNetD11R.dcp" />
+    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
+    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
+    <DCCReference Include="Utiles\pckMD5.dcp" />
+    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
+    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
+    <DCCReference Include="Utiles\PluginSDK_D11R.dcp" />
+    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="Utiles\PNG_D10.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\TB2k_D10.dcp" />
+    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
@@ -149,8 +150,16 @@
     <DCCReference Include="Utiles\uMD5.pas" />
     <DCCReference Include="Utiles\uNumUtils.pas" />
     <DCCReference Include="Utiles\uPasswordUtils.pas" />
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
+    <DCCReference Include="Utiles\vcl.dcp" />
+    <DCCReference Include="Utiles\vclactnband.dcp" />
+    <DCCReference Include="Utiles\vcldb.dcp" />
+    <DCCReference Include="Utiles\vcljpg.dcp" />
+    <DCCReference Include="Utiles\VclSmp.dcp" />
+    <DCCReference Include="Utiles\vclx.dcp" />
+    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Base/Utiles/uReferenciasUtils.pas b/Source/Base/Utiles/uReferenciasUtils.pas
new file mode 100644
index 00000000..300efec6
--- /dev/null
+++ b/Source/Base/Utiles/uReferenciasUtils.pas
@@ -0,0 +1,39 @@
+unit uReferenciasUtils;
+
+interface
+
+
+{ Si ARef1 < ARef2 -> Result := -1
+  Si ARef1 = ARef2 -> Result := 0
+  Si ARef1 > ARef2 -> Result := 1 }
+
+function CompararReferencias(const ARef1, ARef2 : String) : Integer;
+
+implementation
+
+uses
+  JclAnsiStrings, cxVariants;
+
+function CompararReferencias(const ARef1, ARef2 : String) : Integer;
+var
+  Aux1, Aux2 : String;
+  AuxInt1, AuxInt2: Double;
+  Rpl : Char;
+begin
+  Rpl := ' ';
+  Aux1 := StrReplaceButChars(ARef1, AnsiDecDigits, Rpl);
+  Aux1 := StrRemoveChars(Aux1, AnsiWhiteSpace);
+  Aux2 := StrReplaceButChars(ARef2, AnsiDecDigits, Rpl);
+  Aux2 := StrRemoveChars(Aux2, AnsiWhiteSpace);
+
+  if StrIsDigit(Aux1) and StrIsDigit(Aux2) then
+  begin
+    AuxInt1 := StrToFloatSafe(Aux1);
+    AuxInt2 := StrToFloatSafe(Aux2);
+    Result := VarCompare(AuxInt1, AuxInt2)
+  end
+  else
+    Result := VarCompare(Aux1, Aux2)
+end;
+
+end.
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 7938b00b..ac694c2a 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,7 +52,8 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.9.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.9.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.9.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.9.2.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>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 830c2d48..f8a70cc0 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,9,0,0
-PRODUCTVERSION 2,9,0,0
+FILEVERSION 2,9,1,0
+PRODUCTVERSION 2,9,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.9.0.0\0"
+              VALUE "FileVersion", "2.9.1.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.9.0.0\0"
+              VALUE "ProductVersion", "2.9.1.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 3cf2b51070b822ce023628a4ffffe819b4f5c45c..156f7d0fa57d43c809d273e9e91823d0bb5eb721 100644
GIT binary patch
delta 488
zcmY+9yGjE=6o$VUlek%fY?*Q)cyEH(i5OHQpkR|eSyYms(GYE{l0qR5AZ(Lt+B|@*
zXlZF_ZRa}#;+dU|!2@Sze*Vij^ZDjZ-re4#deNz2*Yn&Qf2GLbd7yA;q|I%SPa_4I
zeBN>&8CXb=Pd^JOeBW|o2hs`h8B1D*Vlm;CVKG6%tx%OgrII0i)(;>{xolCt0xq?h
zMdN2!qSs55j#(528u7t&>PahkL6P}~20Hv6>YX($xgwR`k2Pjplk~qP;a;Q*>MIN)
zUESCeUU5v5Yc4sGzT=#Z;5PSi-g0B@;cKL~)OPq2>D}&X>^c>7oj{z2qHFUI`|32r
vY0IY1brn$rT!^nFcZVyPHY=+=OEQ`=*Cfw2GpHrLxWd9n2eQl4NT2)yH5Ejd

delta 318
zcmex!fa}73u7(!IElezP>kS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d<
z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX`
zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go
zlZiUWTqdxrJ(vVJmj&oKR1h%Tb{>;5qt5iic}(%s-^^puU^JL6I-kjU`i1#S2|%{t
H0w!+&2$(8$

diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 2f4c5d83..dc090150 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -214,10 +214,6 @@ begin
     if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA) then
        ConfigurarFactuGES1.Visible := False;
   end;
-
-  //perfil logistica
-  if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_LOGISTICA) then
-     Logistica1.Visible := False;
 end;
 
 procedure TfPantallaPrincipal.RefrescarUI;
diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3
index 7c5df8b0..acb4bb5a 100644
--- a/Source/Informes/1/InfAlbaranCliente.fr3
+++ b/Source/Informes/1/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43285,4287407755" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43599,8221861458" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    Memo1.Visible := False;&#13;&#10;    Memo9.Visible := False;&#13;&#10;    Line3.Visible := False;          &#13;&#10;  end;    &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;procedure MemPrecioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    MemPrecio.Visible := False;&#13;&#10;    MemImpTotal.Visible := False;          &#13;&#10;  end;  &#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C13000000204E616D653D22566572496D706F72746573220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="242" Left="0" Top="16" Width="718,101251175" OnBeforePrint="Band2OnBeforePrint">
@@ -22,10 +22,10 @@
     <TfrxReportSummary Name="ReportSummary1" Height="197" Left="0" Top="1442" Width="718,101251175" OnAfterCalcHeight="ReportSummary1OnAfterCalcHeight" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxMemoView Name="Memo8" Left="8" Top="8" Width="129,3859" Height="14,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� TRANSPORTISTA:"/>
       <TfrxMemoView Name="Memo30" Left="9,13389" Top="101,50402" Width="113,3859" Height="18,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� CLIENTE:"/>
-      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="23,45669535" ShowHint="False" Color="14672103"/>
+      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="92,45669535" ShowHint="False" Color="14672103"/>
       <TfrxMemoView Name="Memo9" Left="629,29133858" Top="2" Width="86,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo1" Left="495" Top="2" Width="122,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Entrega a cuenta"/>
-      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="23" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="92" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line4" Left="4" Top="92" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
     </TfrxReportSummary>
diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3
index 4888a913..e002b6ab 100644
--- a/Source/Informes/2/InfAlbaranCliente.fr3
+++ b/Source/Informes/2/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43285,4285923032" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');&#13;&#10;    &#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43599,8217864699" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');&#13;&#10;    &#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    Memo1.Visible := False;&#13;&#10;    Memo9.Visible := False;&#13;&#10;    Line3.Visible := False;          &#13;&#10;  end;    &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;procedure MemPrecioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    MemPrecio.Visible := False;&#13;&#10;    MemImpTotal.Visible := False;          &#13;&#10;  end;  &#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="242" Left="0" Top="16" Width="718,101251175" OnBeforePrint="Band2OnBeforePrint">
@@ -12,7 +12,7 @@
       <TfrxMemoView Name="DatosCliente" Left="304" Top="81" Width="412" Height="108,47248" OnBeforePrint="DatosClienteOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" AllowHTMLTags="True" Color="16777215" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" GapX="5" GapY="3" ParentFont="False" WordBreak="True" Text=""/>
     </TfrxPageHeader>
     <TfrxMasterData Name="BandaDetalles" Height="19,11812" Left="0" Top="318" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
-      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="18" OnBeforePrint="MemPrecioOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
       <TfrxMemoView Name="MemImpTotal" Left="627,05511811" Top="0" Width="89,16535189" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="11,33859" Top="0" Width="388,85065" Height="18" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" ParentFont="False" WordBreak="True" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
       <TfrxMemoView Name="MemCantidad" Left="491,92" Top="0" Width="47,15" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
@@ -20,10 +20,10 @@
     <TfrxReportSummary Name="ReportSummary1" Height="197" Left="0" Top="1442" Width="718,101251175" OnAfterCalcHeight="ReportSummary1OnAfterCalcHeight" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxMemoView Name="Memo8" Left="8" Top="8" Width="129,3859" Height="14,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� TRANSPORTISTA:"/>
       <TfrxMemoView Name="Memo30" Left="9,13389" Top="101,50402" Width="113,3859" Height="18,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� CLIENTE:"/>
-      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="23,45669535" ShowHint="False" Color="14672103"/>
+      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="92,45669535" ShowHint="False" Color="14672103"/>
       <TfrxMemoView Name="Memo9" Left="629,29133858" Top="2" Width="86,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo1" Left="495" Top="2" Width="122,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Entrega a cuenta"/>
-      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="23" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="92" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line4" Left="4" Top="92" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
     </TfrxReportSummary>
diff --git a/Source/Informes/3/InfAlbaranCliente.fr3 b/Source/Informes/3/InfAlbaranCliente.fr3
index 60cec4d7..507b9d83 100644
--- a/Source/Informes/3/InfAlbaranCliente.fr3
+++ b/Source/Informes/3/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43285,4284284491" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43599,8214549884" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    Memo1.Visible := False;&#13;&#10;    Memo9.Visible := False;&#13;&#10;    Line3.Visible := False;          &#13;&#10;  end;    &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;procedure MemPrecioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    MemPrecio.Visible := False;&#13;&#10;    MemImpTotal.Visible := False;          &#13;&#10;  end;  &#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="242" Left="0" Top="16" Width="718,101251175" OnBeforePrint="Band2OnBeforePrint">
@@ -14,7 +14,7 @@
       <TfrxMemoView Name="Memo24" Align="baRight" Left="626,101251175" Top="220" Width="92" Height="22" ShowHint="False" Color="14672103" Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
     </TfrxPageHeader>
     <TfrxMasterData Name="BandaDetalles" Height="19,11812" Left="0" Top="318" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
-      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="538,07" Top="0" Width="87" Height="18" OnBeforePrint="MemPrecioOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
       <TfrxMemoView Name="MemImpTotal" Left="627,05511811" Top="0" Width="89,16535189" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="11,33859" Top="0" Width="388,85065" Height="18" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" ParentFont="False" WordBreak="True" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
       <TfrxMemoView Name="MemCantidad" Left="491,92" Top="0" Width="47,15" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
@@ -22,10 +22,10 @@
     <TfrxReportSummary Name="ReportSummary1" Height="197" Left="0" Top="1442" Width="718,101251175" OnAfterCalcHeight="ReportSummary1OnAfterCalcHeight" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxMemoView Name="Memo8" Left="8" Top="8" Width="129,3859" Height="14,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� TRANSPORTISTA:"/>
       <TfrxMemoView Name="Memo30" Left="9,13389" Top="101,50402" Width="113,3859" Height="18,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� CLIENTE:"/>
-      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="23,45669535" ShowHint="False" Color="14672103"/>
+      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="92,45669535" ShowHint="False" Color="14672103"/>
       <TfrxMemoView Name="Memo9" Left="629,29133858" Top="2" Width="86,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo1" Left="495" Top="2" Width="122,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Entrega a cuenta"/>
-      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="23" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="92" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line4" Left="4" Top="92" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
     </TfrxReportSummary>
diff --git a/Source/Informes/4/InfAlbaranCliente.fr3 b/Source/Informes/4/InfAlbaranCliente.fr3
index 720ff25a..10de4957 100644
--- a/Source/Informes/4/InfAlbaranCliente.fr3
+++ b/Source/Informes/4/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43285,4282570139" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');&#13;&#10;    &#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43599,8210240278" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');&#13;&#10;    &#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    Memo1.Visible := False;&#13;&#10;    Memo9.Visible := False;&#13;&#10;    Line3.Visible := False;          &#13;&#10;  end;    &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;procedure MemPrecioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    MemPrecio.Visible := False;&#13;&#10;    MemImpTotal.Visible := False;          &#13;&#10;  end;  &#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="242" Left="0" Top="16" Width="718,101251175" OnBeforePrint="Band2OnBeforePrint">
@@ -12,7 +12,7 @@
       <TfrxMemoView Name="DatosCliente" Left="304" Top="81" Width="412" Height="108,47248" OnBeforePrint="DatosClienteOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" AllowHTMLTags="True" Color="16777215" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" GapX="5" GapY="3" ParentFont="False" WordBreak="True" Text=""/>
     </TfrxPageHeader>
     <TfrxMasterData Name="BandaDetalles" Height="19,11812" Left="0" Top="318" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
-      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="18" OnBeforePrint="MemPrecioOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.ThousandSeparator="." DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
       <TfrxMemoView Name="MemImpTotal" Left="627,05511811" Top="0" Width="89,16535189" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="11,33859" Top="0" Width="388,85065" Height="18" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" ParentFont="False" WordBreak="True" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
       <TfrxMemoView Name="MemCantidad" Left="491,92" Top="0" Width="47,15" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="DejaVu Sans Mono" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
@@ -20,10 +20,10 @@
     <TfrxReportSummary Name="ReportSummary1" Height="197" Left="0" Top="1442" Width="718,101251175" OnAfterCalcHeight="ReportSummary1OnAfterCalcHeight" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxMemoView Name="Memo8" Left="8" Top="8" Width="129,3859" Height="14,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� TRANSPORTISTA:"/>
       <TfrxMemoView Name="Memo30" Left="9,13389" Top="101,50402" Width="113,3859" Height="18,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� CLIENTE:"/>
-      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="23,45669535" ShowHint="False" Color="14672103"/>
+      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="92,45669535" ShowHint="False" Color="14672103"/>
       <TfrxMemoView Name="Memo9" Left="629,29133858" Top="2" Width="86,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo1" Left="495" Top="2" Width="122,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Entrega a cuenta"/>
-      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="23" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="92" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line4" Left="4" Top="92" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
     </TfrxReportSummary>
diff --git a/Source/Informes/5/InfAlbaranCliente.fr3 b/Source/Informes/5/InfAlbaranCliente.fr3
index ca61f843..03c7d9f0 100644
--- a/Source/Informes/5/InfAlbaranCliente.fr3
+++ b/Source/Informes/5/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43285,4278553588" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="43599,8201972106" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ATexto : string;                                           &#13;&#10;begin&#13;&#10;  ATexto := '';                                                       &#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;&#13;&#10;  DatosCliente.Lines.Add('&#60;b&#62;' + &#60;frxDBCabecera.&#34;NOMBRE&#34;&#62; + '&#60;/b&#62;');                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CALLE&#34;&#62; &#60;&#62; '') then                 &#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;     or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;     ATexto := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;     if ATexto &#60;&#62; '' then&#13;&#10;        ATexto := ATexto + ' ';                                                                                               &#13;&#10;     ATexto := ATexto + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;                                                                          &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;                   &#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  ATexto := '';    &#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') or&#13;&#10;     (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then                                   &#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then                          &#13;&#10;        ATexto := 'Tlf: ' + &#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;;&#13;&#10;&#13;&#10;     if (&#60;frxDBCabecera.&#34;MOVIL&#34;&#62; &#60;&#62; '') then&#13;&#10;     begin                 &#13;&#10;       if ATexto &#60;&#62; '' then&#13;&#10;          ATexto := ATexto + ' / ';&#13;&#10;       ATexto := ATexto + 'Móvil: ';            &#13;&#10;       ATexto := ATexto + &#60;frxDBCabecera.&#34;MOVIL&#34;&#62;;&#13;&#10;     end;                        &#13;&#10;     DatosCliente.Lines.Add(ATexto);&#13;&#10;  end;&#13;&#10;        &#13;&#10;  ATexto := '';                                                  &#13;&#10;//  if (&#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62; &#60;&#62; '') then&#13;&#10;//      ATexto := 'NIF/CIF: ' + &#60;frxDBCabecera.&#34;NIF_CIF&#34;&#62;;&#13;&#10;  &#13;&#10;  if ATexto &#60;&#62; '' then&#13;&#10;       ATexto := ATexto + '  ';    &#13;&#10;  ATexto := ATexto + 'Cód. cliente: ' + &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;  &#13;&#10;  DatosCliente.Lines.Add(ATexto);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FreeSpace &#62; ReportSummary1.Height then    &#13;&#10;    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;&#13;&#10;&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    Memo1.Visible := False;&#13;&#10;    Memo9.Visible := False;&#13;&#10;    Line3.Visible := False;          &#13;&#10;  end;  &#13;&#10;    &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('ORDEN DEVOLUCIÓN')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('ALBARÁN')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//Es peor el remedio que la enfermedad, en el caso de sobre pasar en uno el numero de conceptos para que no quepa el reportsumary,&#13;&#10;//no hay forma de ponerlo al final en la p঩na siguiente hasta que el numero de conceptos rellene al menos un concepto de la siguiente hoja.                                                                                                                                                                                                                                                                                                                                    &#13;&#10;//  if Engine.FreeSpace &#62; ReportSummary1.Height then&#13;&#10;//    Engine.CurY := Engine.PageHeight - ReportSummary1.Height - PageFooter1.Height - 1;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Engine.FinalPass) then &#13;&#10;  begin  &#13;&#10;      if (&#60;Page&#62; &#60; &#60;TotalPaginas&#62;) then   // &#60;- lo mejor para saber si es la última página o no&#13;&#10;      begin&#13;&#10;         LineaCorta0.visible := False;&#13;&#10;         LineaLarga0.visible := True;         &#13;&#10;         LineaCorta1.visible := False;&#13;&#10;         LineaLarga1.visible := True;         &#13;&#10;         LineaCorta3.visible := False;&#13;&#10;         LineaLarga3.visible := True;&#13;&#10;        end&#13;&#10;      else begin&#13;&#10;         LineaCorta0.visible := True;  &#13;&#10;         LineaLarga0.visible := False;         &#13;&#10;         LineaCorta1.visible := True;&#13;&#10;         LineaLarga1.visible := False;&#13;&#10;         LineaCorta3.visible := True;  &#13;&#10;         LineaLarga3.visible := False;         &#13;&#10;      end&#13;&#10;  end;                        &#13;&#10;end;&#13;&#10;&#13;&#10;procedure MemPrecioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not &#60;VerPrecios&#62; then&#13;&#10;  begin&#13;&#10;    MemPrecio.Visible := False;&#13;&#10;    MemImpTotal.Visible := False;          &#13;&#10;  end;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C12000000204E616D653D2256657250726563696F73220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="242" Left="0" Top="16" Width="718,101251175" OnBeforePrint="Band2OnBeforePrint">
@@ -14,7 +14,7 @@
       <TfrxPictureView Name="Picture1" Left="0" Top="3" Width="240" Height="71" ShowHint="False" Picture.PropData="04446174610AD26300000A544A504547496D616765C3630000FFD8FFE000104A46494600010200006400640000FFEC00114475636B79000100040000003C0000FFEE002641646F62650064C0000000010300150403060A0D00001927000032CB00004BC6000063C1FFDB0084000604040405040605050609060506090B080606080B0C0A0A0B0A0A0C100C0C0C0C0C0C100C0E0F100F0E0C1313141413131C1B1B1B1C1F1F1F1F1F1F1F1F1F1F010707070D0C0D181010181A1511151A1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1FFFC20011080124032003011100021101031101FFC400E70001000203010101000000000000000000000607040508030201010100000000000000000000000000000000100000060102040503040202030000000001020304050600102030121334113314351631321540602436212370B0802225110001020302060C0B0604060203000000010203001104211210203141516130718191B1D1223252721323A1C1E14262B2C23353730582A2831424346092D24340F1E263A315F0B37080441201000000000000000000000000000000B0130100010302050402030101010101000001110021314151102061718130F091A1B1C140D1F160E1B07080FFDA000C03010002110311000001B5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011A36A6C000000000000000000000000000000000000000000000000000000000000000000000000014C9242C200000000000000000000000000000000000000000000000000000000000000000000000031083162000000000000000000000000000000000000000000000000000000000000000000000000022A6393200000000000000000000000000000000000000000000000000000000000000000000000023E5464C0B300000000000000000000000000000000000000000000000000000000000000000000000310A58FA2685785A04A4C80000000000000000000000000000000000000000000000000000000000000000000002913545F47A1E455C609748000000000000000000000000000000000000000000000000000000000000000000001CEE5B24BC02B53684D80000001A220445CD51E2659BE26E4E8FB3C0ACC1681F600001A7200454D49E4659BD2664ECF600000007990821847CC23F4D99282C137C0891192444C4022C454DF13535A56C444D61E86DC9796219C0000000000A64999323F4D61CFC4F8B58000006214E9033F003F4FC00DD1779B239901D487B0001E05445767C807E9F801B22E4268000002225326A403F41F80FA2C52DF2A72B12C62E400AACAA49F1382923181FA7E006517313A0000000002085204EC9115396516D1FA00001AE2813487B16213A37C7B18445CAD88A9905DC5120EA43D8006BCA10D01EE5844E8DF9EC609172B622C7E96B16980002BC29A3E4DF16512C3667C9A721256A6113137656658C5C801559549BD34C7A16813B36A7811A2AE2287E97713B000000001CEC694E8D22852C5F84B800003CCE7B23A6F4BD0DC8000056E53E651860EA43D803C0E7B340488BC4DB8000056A5427C972962800879439F25A25AE7D0000300A308B99861963172005565520CD2FF0037C0007E14C15E99474919C00001F26A4CC21652A5B659E468E7A2E92C100000AB0AA0DA9D0E6700000015B94E807521EC014E95B9213A04C80000002B529F3DCE903660F139B4D696896C80000018E73D9A1058C5C8015595482EB27E00001E67389A72DB2CF0000011429C34648CE853E8C53980B54B44FB0003C4E6730CBD89A0000000073F91507521EC0D61CD87C9D186F000000002AF3049892D05725366ECE8D3E800000011D39E0FC2C62E400AACAA4CA3A70F40000015815212A3A00000000A0C8A9689926D4919CF84BC8A9D1A7A800869439B43A5800000000424A2C1D487B02B22A22605F4000000000000504448B7CB2C0000000073E9172C62E400AACAA49617F00000011739F4CD3A74000000A0C951691F86B48D95E1EE7A96A9B90015615413B2EF0000000018673083A90F6051A41CB68B40000000000000E6130CE87246000000002A82AC2C62E400AACAA49E1770000001A939ACFD3AA0FD00000831A52D23F400578684B8400014F15B16596F8000000001CB6789D487B039F08C17693D000000000001F072C9F874B9B30000000015C94D963172005565524F8BB0000000D69CCE0EA73EC0001E273817792600035E4749900002A22B22C72E3000000001F272D1F07521EC0E7E22C5D64FC000000000007E1CB27C1D266DC0000000056A53E58C5C8015595493E2EC00000035A73383A9CFB000055861170000034E53E5F00000AE0A709817D000000000D29CDE0EA43D81499012D02DA00000000000039B0D417D92F0000000014C95D963172005565524F8BB0000000D69CCE0EA73EC000D69409D0E6480003C4E6D3A5CFD00034473919074D190000000015715303A90F6057A52E6E8E8F3F40000000000052E57A5965BE00000001F07349AE2C62E400AACAA49F1760000001AD399C1D4E7D8001481362720000039A4E8C3280001CF4468B68B400000001867379820EA43D818C7349885CC5880000000FC2A130CB0495023073E19674899C0000000AD4A7C163172005565524F8BB0000000D69CCE0EA73EC00458AB8BE8000000A50B4CDC000022A5007A17E928000001E650E44403A90F600AE0A70F62FA25400000054A55E6E0E8C3D8028A2144B4BE0F5000001172833C4163172005565524F8BB0000000D69CCE0EA73EC0073F1751B70000002B325049000002AA2AA3DCB80B08FD0003525284589391807521EC002942007B16E9631FA0006215115E9907409210018473C9A824E5D46E400015F94E1E64848D963172005565524F8BB0000000D69CCE0EA73EC02086B8B300000001163C497800000AA0AB4FC3724DCDE9EA6BC8A10C3CC981721CD60EA43D8007E14E95C03724E8DE1F66B88D10B31CCE2F524E0000D51431A33EC9912B364799A321268CF52EB23A56258C5C8015595493E2EC00000035A73383A9CFB07E14E1719FA0000000D491F26C000000444A908F000032CB40B34C239901D487B00002165466940001EA4F8B60CF000001E055857063000024E5C4484A8CAC4B18B9002AB2A927C5D80000006B4E6707539F608D1B536000000001E44349B8000000047C8A9A93C8CB2444C4F707C1A506F0FD00000FC230458D69F8671BF25865800000000C7224478C13E8DA92C2420180609986C40304C1328D90000001F06981BC00F33D0000000000D41B70000000000000000000000000000000000000000000000000000000000000000000000000000000003E0D19BF001AB3680D11B93D0023647413D324023E46413136A01E0400F425E6CC00688DC9E8003C08018A4BC9080011A23E671363F40047491000D290627C6D4007E18467031CFC3240008F1103289F9EE0000000000F12BB2CA001481661232B927865007915A13F3607E805605847A1EE7D006B8859372AC2E10015C13D32803E4A7CB40D815D9B725E002AD2C934647CB140055A5A4002A62D42304B0006B0AD4B7415912824A00226690B14C02AE2DF3EC000000000F12BB2CA001561F25804389E194002B42C2324005607A1F44D0DA806B8AC4941192DD0015C13D328022A7C12D00AA0B5C00556484D29BC262002AD2D20010F3485947E800899062D6324AA4DF93D0015396C00450FC2580000000007895D965000AACB48A94CA2C83280056858464800AC0B10F43D4FA00D71591F85BC7E800AE09E99401143F096005505AE002AD3C4991260002AD2D200023C440B40005764D0811944CC81166800A9CB6002287E12C0000000003C4AECB28005565A87814297B994002B42C2324005605847D9EE7D806B8889927B92F0015C13D32803E4A7CB48CF2BC36C4B80055C5A05465AE7B000AB4B48004009E15216F000AC4B38AE4C62CF2B02CF001113505886015796E9F60000000007C1A337E0023848C1AF330F4001A03787D8008F11A04C8DA00781AC37445095800D11B93D0007815F1824D09100011D244611AF37A0023A48800474851601B70011E2427818E6791E2420004788599858264000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFDA0008010100010502FF00C2677628A6A66520D1EA5FB89E535F82D5DAF3B8F71FB85DADD06B537524EFF71D9D7E942D492E485FDC3213B1AC726EC2B49057A41CBB27EDF76ED06884ADA5EBB1AAC61DD3F7D5C62E24D18A9B4420AC093E49172DD7FDBD6378BC84B44422CF9F366C8B64554FA89B66C9B74EE51A9A66A91DC377DFB7517E763335C7E0F92D6EEE0A0DA09689731FC27F371AC71D5D951C5ACB34AE1A4E44F9EB5E627312A9E37B74BA58C6E0C16C22845098E15E8A1F390CF9C8610DCC4DEFA5A3D883BBB1B16B34D2B8692913E7AD7B89CC4AA78DEDD2E9632B9315712592589C25144D323DB7C7218E2E328A629392EA60BE7A38120FCB88D8665216975725C8F9B8E7DACDCFFE2CFF00390C85B17E4D7D67273F179F390C86B20493AC7D22CD8A6F6EAA88AD60985B05F3D1C2C9481310B34CA38CAEA51C68F9A3C4F8D6A88141D41AB0044C040747F22D18A32720AC83CA7C4A807E03A74DDAA32D6B74E47811D2EF63D4889A6B24948761A23E4ED5D74504A5ADCBAC26318C3BD9483C64A43599B3EE0CCD8DAC7E3F947AF8FBC044061AD8AA229A89A84BC79F949EFF005BCFD3297EEB3F624E3C1C385DC2BB9BB970D9582B324F78D6F90E830CA9B15D77D6F72F5AAAA2AA2A6AD571159200000DEFDFB762DA5259D48AF8922AACA47D31C280DAB70E8011B374F394B8AC7B15B1DD462D6C93AE4831D105D641567329C943E88F93B1F3E6EC5BCB4C3A925B12455594614C70A037ADC320046CDD3CE52E2B1EC56C79508B5B24EBB20C35AED984C3BAC763F4B82222391D0AFE4059D318A788C4C62380420619248D8E20A257C7F4A0C74CDCB5572027948F56EA629D4CA4F7FADE7E99132431EA1CE750E83759C2B1D4C2F837888C6F80428628D9BA98F2AD12E025ABAF63F401101ACCE8BD4F893B21EBA4914545958B8F4D832BA25CD1D9543F3426F5142249CDCBA924EF22A21D492D1B12CE3D2DF3B564D6010128B674B3653447C9D575D241198965A49D643C23A92563A2D9C7A5BE76AC4540404072AB382E09B2C735F8F6C2222390555E70294A52EE7AC5ABD466A09C46A98A3A59443293DFEB79FA68CDA2EEDC44C3B68D43688008596BC0D346CE156CBB1769BB69BCC3E058A924A41ABA78D9AA7659C4536195088E52E5911EAC2E5294F18DDF729410D2363D67EED932419B7E0DA608154F547C9D6DF2DD55B2162149274DDBA2DD1E0DA604152622B288AB1AF88F9968B2C9A28C8BE55F3CCAAC101F84E1BA2E11998A5235DE949EFF005BCFD34A8C6020CF7A899144E5981983FCA4BCF14F80FE080EB4BBC7AE5DE41451A45E94A52971D25D66B9475339C9B965488A4EDCA8E9CE55A341A47F0EC719E8243447C9D249E032627398E700111868D2C7B1E1BDA6751CFC21CE40C3B98C2E9737DD36990F1E2FE40A5290BC29E8C07F1FA527BFD6F3F4C6A80AEE5321532702ECD3C53CAC38E8CCF06C7149C7BB4D33A876A958E1920B82A9E2570883E37948E719268F4646967109049E9916C9285552D96C73D188C8C6BEAE43E9C4B733EBC5E88F93A5D9D782195667EA25BF436873D799CA534E56FC4B233F4B2F949EFF005BCFD32AE97526B836647A90B8C94E9BCE0D818CA95ED4223C0304007168C8E5F17A946994B5A3D39AA78F84C3F8951A270C53962B65E15FF194D4B9E5B88F11059A688F93A5C15E797CA3A3FEAFD0BB53AAEB2BA974A1B897847FF6CA4F7FADE7E994D0FF00EB70658BCD1781FE043FC86FB2CEAB1E10760967F200001B6CD04EDFB8AFC5BC652FBAEE3FCCCA407F2B8AB0782B88F93A5947C66F2985008AFD01FECD22C3C23789760FE0E527BFD6F3F4CA5FBAF064FDB7427D9B965534529078ABF7D011211CCB6BF75E919FC91A74375E0BFC8CA49BF9BC4308014C6E63623E4E9662F2CDE52CFE317FA010F1031794D90E7E78AE25DCFF00C5CA4F7FADE7E994BF75E0C9FB6E84FB375CA53FC54223AAAEE992F3449BFCC46EBB23CCCF2A8BF4A678934E3D3C5688F93A5C91E494CA438F053F432E8F464F2AABF561B897571CEFF293DFEB79FA652FDD78327EDBA13ECDB22F9362CDB20EA5649B3749BA1B9627512F58706403E21B671A7AA8AC416320BB75C8BA1C3BABF0E4D11F274B9B4EA30C877DE8A4404043F417369D390CA53D022FC339CA99241D99E3DCA4F7FADE7E994BF75E0C9FB6E84FB36DAE57D53CAAC4FA467C0934BA522D0DCED775823FD149653A54049C278ED168D9EBB55E3AD11F27472DD370DDDB651AB9CA94C02E870844001E5CDD839F9A4AE57DFC83F6FA58A3FD6C663570A3670C5E24F1AF0ADF2C09A5A527BFD6F3F4CA5FBAF064FDB7427D9B2C52BE81856A27D7BDE0D8A3BC5FC39B9A2B758A27F20C8404052554494829B4A490E028A26927609C348ADAA3E4EB6D871592C455511560E751914B8367B002819151CAC83C4514D14B5B3C47A27995F9B3472E92A9AA9F02766D28D415554554D293DFEB79FA652FDD78327EDBA13ECD4440025DEAB2D2B151C9C7B2E0DC5B8F2D70FCD0BBED3023E388ACAA2AC45B5BAE002021B6425593024CCFBA923644C328F13D11F276592BE2D0F892AA24A43DB51540040C1B5CBB6CD539AB52AE83104155D584884E35AEC7ACD178DA4E35C47B9C879E751A68F9662FC9B447C3262D6DDB82CBAABAA5298C6968918E47293DFEB79FA652FDD78327EDBA13ECD6DB27E998D461F909C2B1A6268CAA0F8C2702C1571F1D18CBC832C6D7750309738A1C1B843E2D776818F2DD28BE1CE739B20ABEB481DCA292117A23E4EC3140C13B565111D18CBC831C6D7737812E5122037188C56EED031D5C64D5C59C2EB9F19B272F1685826F1A9EE918D6D20DE5221DC72B8531886676C954311BBB51C0B8C3E1EE71400E2EE7C7D3324F744D351552BF5C2B1CBC79F949EFF5BCFD3297EEBC193F6DD09F66822000DDB9EC13600001C2964D55632A1E3F88E0CB56D93FC908291623B9BB570E5489A794985294A590EC3447C9DD2D5866F71FC3C8311DC9A4A2A78DA7BB5B19306AC92E02C822BA7294E397176EBA07DD1B5E917C31506CA38B978F3F293DFEB79FA652FDD78327EDBA13ECD270CBA8830628316BC3548274AA043923786EE0225D62D486A386A43BCF84C862547531AD42292C45BA08134390A727E0A1F3F050F800001BC40041DD6A21CE2D47260D25F60525FE27471C6F50894F1BB46AD8BC459BA0B91CD46215C568E383497F85A43DC429080633808A69B1CB064E87F050F8DA398B636AE58B3759F8387C6F1AC1B1F827210E4FC1C3E7E0E1F674C9D4E2C6B23B40FDDA73729622611934F62722DCEFB49696463524CFCE9EB2F388460FCD98E7CD98E365CAE1BEB2F328C617E6CC73E6CC7232413906BAB8581143E6CC70B758E116324CDF27B25A5D18D4933F513D8BAE8A09B9B9B603FCC9720C6CEC7C86E979D4230DF36618DADF12A98040C1B1BCD20B49EC9496691C885D8DCD1D26D6410D823E00C5E24F1AE8E174DBA0D972B86FB64A763E3F3E64B9C5BDD1B09D0708B84B8CBF9348ED765805C96C7093094936CBB762D7B6D4E9247CBA24911B376CDFD3800006B78F288D9B727A56D8521481AC97B7539144F18762C8E0E10086B26CBB764D3B5D4C6294BFCAB249B28E64C886294C137594C4B5B981906BB2E1DE7A56D92904C5DB6A5BB51467B233FB86C972917B599248C9C6D7D160FB64A2BD28DA648F22BA5CE47952AE2BD485D96398FC7B483AD1394A52941E473378410755A9221CA727157F2691DAEC57FBBCC46B88A77192484835BB762D7B6D977ED9B76FB2F1E516ECD003E6ED3232408FDA6B25EDD5B9D8F60C4F7088295891DCE4D6CBB764D3B5D6CEB8A30B566C5461F5665F4771D9723015D7CBA1B24ADC8A885622D462CB6467F70D96183FC8A71566512500404365A55E9C2BC60A210EC1DA6F1A2CA9114A31B292834C579A2B63F2FADB7EB676E55A1AACB19585E2AFE4D23B5D8AFF0077314A62BB6EE6BB216C7483A8A6BDB6CBBF6CDBB7D978F288821C9E9D0C294A50D64BDBA0619AC842D7FD1A2F00000365DBB269DAEB68445585ABB82AD0DAB337ACB8ECB8800BBB1C111B6419E31C35DB19FDC36CC42B69246B4FDCB679B2EAAF8302B54CCC2B6B28C642D8F143031649B4674F1E9AFB1F1BD1DC75B3B82A30D5744C942F157F2691DAEC57FBBE2E824BA3351CEE34CD7B6D977ED9B76FB2F1E511D36E4F54D70A721C3592F6EA5FB5D92145E255D9A0906FB2EDD934ED75390A72FF002AB524CE419BC4C440A137654CA5AE438C7B5D970EF4400C0E135AB9288AC9AC96C8CFEE1B19589609431C852B65024ADBB2D3FEE94CB5B45123575352464F22BFD16DD96387FC8B583B2104A02020F2419B32185CD9648842909C5397989110E8C627B0D0888CBE8FD8A0F9B244E44F64BC3A32644C9C84D92F0C8C997E12C73E12C7235826C1A6AE110590898B4A35BE1EBCDFF23B25A21293493274D3D8BA08AE93AA623CC14F7A718D818F8FDD290A8C82B8F59A0F1B454504727B1BC2A28CA6C9683672450A6BC118D8B691E8EC730C8B893C5D04D7458B249935C18647F2FB64A0A3E43069EF482D6988F320DD16E97FCA1FFFDA0008010200010502FF00B9D3FFDA0008010300010502FF00B9D3FFDA0008010202063F02674FFFDA0008010302063F02674FFFDA0008010101063F02FF00E935C53D79615754945B28ED299CBE9161CC46D83FC46A34CA4B8D1364CC9436E1550FB82D4DDEC916EF9FE2279EF86852B7843CED4BE5C651C84A4CB9D9673CB67F11BFA57240DD36F821B3F114A57865E2FE2221D72F3A3FB48B55E4DD80D5C0DD3A557827292759DD8628A9D1D8D3D2806A1E9CCABD11A2F1FE2053EFAAE369CF050C134F4FA0738ED9E28150B4FE9D8B544E42ACC3C700767D936E32A24B760ED12A4C8E8C8A83534C95F74B299A39D34FA3963B37C86EAD1CE06CBDAC42BB1712E5D3255D3391FE1EFC9336A1A5766DA34AF213BF642985CDB4327F50738CD2DB84B2CA6E368C8910A45E526F5979264770C14373912544A895199D661BAE6C5D2E1B8EEB3941F0422F0229EB02908398A9BB7F879CAA28ED16971C9A4EB988A8A8EC90D38A7794119F92244EBC4A7A7F394BBFB8912F6A28D8BC82F312506CD8A0E0B49036393CEF79F0D36ABC9BB12A5A7091D272DF00947EE0A0684009F2C72AA9D3F6D51EFDCFE631C9AB777544F0C77852F0F484BC299404D424D3AF4F393BF016850520E450B46071D94FB34954B684E3F67FF27FA63F67FF0027FA612AD227B07EA1D015F0C5AADE822929FEDBBFD238E3F7170684003CB1CAAA74FDB547BF73F98C726ADDDD513C31DE14BC3D212F56501352834EAE97393C7E080E34B0B41C8A4998D8CADC504206551B0414B00D42F5589DF3C51DD0432350BC7C31CAAB7370DDE0945B50E1FB6A8E4D4BA3EDAA2CAA52BAF2570C0154CA5C1D24724F8C4499724E7C2558AF2EE61693D8F6BDA0279D7726E18FD9FF00C9FE985B5D87657137A77AF67968188CF73DAF6B7BCEBB2BB2D474C7ECFF00E4FF004C163F2FD9490577AF4F210340D382FD4B811A139CED0829A3642474DCB4EF08E5552C6A4723D5945B50E1FB6A8E4D4BA3EDAA3DFDF1A1602BCB01358CCBFDC6FF00A4F1C7694CE07139E5946D8CDB3FE79099D3BC7BD0332BFD505542B0D1740BED2D7CAB3528EBCD165B80BB50B97453E72B5010BA872C9D884F4539841FA83A24995D601CF3CAAD84BCFAC21B4E7305BA49B0C74BCF56EE6DCD86F30BE479CD1E69DC8E4721E4FBC64E51AC691153F297EAE1475463175E584369CAA305AA1EE5AF8BE79DAD1054A3327293B07694CE141CE331DB10197BB9AAE8F9AAEAF16C25B4F7D55F0C641D68BD50E5E1E6A32246D0D8262C220335E4B8CE67BCE4EDE980E36A0A42AD4A8648A5EAAB84607FE57B43128FF13D9C0BF92AF5931D83325D59CD991ACF14175F5971C56551C70EB0B2DB8338814F5326EAB37457B5AF56CDF964FBCA9B3EC0CB83B6BCA453B16AA448BCACC9E38A75D3BCB692E2541412481C9FF38BEE2CAD5D2519984D755F2D07DD359ACCEAE2890C9B02AA1F3248C83393A04768E99207BB686448C01B69256B5644A6D30175AE7623E1A6D56FE411653870F49CE5792390D213B4008C91DED3B6BDB4889B57A9D7E8DA378C15CBB5607F7519B6C66C09799514388B52A115279B508695DAA3ECE51A8E1475462A9F7D5248C83393A045E7392D0F76D0C838CE00DB482B59C894DA602EB1CEC47C34DAADFC823F6E1C3D27395E48E43484ED2408C91DED3B6BDB4889B37A9D7E8DA378C1594F6AC0FEEA336D8CD853475CAB7234F9E0571E39A4A43FA8FEE39D0D435C124CC9CA7077289379DD5589F2EE44EA96A7D5A07253C71DDD33635DD04EF98B1204729015B623974A899CE9174FDD941550BB6FC373FA8476550D96D7A0F8B4E0EC9D25546BE70E8FA4228D49334A90A2923419607FE57B43128FF13D9C0F3C813754D9437A01245A76A5056B3796A33528E7301A6505C715912202EBDCB7E0B7E357147754C81AC899DF3331600224E3485F5920C725BEC17D26ECF06482BF7D4FF1539BAC336098CB1F96A83FAA6C58AE9A78C6CAE3A0CDA4F21AEA8E3CB0869B179C59BA91ACC229D1945AE2B4A8E530D39F0DCF01070323A2563EF13E3D814E386EA1026A51D022FE46116328D5A76CE0B8D725B4FBC74E41E58B8C279479EE9E72B60554D0A6E3D954CE656D6830411222C20C5F68C894942866295091070A3AA3116F3AABADA04D463B4558D26C65BD038CE0E472184FBC78E4DA1A4C5CA745BE73879CADB3B02AA681375DCAA6064575741891B08CA307E4AA1537D03BA51F392336D8C5ECDA3FAA7B99E88E97144CDA4E5381353F501665453FF571404A45D48C806396AA117D39B48D60C4FDE532B98EF895AF034CACCD0C4FB3D57B3607FE57B43128FF0013D9C28A7644DC5FFE4CC5C6F94EABDE3B9CF931A46D072883574A3F4C7DE23A078B021F68C9C6CCD30D54B7CD704E5A0E71B87602653966101E4725591C6F3A4C76950E06D3904E3B1A5752E395134DE410649F3B26F60FFB17872956538D59D5BB82A467480BFE533C0EA3A2E9F081B027E9ED9CBCB7FD94F8F0269DACF6A95D14E7309A761324277C9D2762557D3A7BD47BE48F393D2DB1888EA8C4FC8347BB6AD7B5AF46E60ECC725945AF2F40D1B6612CB29B8DA2C4A46C4AAFA64F7A9B5F40F3874B6C6043AD9BAE20DE49D621BA9479E3949D0A194615BCE1921B054A3A843952E6559E48D0330C03EA1529B3FF00CE83EB716C4A65E4DF6D624A105A36B4AB5A5E91C630BFF2BDA18947F89ECE1FCDAC77B51CDD48CDBF9760536B1790B12524E830E539E68B5B3A5272607E8D479BDE2368D87C5B09ABA174D256675279AAEB08956105E63BA3772724EF60083EE11CA795AB46EC04A44929B001A303ACFC44293BE2582ADBEA2878639C2CCBBB93196EAEC4360A95B421CA8739CE2AF1E2C01E50EFAA7967527CD1E3D90840930EF2DAD5A46E614754617AA4F989E48F4B20F0C15A8CD4A3351D66001693904219FEE1E53C74A8F16C8B729DE4B4D28CC364648FDD23F94C3ADADE4B8D2F940004495E5C2DD224DAF9BCBEAA78CE06E9FCCE73A7D11978A025224948900346C6B401DF2396C9D6336EE17FE57B43128FF13D9C0D309CAE28277CC25B4092502491A86C2C558CA93D9AB76D1E3C0C68726D9DD1678762171DBFDB4D770E5489E9CF096D02F2D66491ACC764D52B6FB5CE5291699F80F823F5542B6F5CF3ED10205FBED7593FD33893350859D13B77A2A5AC975C54B6A7643CDF49A27788E385B5687BB643A17D49D8774C25C4E45898C55A4657941BF19E0C0C53E65AC5EEAE53E0D94BA072E9CDE1B46C3851D51869E9479E4AD5F66C1C381055CC6076A76C64F0FF008277A2D49B4EE65F09381FAB39567B34ED26D3E13B2BC058877BD4FDACBE19E07FE57B43128FF13D9C0C6845E56F0D8AA34A64B1B878B030E741C49DE3B13B53548250B5725C16A6EE61AA3FEC5E169B29C70ABC582D8EF699B56BBA27BF097189B2B4A82AEF390647248C3A733812B1BD2F140D6DAA2BEA2A99F787F4A47280BCB99C99393A62942F9DD989E2D235D751F00C057F0DB51DF90F1ECAF35F110A4EF8C28EA8C377E1B694EFF2BC782A9ED25281B96F8FFC13CE74D6A56F9C14C34A6F7F319ECB4AF69BC83E02303FF2BDA18947F89ECE056A695C2362AB1FECAFD5C20EC0D354F2EDD7CA54ED923CA612C2D28532412EC93290FF003890C98AD3D4C124A51755332C86638629CD4A6E1712E5D4CEDE4FF9E3D38FF6CF0E0A93E80E1D9963D23811D5186AB6C7AA302CE9755C03FC09DAC3483FD947AA36560FFB9EC9C0FF00CAF686251FE27B3817F255EB2762ABF92E7AA70A76B1D6EB8648402A51D421C7C8E5387908D591220057EE1CE53C7813B98CED4DDBFD909DDC938A37D4CAA756541B0244A4A5574E8C7A55694A86F1F2E0A84E96E7BC7CBB29272082AD267811D5186A75DD3F7460713D174F840FF032829D0658290FFB48F0096CB4C8D2B277879703FF002BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC74FD39B3964B7FD94F8E3F3EF0EEDBB19073AB4EE63D58FF697E011F4B73E13EE277D4158EC3DF0D777F987FA70340E474291E09F08D96A5CCF70A46DAB923870A3AA30A5CCCEB637C5982A69CF9C0389DCB0F08FF0554DE87152DA368F060686768A9077E7C07656981FDA44CEDABC80607FE57B43128FF13D9C0BF92AF593B155FC973D53853B58CE54B9E60E4A74AB308BB39BAFAAF38BD0339DC8430D0936D892463AD1D3491BF09A4958874BB3D72025E08071AA1A16AEEDE46DA6DC0DBC8E736A0A1B90DBCDF31C4852777646A8526D3DE39B5913851D5185BA81958572BAABB3865819A8F301939D5361898B41C87FC0A2A0735F4DBD6459C12C0F51A8FBD17DBDB4E5F06C8A5ACC9091351D421EA93FDC54C0D5986F607FE57B43128FF13D9C0BF92AF593B155FC973D53853B58DF966CF714F61D6BCFBD923F30E8FD4545BB48CC3772EC352DF45C54B6A76432AE92127C18EE200EE9CEF1ADA39B70E03F4F70F2933531B5E727C7B1AEA1E324204F6F56EC3952E739C33DAD03730A3AA30B8C39CC712527761CA7739ED991E3C1F9178F7CC8EEBD2468FB3B1CCD806530B14A86FB006482A06675E511EED9DE57F542AA2A5284B64C9ABA089CB29B49C2B4A44DD6BBC6F6C651BA3036FB7CF6CDE10DD435CD58C9A0E71B9B1FFD7B47BC72D7B52730DDC2FF00CAF686251FE27B3817F255EB2762ABF92E7AA70A76B14DC3FA87B92D78D5B917DC1FA66794E6B3993B17D42A2FDDECD2D3811D2BF241DE31487FD947063F207EA19E535AF4A7762472C25C6CDD5A0CD2A1A624649AA47BC6FDA1AB61538E282509B54A3171BB291B3DDA749E91C44754627E7D91DE343BE1A51A773025D69575C419A5422EAA48AB48EF1BD3E92756C4AA0A4572723EE0CFE88F1E0453A3265715D14E730869B175B40BA91A86276ED8FD33E663D15674F160BABB695CF789D07A4212E36A0A42AD4A86C32125552FDD37ED1D50A71C55E5ACCD4A3A70BFF2BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC499C91DC8BC99F674E9D5A776114E9B48B5C56951CA76243CDAE4B526EB8D6752106F4FECCED8A53E891BCA236057D42953AEA103D7E3C0975A514389B52A101AAE932F64ED3CC57144C5A0E438D7AA1C91F35B16A8ED08BBEEE98735A1C2AD381EA95CC53308519F4940641E3C28EA8C53554C9FD2AB9C91E61E2C0971B5142D36A5420355F269DCCF79876F444C198390E376950E06D1A4F8A0B147369836297E72B88604B2D26FB8B324A445CE73CBB5E7349D0350C55D3BC2685F835882C3DF61799434E0BA3BCA73CE68F08D11361CE579CD9B143731A672416A8E4F3FD3F313C70A75E515B8AB54A301291351B00114A1CFDC3A14A74661924303FF2BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC4FCB20F7B5361D48CFBF923FEC1E1CB5D8C039939D5BBB1B920E2A40CC3440CD955E88D10CEA2BF58EC2AAAA04D995CA71C29E2C3FA77884FC336A778C4AA6982BD26CCBC0671CA43A93B438E3FB9FCBE58EE69D6B3E9109FEA8BAD5DA74FA1CEDF3056B51528E551B4E00E3936E90655E756A4F1C3CD349B8DA19584A47570A3AA314A54269361061553429BECE55339D3B5A461FD3BA427E19B53BC625534D3F49B32F01E38B43A9FB23C463FB87ECF963BAA75ABAC427FAA24C8430348E52B7CF145F796A717D2519E00CD3A2FACEF0D6627EF2A55CF77C49D58E597C75179D27488BAF09B67DDBA39A7CB802924A543211962EB845423D3CBBE23BEA75A3AA42B86EC7F707D9F2C7252EAB7071C4A9A9A5E93867E01C7127DE373E1A6C4EF0C01B6D256B558948CB02A2A64AAB390664796297AAAE1181FF0095ED0C4A3FC4F6702FE4ABD64EC557F25CF54E14ED6199B00CA61CA95CFF0022D197D91CD4EEE53121601906C752DB226E29B5048D3123952E286C45C4F7353F1139FAC20975BBCDFC545A9F26EE3F66C365C5E84C077EA06F1CCC2727DA39E0252249160022A7E52FD5C28EA8C72EB5DC541F38734ED88EFDA373E226D4EFE3843692B59C89489980BAC3D837D0CAB3E211D953B6109CFA4ED9D84B4F202DB5654982E7D3D5793F0159770F1C5C79B536BD0A12C70528EC99F8ABB06E698EEC5F78F39E565DCD03052F555C2303FF002BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC29A0A7F7F57C99F45B1CF51E08453B23929CA73939C9D9168064549201DB871B5892D0FAD2A1AC01B24DC60059F3D1C93E08EE6A168D4A015FD31C8A941DB0471C7BF6BEF71477B54075533E12226E5E7CFA4643784A2E32DA5B4684896128509A5424A1A8C7ED1BDE8FDA37BD121906C123922659ECD5D26F93E0C9E08EE6A88D4B4CFC225163ED7DEE28B5F6BEF71477B57B89479626E5F78FA4643EECA2EB0D25B1E8896CB71E6D2E274284E2680A64FA06CDE338EEAAF7148E23163ED7DEE28E5543636AF1E28EFEA54AD4817786F44DB602963CF5F28F87101A8652E94F36F08FDA37BD0574EC25B5112252336227F30D25DB9CDBC324E3F68DEF4768C3086D7295E48CDB1290B1790A12524E7063F68DEF47ED1BDEC42E4B9644AF6AD1B35405282BB67D6F03A97A7F8B8AB409C38B690A406CC8DE978B15DA2E6BED00647CE044ECDAC2871D429616ABA2ECBC70958F3803BF88D875B52FB59CAECB36DEDC7B877EEF1C7B877EEF1C34FA4492EA42C03AC4F11B2EA14BED672BB2CDB71EE1DFBBC71EE1DFBBC702A1B494A49224ACB66238F1130DA4AC81A84E3DC3BF778E394CBA35F278E2FD3397A5CE4E4236C62A1C750A585AAE8BB2F1C256322803BF8A5D79610DA72A8C5CA5614FEB3C9DECA63BFA0294E9991C222EB4BBAEFC25D8ADCD38CD875B52FB59CAECB36DEDC7B877EEF1C04AEFB33CEB16782701493306D0462B9F4F0DA838D4E6A329598A1C7CDAAF76D8CA62668BBAD37BC91DAD3ABAC83CE49D78A4E886EA5AE639A728D585C7DCE63692A56E434FA6C4BA90B00FA4278D75D5DE77E122D57923B8A02A4E9993C022ED530A63491CAE2301D6561C6D591436773AA7822A7AE38315C5D34FB6404A93772F25133E08BDCD7D1EF9BF18D47053FCCF6619EA2783139680A964989C535C404F2CE412CD0DF748E68F3468890B00C831293ACBF1427BA464E888F748FE511248091A062557C95FAA61C2B42547B636913F353125B0DA86B488A7FCB58CBF7668F4566E91E3C5A7F99ECC33D44F0621528C922D2608BC5BA06383FA951729DA08D2AF38ED989284C1CA0C1ABFA70ECAA1BE57668B272E8E83052EFEE59B1CF4866562FD3F6CF0A63DD23F9442D21A4B6F4BBB7122467AE59A1EA759986142E6D2B378316B3697E2C5A766A7DC72000721CFE154764A402DCA572564B6A1DA969C55C5D8867301AF4EAC5A973A2D2A5BD0BA059B1CE5B5D61946E8C28A041B5CE5BBD51906FC531D00A7F94CB164DFEE5EB1BD5A5502B3EA23B57DCE506D76CA7D2D262EA4480C8045CA8682F42BCE1B46132517281EF08FEA1095A0CD2A1349D476673AA7822A7AE383151B9FF00AA07D57E9D6373EF5BCC2796CE8980FB5B4B46749D114FF33D9867A89E0C5A6EB9E086BA89E0C5A4EB2FC5007E59766B11FB65EF884D4A12501448BA7562557C95FAA616CD4294165C2AB04EC90E289A7B459D013C709FA8388B948C11774726D091A6DCB8B4FF0033D9867A89E0C47E5957247F31B7C10D11CE766B56FC87806238CA2C43D7ACEB27B4E1C5A051C82F13BE98E7AFF94C298A042D4F39C90B22529E819498517849E7CDE5274019062D66D2FC58A9759376ADAE67A4347147E4BEAC3B3751C9ED8FB7C71319315FD2BBA9FBD1F4EFA9B163AC04959D4A3792770986AA5191C1396839C6E185BAE192100A947508FA97D4DF1CF42DB6068253EC8B2148F86E9F080715AA75DADB576CEAA7B4C47A7CE6A4E2773C90CDECA89A378D9E0D99CEA9E08A9EB8E0C546E7FEA829509A4D8418FCDD302AA074C948F64FB26291F65579B5B966F433D44F062D375CF0435D44F062D27597E284F769C9A047BB4EF08924486818955F257EA987EFA407FB421B7B389012DC857D37EA14CDFE6527BB714906DD16F82240480C83169FE67B30CF513C188F4B2A24BDE36F8219039CD4D0ADC3C4711C7916A19BD6F553D9F0E2D003683398DD4C26BE8DA1D9A25DB3329A76E5A34C26A29186DA5E4712902695689E3566D2FC58D25725F4FBB77C474885FD1EAF2A67D94F3116CB688B462B2D74DC9FF28F2C2695C1347661B50D5294547D1DF39CA993A7FCD36C33F4B62D7AA48BC354EC1BA61BA54F350991D6739DD315F4A7CC5096E120E2B4FAEC43B76DEB27B3E1C47A7CE764DA777C90CDECAB9AF7CD9E0D99CEA9E08A9EB8E0C546E7FEAC0A65D4DE6D624A4C7E54A8AA896AED1A39A7937E50CF513C18B4DD73C10D7513C18B49D65F8A13DF23274847BE47F3089A4850D2312ABE4AFD530E7CE3EAA63F334E2558CE49655019B6C668ECDD3FAB687783A43A5C78B4FF0033D9867A89E0C428509A5424A1A8C1B0B9F4F7F83FA9317E9DD0B19C671B62264C80CA60D27D38F6B52E726FA2DBB3E8E93054EFEE5EB5CF44664E2FD3F6CF0A60A54260D84180FB40ABE9EFD853ECED8CD0975A55E6D626950C5ACDA5F8B15EA3FA904B06726B40DD3D2CC60AD442522D2A3923F314FEE5BB4AF521329EE9C5FA752E9393ACA03C5818FAAB163B4E405ED4F9277EC87FEAEF8C86EB23419789382B5ACCE5E3BE42F1416BF72CDADEB19D3028FEA27B2A86F93DA2EC9CBA5A0C4C19839E2FD43A11AB39DA19613205BFA7B1C19FED18084892522491A86CC53A44A1C436B52C38666F4B147D4FB457683CCB2EF36EE1553BC26956439C1D22128CB74013DAC56D0E2D480D998BB2CF0947444B7B15B0EAD48ECA72BB2CFB71FB873EEC7EE1CFBB09A66D45494926672DB88E324C838928246B128530DACAC2957E6ADA03C583F3EC3AB61D9CCA532BA4E7DFC5436E2D480855EE4C2503CD006F62969E405B6ACA9317E89E5327A2AB46E1CB0054564D1F68F0C5E69379EF8ABB4EE68C665C71C520B192ECBFF33605D3BC2685EF8D6214D21E5B8D1B42572E49CF2DBC577EA01C5171D9CD0652B71417390F279AEA72ED1D2202175936466B78324766C0CBCF59E72B6F159AF5B8ABECCAEA2C9596F8F02D9704D0E02956EC2299AE6A339CA4E7383FECC38A0EE7459779B771AF3A9BAEFC5458ADDD30453D6491AE63822FD63C5D3D14D93DB396034CA036DA72247FF28FFFDA0008010103013F21FF00F899A0AF4CDEB316B45E9B199AA8EC13FE8D98E9B68B8959EE3452EB144328CB0168D3E7FE88D5C7CECFEA8A85A1D4ABAC608F9FFA3688C7C7BFC0D5818FFA27708BDC575D3C850634A92083D8C0FBACC6E79A5618D44F49BFFD0043C9595D00D576AC5B80B6FA78EDF6A9004A04ACD5CA4CBFF4A99C162101045CA5B5A37E12680B7DC3C5413DC4620DFF00B34A211B347D2313FF003C751248C0ACAEBB980EF5E3F95AD9D24887CF4A0BE28FCC775D568DD08B91F62E352E54A216599168A041A621F2D14F8A47EFFE6BE2E79FF9E32F34B17697BC37DA9BF1C1590485CDCDF924A5F47645DDDA01A4C6BA6C45BAB25BD3943A3FF7C3F4538E8A3ABEB1F2D397FF006041F9534A93BFF7506C84FBF5A66D3A09F0929C01F90D517D6DAF2F6127928A12CB443A25B8751D7C4CD09EB15D5D1D5D16222287727D0DF0B2E7E37F2D4A183449A4CB77FB663F2A795B77FEEA0990DF7EB5F5B05F8914E00FC86BE694D09EDA00A63A5E09E4F4EE201680755B53C06D7FBF7C51A4D2FF009199F55339391C55F6E49FBAFA810FDD0C4ADBF46D29A9957BB0C9F550FEFAE18F23C495CF18241D4CD757411FDE7AC84753906F7B605C9AF5741BFE08611C24328F5BB6DDAD144FE72683E5A6981750143F2D754FDD342E9B7F65245FFED88FCA94EA7593CDCA7F913012EBBFAF3BE6B693E7B194EFE2A78B4C419C4A2FBACA1250372FC0D81D1BA7CAFC6F5D78C32061FDF5ABDCE817FC0458DE5F472BE4DED832AEC53ED870B1751F5F952AAAB2B757921DB9334466F7BFA1EA5EA7562947B033F35EC1BB8FBA6DCC7B925B07FBD2A69702BFC5FBED4841D28957ABC90EDC9E7247D34B34C904B1A8EA75EAFBF44187B87655A76CD49F0323FA6F9CF202E39002640991AC73164FD5FDF7A370F2328751F48A504608617CAE4E3ABB793D72AD032F6E8743882E39318797FA744E8D23A44CB7E87F86DEB01A124BA42BF2C1F3C2248C471D09277E8B6B4E6609850CDB5AB557CA3E665A0544AEBA51D4B9FB50008160311E862424F2F05AAD32BA123C4DDDDD785A13C453C152806F6FCFFD8A0DB8646F87F028A8276FC614A1084DA28A490D5EFCC4D1E8A30BBBD67FA4A1D738C8C3E6FC3AF0762DA81FF9B94F881E7DD1EE0C71F74DB971D6E1D91EAB539E5DF5BDDFB1E16A57914F051C25BD9F3FF628C46A2AB7C3FA51504EDF882942109B4514921ABDF989A0590615F3CFF49436583220F9BF0EBC05192C986A526BA8BA3FE3E5CF91EEC1703ECEDDF0FD9529755CABC2797D8B37CFE12A24D69FD5DFF344DFFD805AB491D00A360A7407F341B13FF4D5105532FEBFD879A6C09A164DD6075381A406EADF6A6BDE8E338A914423B3E8504EAF5B6775A18538F498952EAB58A70197FF000EB4248E5258E9A9ED34302C697DE9AD07026C0141C036FC814966D2587973F4AB33D17F63F4EBC00240B8991A713E43686BF937CEFEAFFB7C3FCA7CA90B863D520A8D6420FBC60E951A9288BB0DF90F486D838AA630095A48A662F4DCFB3E38467D00B7FB5A15891B51DC76E85BD030581DBF17A1869EB3F0089912984C28BC00352FC7DD36E4244D3740FDEC538927E877DFB1E102B8402CF611F3566466B3DC60B73A090E28E81689D6FC0C34E8D54259134780AEB896B1B8FC9D9E52C224F88BF6BF669FBAA94BAAE55E13AA3855976759ECED479C3068036039C43AE5ABE50D6674C45AFD5F97E2B6B6EEE10B2D492DE8D04959C8360D5340335142013977F434399D18084B88E8D21776CEA613ADF878427A5BB68F44B358107F009D413D0BB2817518D0EB50FF002DCC8F471DC6A4C2B23CAE819692C83429D94CAEE1E76E1A795618C7F00E93BF040704F1BFA1E08E336C6C7EDCFA0061C29B67F63C70B4B3BD8197DE6A0F173E436ABE94588A74C68E86773B5F8FBA6DC883730878BB0FDF6E1371805F00EC5BE68048BD865757D28011EC0E8FB373EEA2EE63D2E55B93E8A789C74E3DA41A04B5F00013B0F6381D3459D526B3A3FB6DE903C963EEC9A352D779FEFF0081FF00DF4A8233EB3645FCA7847A058D4C62108D4A32B27AA7F167AF05CC10FD8C3F6F451539723CF9DD7E469A021DC125B64BB701C92117C4BBE27974A37C62CC02C01D381B58F91BF6E0D79B587C5FD55E4B900496C25DDC7329722BA32FE2B3198369C0E81638462885D7FA47E5EA0E1A21893F6BEA38FBA6DC63A16F1AAB3E5149A9E6E54957BB47DAA80CAB828AE117C95E303D4BBD1B2DF9087138AF707EE9A138B00B2DF644F6E2B137E231F0FC70BC29B034BFF2C3AB4778CB300B01DBD393375C45F436FF002911873E8504C187DDAD4F8A86826D0203E3D121970FD3F0D3E5C12EA3DE66D3D29E7C71B44CB266FD2909805CA900776A627AC83ADE158C52DAE6208F64D68A919CDC8F9550937493E486AC440E7B8FD28C5FBC8D4059DDF09DD62429C492F692795D541AEDFD51E139633B1FA4D0000202C07A812A0DB5C5FD8F8E3EE9B7176385F41F62BE3811E947C07DE3E3F84C1991F0B3C10C0DBAF4AC77FA3D5207603D3FABE82821CAD47CB1F69E901F47C4D7F2E0C759F835F49D039B7E59CD05AF15BE11BB63CF879E9C00812391ACE0EEFA086B30620DC0A49BE2CD27F46E5FDBA856D7F0FEAB764CA44A37481F855808C07DEDCAD130BE141F9784A458D7AAFC2BD567927CA071F74DB8AAE920F2E08092EE3B15F87F09D7659CEEBFBE0639767E6FC5F5401970DEDFB0FA141266DD7D7FBF4897FF0014F0503B5E9F5427D065675AC02D8F743582C600CCCCBB0BD00040C072AE601CE6C04F75077B5C36019893A2F59E64D909F3FF009E05BA0FE7FF003EB009803EF87BA6DC55CE83F05C3588E7C1FF000542ECBF1C404C1EAB16E88FCFF47F16823005F51F8E7E894F309691B30C2E9818E9F2D1C65BB1B3A0ED3F99E6EFB4FF006431F148DBD1C8132B62BA73C3FF00850780CD69C3B27AAC290AF8AEB35F2E1EE9B71795A83CF08358F86BFE0C86E22996CB2F1C03A1DE457E3D523551FE2FE2E823005F51F8E786E29136CA7E5E2A46F584EEF6E9EBDB9ECDCB30775FD5225ACEFB8D39DC632AED37E780144257BC1F47AA72703DCE678BDD36E2F07709EAABEA381AAB8CEFFE122C6C0AEF7F20E072B3E2B83E9F545249DB1E63F8A2823005F51F8E6BF01DC2B1F768134C4093376C60F1503B9ED357AB95E715F08F8452A31DD995ABA53AC84F3293C0B5C70EF11C3EE833727E2932952E827D405D4DBD0487965F071F74DB8B9398EBB0BEBC12468CFF0076064A34E0242E23AFF050360AF23EDC1090201F10EADDE3D43A8D37004ABD8AB64CC8D0DBC403F8B411802FA8FC73663AB0631BFC1E77AC45020E73FE63C6DE8BC74031DD7E9420E04F25E758C9BA13FEC1C35978F5570ECD9E76F4EF2866EB41D558ADB36B4180E800E3EE9B710427B22224EA69412C2FAD181D12E7003AD0743F2FC3B3E9BF70529600CAB4A2531D235464C96E0123BC8D8D4B026C79E2F8692651FB04EF1C16B83ECDB47A259A5CE676ED47AAB7A7A658E777BB9BD3BFF1A823005F51F8E59AC326F9FD17E62A125C3263F7597A77F4ADAAC8E50D13A415DA63E09FAE799BD37BC68B758A40102C8D23533300C343144EF7ED7D7C4FA0609E420037A0F25E8B38A0FC6C79E4F74DB92FA710725F9EBE9DB82C82330251F6F6205FA34FBF4A78199DA1ADB6ED71BF09481F62FF0081D6A2EE63D2C7232435438CBD2DFA3B705D3BC82EE2837DF73C5006791911DBD15AA2763F4BEFE619B399857F1A823005F51F8E440902EAD44D981F596E889DEF8F1510FED5C743A7A4A9C818584040D9A656AD4C8F6636F42F983FB607BEBBF05C632308D30D80C7A8EFEF6FC51A72E02E273417393EC3776D521DECBB3D4D5F470235678A9A377CB8FBA6DC882438A9773CEB2FDF4DB1B704CC72308D2ED8383F6BF5DA8E98521713A3CCF4BB573D0657A1433492EC7B5B37CFE3827AD5017DE5A8722103C1DC2DF3CB042113AAD3A8342649933A11FB34E19A8E5DF6EAFA68D998CFCB5FB16E600A40BAB4BBE139A77D7DADD74A68AB232AD2206834AAD803769646EC46160F506FD7F8B411802FA8FC726014D168FB9E6B4BE2364B5CD713A77F4DB74E68CD95BB04A3351ADB7DDFBF445275B89B8EDFE36A4461B264E0BC6A7FD9C1E282106A9F79D689EC25FF00151169F43FBD0376245FD502513B27ED7D055FE4ED51EAB7E039A7B506E7DE0519FC20025C7DD36E50A0546911C894C8AE8AFD7D7F61C5AEABB9FCC1E28204B5FDD74953BA8A7E4A0E3C47F628067F48AFAA14B5E8FE868C5E3285F7C10C64460DCC056351C4583EAFCB9FAC543CD3DCD5F74ECDFD6E1E0F1C65501E8946819A1FD67E668227B588A105FB49FD2ABD9760BF269C207A7E8BA4AA0FDD97F33C1C51C0CA7A144084DF1741D77BE0EBFC529411802FA8FC7144D025300508A012C4E3759F125E947CC140580343D379070E6460EE5450A130E987F7E933755E2B3FB3BE69B08E315D5CF80E73CBDA131D5701D5A48E3BA2DF62C5BAB4080B0D001800AF60DDC7DD36E7762DF2377F3F53EE9984D17BF0C7661E7CD0E013C1496A7C205F7E5F8A0BAA52EBBE45F448C24164696D72960F7ECF6F952F32D62FBE799239360E9CF85BAD48E35191E9F80799FE394A08C017D47E38E6655E8F81213CAD7A8C26772FE53EA332296C88893B523A6072028F9F510737325BB68F92995DB3F0DA19B1FBA8A1A94A9486D47FB505C86E9EE56ED1030D30FAE2129C6E10847B9C4E70010101D0F41004AB238A4999E56A92C99A07EC7E153EF8EB0FDAB44BB4BF4A9D211ED4BFA52E00B4FACFDB5B8770A5DD2EF9F57A793C3EE9557FABECF4A97211ED4FE8AD52EF0FDA92D8BA3F451411750FD97E14B188196DCC0F07218E845240E6381ECF0F516531F2726BAC666098EF057F97A76A52C06578FAF48DAA5780108F72BFCBD7F97A0020C18E2040C47AA173B25F5A1169566C5BA88D3FEB81E2464762682080B3293693CB33DB1640D2F343C636822F0C4DE46D445A0347364F23FCC3D15B991C5C70E5333408831DF9076E868ADCC8DF8F1C59A986C91A4F227ACFC11904F6E1C1C03E8556E43D43EA5CE589A08BC313791B518E81A39213CB75C2360A973B0345EC86F2140CA7DD3E91A7A7472F98D4783CC9B20B456E647051235D81FEEE3E68E81F20238479755F5736E2F3AF2A20672E5CCC6C1376A09C3622E7F5ABD245AD3602FF0038E5377025F15263048640C2BA89C5888DF28136EAE9414B91A00418D49E6BC2864F11383C9A9643EE9F685166D8544EE47C4359A50193FDE9FC54AFBB4E7BEC523520C9B50BB2101A3FE07C70FB9FCABDE367240F4B287CD3A26CA97D14D5665DEC3A50212C02C0727BC6D5723323E1ED5ED8FD574AF201F072F622206128EA53B68B22FF0054A4D75CB6EE58243C72FDEFE55EC5B79012155600BAB4C2D15BA62318B1AE0FB1365609EA2DDA424B6048F72988DE6D334831E914AD96D3126875887AF7E58DEB986AF6C7EA83CC48E44B609DC34981CB749FE02DF3CBEE3BF2EF1F1C38641F434B51E541E9688A1B6B4ACCBA3BDAF875E5DCA4F74C3EEB55AE7D8FA89F1C746AA3DCFB84F82AF54AEF97F03950D4B9AF1343A4DBAD25DE9A9924B9751C77A020B6040760A6F65608EC372A683EE3A19B609FCFE0301C5C2122773F8895FF004FF2D1359C7DB11F1E8E34849E26E1EA57E9D6BEE7F2AF78D9CDD7B46CE5F78DAB80883B3C250624145BE34E5EC408C8E24793AD1E268227DA0A716C27BB29A9BFFC72FDEFE55EC5B79121C5FF00A01F29505D75FBAFE01C83B77188B6F0797F17381B86410D58930492EC2A3ED9A934375BABDF97DC77E5C2016136324DD11BAA98064062FB7B4DF7A0092AE26239605A83E42FD0D7CFEB911D2079AC24D5E07804AE8D4F2096A52B3CDEC16F087AD5CAB863A7E41794B0DADB1204EAB0F23E8C8765C3F74A9452B3744FA20FE2257FBEEBA040546911B226CD01BA53B03793733FFA4DD6C0B52F91344735EF1B39BAF68D9CBEF1B55C99C7C5DABDBDFAA800DA20E5EC7D61E6FAC759372A27E91A1CA6CA64BBD7E28F1AC82C1CBF7BF957B16DE4877367E85F4934F05D3ECC87D1C85B7B188BEF2B949C905351AAEFD7460C75983E77AC7D1E512E8129B3B737B8EFCD8021AD973D847C54F4D9668B22EBEE0F2B159B6DC5FD8A9CABE6AAAF3A1A6A0963C47B3578D1176BEE7C55EF651B97F30B5AD070F66B1CA198F4B11297B0E435580EEB97EAB518A162E8DF603FC44AFF007DD7C0B54F4D4FEF6691C99AC8196C543BD7BC6CE6EBDA3672FBC6D5283283E1EF5EE5FDD4C79C209F27376E845C19C376C3B9F0A8C80460D009EC3DCE5FBDFCABD8B6F205A71B84211EE50A2BCB46A317C13793E813B617C594A7A6BA4B079AE9119982119748C51B05A0CC1A9D26FD7B73163A0740911C894B59757065BBBADC9E6836118C4797DC77E5C4FD21B31A39810FF65133290006EADAA024BC4D7F528E9CB3CB42BC1BBC18D3B89D0B9BCD413CD6A242DF179E0B43123A81F4BCAA28BDA136A758B75EF5868ED86284E1D673DE8F1AE8171A422F46FC4DD5247D75D16EC59C687D86A38B80200EC7AC0DB0327B91400D0D8208B4072A62CD1B4E9CE2FC725A418786D1284F613ACB089E552686C908BC8D008C8057A2394F6A96AADCC1DABDCFF4AF73FD28D0208F2CE91C88EB3F006913DE949754132C0B4700271E5A1AC4C6B3962BEA309588D677A35D21AB9611CB6742164A6DE4C962EC47CA68F8CF7097C614C4D8A1F33A0F039A5D109B0CA3791E0801A8932689A234CD57E58007872E8E6886DC5A74E508504699F07B0A044AC66C745499F98B7E8615D340B72C21083D5A349CF044F9474116EB535B1F50329D55E0A10040DCF0CE399C970C1E2351E456DF1C97E71A25EF4B65DC4FC2B14A0307FBD7FF00D47FFFDA0008010203013F21FF00ECE9FFDA0008010303013F21FF00ECE9FFDA000C03010002110311000010924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924920924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924904924924924924924924924924924924924924924924924924924924924924924924924924824924924924924924924924924924924924924924924924924924924924924924924924924004924924924924924924924924924924924924924924924924924924924924924924924904100124924924924924924924924924924924924924924924924924924924924924924924900800924924924924924924924924924924924924924924924924924924924924924924924920920124924920004900800924924920024924924924820124920124024124120924924924924920924924924924920024924900924924024924920920120824924920124924924924924904824924924024004024824924804120924824924804024800904924904800804824924924900020924920904924924824924024924924824924824124920104924924924924824924924924824924924824924924124924924924924920120924924924924924924924924104924920120900924920924924924824924124924924924924804924924804924924924924124924924124924024904824924924824924824924924924920824924924924924904924924924924924824104124904924924924924924924924924924920824924924924924904924924920924924924904924924924924924924920924924924924920824924924904924924924924124924920124924924924924924924924920924924924924924824924924904924924924924124924920924904924924124924924824920924924924924924924924924924924924924924124924804924924124924124924924824924824924924924920924924924824924924924924124924924924920124920924924924124924924924924820124804924924824924924924924124924824924920924920904924920124924924924924920124924924924824924924924924124920024924924924924104924900924924820824920100924020924904824924924924924124924124924920124924824924104124924824804124904924924824104824924924924924124924924924924124924920924904824924924924924024924920124920924924924924924124920924924920124924924100904924924924920904924924924800004904924004924924000924924924924124924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924120920904904924920924120924904124924924924804924924920924924924900924920924904924804904924920924124924900924924900924804924920100924924924900924100924924924024900124920924124124900124924900924904824924924924924924900924904924924924824900824920924924124820924924920124924004924924924924924900924904924924924124904124920920804124800924924904924820924924800924924924924924920124804924004900924900924024924920124824920924920124924804924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924FFFDA0008010103013F10FF00F89A2374819238DBB013235005E81B0452F492FA7FD1B63E7760420A031919831451B602E6516D03F83FF42DEC750D943BD24D810C22140B28987B7FE8FE63EC203CD5CD235609865EB6FF00A29FB1A36D3044A847F19D6C86C66B104E6CA9F8B5100A82035925A0C4FF00CF85929BC461AEAC0A478D60D36CDC48D68D172A9DAE07510F0DC08026281B24E0A44AB810C2735697E8BC13319B4E4C914665A1B26022F6EBBA5254B9E84959C1BFFCF12E63C1C8B0015EA245A69246604147D5DDE2C43744B43BFF000D546545D12B769960D0DDD7CA4534127A8F0FD912E0A6DE0B7C9C00C55EB1AA55058960121DC63EE8D7FE7A6C32335A42439DE55048600B091BC3009DA67900F26E1D95781D9A06D60A7648137310DF5F4DA0A3178ACBC94C73932FAC9424730C1C3B7DB533174907C5B5D48606D64050CFBB85A55B51C993A647546A0E4A4B2F66F8D37AEB6FD7C4A51DB86C877934C4C6098AFF00235FF235EBAB5988A13E7D0516F6AA311281E81D69D703194ECC807CEA704701CEC7ECA6728120F8B6BAE980DFAAAC25064F991FAAACC8C4C9D333AA351C7A1191B4BF390EB45C527CF2093D3D311B3D4EA582A58FA19A34815DD8EB4F8159C67777F06AD4C7EA6A2A7A5EDFF315685030FE32A28864853666FC358DA9301B9D3D0691A284A316ACAB0710DA61E4E188CEECAFF2356819D81D02F5CCF214D76C3D8A2D8AFF00235458A6667DC36F99D384302BAD8D2677A20D52AF4123A73611FBD4C738D801D082AEAC318FBAE2AB118F8AC745E463DD8F8D63A760489DD303B2ED50CAE096112484E901EBA2CA0AD8BD07245F9CE6502E6F904C1058DC695D6FC80F93806763660E240A5D70CA0BD0C58CE91B2189895504A58262947BC084B4E702FBE85FD03165BC560D3A304B4C982B4D0258C1DC9DD629FB2942556EAAF2264A81C29C849302449ADCF81EAA50E1809D092D77416D05B916FBFEDE6B2E3C4360D55805D6C50E57A7014E721BA79E148C6CF1CBAA4AAF2264A81C29C8091910611BB1F724D22AEEEF4BDF29177367D115282D1552439EA8DDD066BF1BF010596D52B55E44202BB17A446121DB8BAF50B201911309563D88CED985F7DC7E140E9252F601679EE01F73F1E3B61248700E42658CFD44510854CF1B0D034B069C70858CC13C9A6E5394D41956A08D120905A49D5F3B3F07AB2BA734959709050E74517384EC0CBDB92D168AE425850C1B2A964209119CDBA559856D40DDE84E2E1B9BBDB4F1846A98A040506000800301E869DA5298CD25976095805A90BF0C2ED30975C9E820292394943A02D00101821D1A5BB5460264A06F6FE1A026781DF055D546025117F2F00283C357ADA2BDF0B3A542F738100D5FCCDF800EC29C261365164B259B5602FDE2531AADAEEAED1787BFEDE5D3A09978ACA59760BB00B4812D4A3846094CA7682DC1D23C943A03E5A206061A746BDDAA685B400DDE3E0D013BC0BF82AEBA7012B5FACF005878682CBA272F51674AC762607B81BE767800114485912A497C7AE96432B84EDBB9CC121B784EC2CA8E994FA8250BAAE5E0561924583084551A82DE8AC385E93A90DEE47B50A0D443B4E2C7DF43C05A19F4522CCA16F80D0D865EFADEE27BD30A091123D0847417AD2E3B73B2467AC1386B1A0ECB067B785E827F620C5964191E603EE7E3C32F25CC5918E09485D8D29ECF0A7320BAAB496EA1E4DD740D558D69CD38B075913D403A2A86970582A874A708F80A5AB7926F86A7D5236C1D2E93B07AD06A01B3484C195DF2F72DC110345900C88984A06B8236DA7BFC5783D35015602EAE22AE940D895038B3DCE8A8B1AA53004B0176EB62AD78E888C4FAC5AE600694FBE6B4B1C29484A87C0FAF40D65388508EC14E332E33B732D6C765A487064040BCAF05A368B7E84A051440A28BF4E588877BF3A0889239280D198DD7A9B7F8C397AC4195D085C46C8D1BF120A54A09097441C9C7DFF6F261A8738B432AC05D6C5E9B75242E1C059887C580E08092D03AB0DACE86DA8B4990144761AC05A7100D0E740028846E2352CA230D5218FE890E52C80950420DC47821E5175AA547099CDDCA3C818104D971A74C07375C0A452A7D41285D572F02B87E82670C1F3F9501850B1D600003639E7A90BD9A440B2DCECC96A1094E38429402C416D05CD4E036D0211BD9B700E25E603EE7E3C7901DB635E21CB2FDD121B8283DE0CCEC2F7965E64B242401083644A62A04948F8EA74474B08159ACB2C4E4044CA0D452ACF17AA50BB6E0F53D063D71B4C69814958286A0274E0DF84898173CD013B608BA014A762C5DB567C5130B1092F910CF049D8C9A5A6FEE3763EA03813B743638174820CDE71F4F4109A9A37BA446E917F7E036DE28549048C4804DD06B45EAF8A1504544B2EF82003D2B6197B16E069BFB1C87BFEDE4BFD92ED04AC655737DC93C0E40B3655B9B5F13EB7045036D816032AB745D2EB76FE9174402C0B81A47CCC9C0ADB250442DA9B8E4A2F8B4067CA36593983AF1D774AD0A80D582C6B482A6433B3A5B35AECB97808C8F5B273B40B5D4EA7A4C2E18F46E225D1085C6E5E9A1153B56221692CF67039C0FB9F8F1C44CAE1A384E2E1BF47D015C9C4A8E888D24DAAEB34412981A1E12105C996C99B02BBAF44015D8EE65008B900CE51564781CC4E6C8B2806D6E17CC3B8895830C740C940CB970340960040703965E94844512132545B27BCB2FEA88BC198993804DB16EE6E9595B4BFC514499D0A1591B2E81C0C9A945C13F7CEB0707A6824371C95159E990501E9B668F8BDFF6F139D3388D1717811E94E3D91950A6E93469D46AA100195697A005BC2333363A64E57D46BFE27D32F233462C5B49E108B0AE6123C92047638CD21406E28A7711DFC17C0458DD73A36A6C51975381A0460041E99A40308BA4CED90F498688010308D913980FB9F8F0CBE036BC83EE4D0F8377011BB0F46CCF3F94D97A70264D22EE343E4FA4100BB6940BA4189032A0F05FC8C1B748A4A1224F2593C242F2D6AB27574AC64B37CEA7C6A0C3EA99078A0E38122D49CBF4D3F42A2CD93BB1A596031E97F47459C01739D040735E6A61C90D90FCF2C8CFC0DE6BE15977E1009444CE54ED58EB0802002C007A91D45C26583E973C7EFF00B78C08634CDA2F44BBF047F6AB854F39FC250CE053620780BD06997008B620FAB961A0882E2034021D3980FB9F8F0C1F91144DFEBD9E9260959D979F47052A077DB63D25578AC542034E029CDF342B6C1D2D7C4CCDDD196AB82121A00223D1A399A4B1575DB1F6D0EF8C028CE2030E36714DCC231166822C8A4886B19EA8BE0C3A4D1784100CEA628A17528249267B394093006923850664D9119F55581C1BB98F85E3EFFB78B755D340C8FC384B036B81B3BFD5FC295A07BB84A3B0B7AACB3E13D5F19628C7CD81F73F1E1368B97DDF490D09143B85F6705072C1E19A9D34BE44FA12076859891697901DBA552B72724E475CA20CCC750081404001800E508AFA2610A8575D2A572BA1673C0C1829290089236470958E5768C1DD47815A547645F5960415D8670F7FDBC5E15879D028FAE0212FC766FC7F054BCA4F0A95556EB9E07CC061EA8ED7B1D90F300FB9F8FAF37A3DA76738A3792F24905DB1828F04670B80F24016323AD31542D261B04C8232CA459E6722EAF0C209D6B75462E75684382DF469CE90D69FE1D62B00774F7AA55A16FA0969942140EE5FDF0F7FDBC47C59FEE3F86F8FBB1BEE7F824B61979228B1820EAD1FC7002B32DF644FAA6CB696E053F4E603EE7E3EBEDE8F69D9CE19CE0161F30C17EED5D15F6C1E19CCB0A3A59E7A84A026541A20EC0F5E73C9605A6972F80E12E404C4C5F917AA9F945E859F1BC7DFF6F132795E3DE0F0FC97041FC2A7641975BC34CEEC24A1F8F56C9A08E7537C979E603EE7E3EBEDE8F69D9CD07909243BD06EDD8B12E0A7725948330903581A0D28721C998C90CA4EA1579FEB2C677F9A88CC6D6384D62EF9AE905F2279AF65022531D53EFF0007AA26FC4527A4DD5BD4702301D9261347D491444D6A463718EA6BC7DFF6F1B31C269307B0FCF057A9134B2380CA05B85059232009025913F831E53EEE293E2F9E1012462C921B77E1EA6D475FD674E05A0155969793FCC7301F73F1F5F6F47B4ECE67BF142752744DA666314C35B04F38A3F8249F44C9EF9A21E58D29D28C6A7EE39E77B0A101CA3B50EC0EBC20ACC85AEEB1316A3E992DDA0234A772C3A94809399642125A11D0E3EFFB78DA1C8E2445C6322DEB083DE84991B2E83C064979EF86272568E9DCF4D14A9F004A1600CB487FF65EF698310C081BF09D753F7F34505D2B53A38CDB0444A0862EA20E04ABE63325DE289941A8D45551A64D683B95F25BD319301BDE69298400DB7B73C0FB9F8FAFB7A3DA767281146E24A96C9C5837BE56A4942C58CF95999198704B43D204A65CC3526134B6666AE34B29EAFF003ACEA54B0C8CEED1D9BA269003519111844709483E8485643CD0D2386C5B042DD6C9976757A27C8F3D772A69F870C88256F9142FC8F23DFF006F200B3DDC8A40CFFEADA705CBA342D227EC6CEB44894CB012CC974D72766D0BD1296EEAC57166783E0BA8055E392249B49BC3AA0A16D8280217CAEEB9792DC367BCD058372B64197076EFF08086D8589F2140E2F398728F45011E5642DA12E360CBB1AA8BF28495655E703EE7E3EBEDE8F69D9C8000AAD00175574A496955411210255B82068B4848C8486816B12DC01E91A21E4F05456942E2F62AF7DD1F03E85F78C2EE3A164767EE28963E089FA4B2364B36AB4B1E528CAE7D7E52816484442E22591E64E9840F64231D81AB4C24BA8246031D13B04CAD087635ED786C0182C5B2DB87BFEDE440028846E234D5224A67E20D66FD576EA32654876A251361043B98E7D5FEAA39C84C42E216479A645110946867A6168CD65C0B644AC341919427808DC8C947D005D2C176D415E2D9806437BE259BD931CB7FEF8407BB998BE3EE492B2611813E24CC772EB75E03571AE05CDDF5FC8610E31B0F777593AAF5730502AB4005D55D2AEDFA47469863D05D543793C913F00580B058B539FF0090FE012A8C01484C348108A5D49CA385897940FB9F8FAFB7A3DA767245C73AD59373AC339185CAC758E43335202EDB36E7A79F2B3608177E2A24B485B8AF9F4090486E392AE63C65CC8595A9C74D8E8D522108991380603660A4E7207783D684C403CA10FE3A16EB60BE16FC54A12EC27E8A29393340E99AFAA370F1921DED9EB511C7751894A7BF0C3D02C9578D7DBE41B504C93E05E555BAB75BB7E3EFFB794384401D084888C234CE2DDBAE42E3DBE42E70124FE62C8CE40EAC1EB46A384D4B7B15045DD18F348F90FB11A11E3E6E16D9AA170084107B9F115A4B5C9EC2983A16E095FF00044985767BBF9A62D02A8090A0DC9CB977740E69A41724B0811F66066AE59001457CED6E8EA42D4F498E2B5408F6AB3E06544E8C8F5A8D6C91F5F396A4523A85044E871FE5FC4A67346721B58AA73F2480A313111DE6E0734291BC0176ADC6050621C24181B1B12F3AE01F73F1F5F6F47B4ECE276D4620095570054F8C024A1D9AFC1D40B2052A2401001600F4D220D30CA3BCC806B498E2F50A2611C33E90C4B941625B19DB4DCB8A582EC15F711CE08AB45EC4FF0069015194E9A20C90FB6B16A30F8007A20000603936FBFEDE772A404B9D2510B58DD5283403067670596CF439D22AC289D0D5A9DE309F604171BC9A58AC5B052274F74DB483D18DC68C6DEF84C8971C5672421EA22374607AAB33E18CB72049D4B73A4DB9406E5F1C3A854C4403893922DF31ABD05C03EE7E3EBCDE8F69D9C740DFAC70AE103BEAC6502A024177888D57E080B01EA34D64D490C5C5335F23031D8625E9A090DC7255FF007925FA827BD530965283A4B514D0D08ABF1FB6A5D81B8B7F0A5AD4E9BDBF03403DF1B9BA0A8E8958982CDFBA125EAF1056A8CA8135121AFF00015FE028DF103B00401E80202A30A1B2239A0B6F5964B7580A7AB469235D98EB4F12D9495F8296369DFF006288A0B5217E3D1D444B247B4A3A2AAD82E11BB249D57AAC1B66D72EA0587A95786613C9D9B3A228094D081F9B40B62DE47D5400D68A1F0FE6A91149F1F541AFD4A911D43F6B905C9966C112DD2BFC0544EB0A60489A40F2748FABAD58CAEDC226A6E10E8299A297D204C3E4A8739111E314448A000180388C644C4CF40E9218DFD680C3A50924D6990B663FEB94E059946813DAAE06CC1727E43970DC47485C55C2A0EB738AADE5A81CF01145E118E8000624927916D01D80CBB861C70C22652145A40921743C9AF3C3C86EE38C71C3031EFAC4CC598BF2401256BE80094812F0C120361053AA41A74DA0C2A60852430E1D179516F2D40E7808A34C8A74004624927942FE418F62F95C01774A7D22DDEF712BB8AD115A88E87CE0A112081180950447598BA1CCD3B3EC045DC365125C0A17842499389F3C0147408B03A40B225C4E53748AC930D8AFC6DCAA8B8483C60508091824D504698A128F452DE93E681B0B0D10243B9681568E795A18637412D2D12B142034525861E2A0D8045D901498206AD461CF88A12920830E7997633004492A689E92E834EB3CE88373E70D4D9AC1D7BB94EE2822D49CF1918C0C2AE6BEBFB56EAF78DDCB1B73A118304C0881194DA8A31EAB2D826EC53B32C4BCD25738D294AE4CC41898A0A73B320605052EEB6655468774804008002C072B291845B5746DC06821C2A192E58039420A6641922242C5E83BDA1486DAD2F713006572CDE0E1E89F4B4B473435C0F20E0025ABD7751ACB2974C744D98A01840084C6A8CF78DA85FD410DB248D25E2907642B0245AE006F4A050405CE3100C825813601CA1181054089891E06A4C75C364C2536D0621869D4893295A7A11E9016DE22C0A26A375B152A1B1AC22F18348A1D92A563A856E710CCAFCB1930C9317DC7B8AB195E0C589D91EFDF8BC1B70B171F7CF6EB51F8F1B8B3E1E593536A1044EACDA03A8C8252D419C4762619B363A8D02EFA086DA0051F9D4204466031D18DE80247C09404C40211203B4A51EAB272216D924F5BDAB757BC6EE569131B1D6AC4C13B72581299D959449AB6311930E27782CBF4E792BBDDF6F3F2643D8729611D382C539D0155AB65E394243C174ACBB925A8A411BDD742154EEF1A4C1D684E4E10138B3D2D2D1E51446D4FC3A2686B9D2F80BC98BA46D020218201B72B848A80945107628D96AB3A2A49CEE09B2006F7C2F91FCCA3FA785991F4812AB852BAEFF31802B399223E8A9C2C0E8BA0B8BEE02028B0A4488991E5851095EA98564D12F30EB4C8F70E855966784A376EFE0147ED35BC9346B63156C88C8170B7EC85392813913D86FE79413D75ABB6B8B475C1C821D95F455F3E5A8010AD32AF0F603D6F6ADD5EF1BB97E95031FF0000FC8244184684E39E9414C98BA8BE8CD02C9EC740FA330DF9977BBEDE7E4C9292ADB7746DC010796CA00A6ED8839422756194872350E82C5E11E8ADFF00DD4256DD61BD05D20080300160F4B4B49E67C4EB5F278288B207D53E76F243ACA37A00175251BF28DFC2E0023DCA7E5BEB054EAE289FB08D4A85F2C8199D65BC87A609F2525DBC90E572B19834BCCA9C528B302A74B6CE4436C58C818A53CE52B28246C9A3A35A2B0901E0DEC44D371A9186F50E7DB072742FB344E84478BF41D81D69ED4EA23964A1928AD0730D810BB1C831496F451F1E1AA7426B11134F607D6F6ADD5EF1BB97E9700AFF001854D92E06E171B97A7D88CE35B122CCE210C6239577BBEDE7E4CA1E816F5C1B7064233D85DA30C2273045D95E1322B6DD35D359D4226438210F913607800F4B4B4076A0CA8135121A8AE9564E58A80110C136266852A0401DD543F728E52498035558A5BAE94EA598DF45F15E648AB6DCE25C63122C8B2CA8B81E684740860E842444611A4297139321517D732135C763E0691BDC771B8D9F4413316CE95347B531DA62C2907C0216265A6F2403AD49016340097D21D491D7958A906DA935F0B805E82ED1636A5930260A34CF498518ED33138BB3CF0D2B3DB13A4728B750F50149D40302DB022C26911AEEB8644DB428994E146E925403A89668FF00D14858D262F6284211C6940A44A30024DE85A10F6460409B041EB2880B320D227BD1A69C429A1AA729FD5B07706EB5678C77CD9A319A9BBF248C8A523D29000198209634E526F38A5023448D293F47CA5002C6B6E5846C794C1760C62BFC9A7FC9A44AFA612AE622D3C904414A74404909134082B3254088882F01B0830EC126B0E6CAB9E568C43DA1C58D9146991CE800AC5A58E535FD067D9BE13225CD29B4D045E8602772EB43458C726C6068B5DA0862408037A4C595E667CC5D2BFD506385D7D2800DDC1CB1F7249442DA745264D02C9C2492EB3C8789812034D82CC6FCB6D1DE433901190CC372F22591BF48021DCC18A547228012000449800BDA567902941A9678CACE73C37AC7BCC4AD04C8E8D1589A5A91320120FD701B923106777979CF3368EC8110409023AC86128C9BAE357625359F7E07A6929DC3D6822D41C1395DD655775FFF0051FFDA0008010203013F10FF00ECE9FFDA0008010303013F10FF00ECE9FFD9" HightQuality="False"/>
     </TfrxPageHeader>
     <TfrxMasterData Name="BandaDetalles" Height="17" Left="0" Top="318" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
-      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="16" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="0" GapY="0" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" VAlign="vaCenter" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="539,07" Top="0" Width="87" Height="16" OnBeforePrint="MemPrecioOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="0" GapY="0" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" VAlign="vaCenter" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
       <TfrxMemoView Name="MemImpTotal" Left="627,05511811" Top="0" Width="89,16535189" Height="16" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="0" GapY="0" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" VAlign="vaCenter" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="11,33859" Top="0" Width="476,85065" Height="16" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="0" GapY="0" ParentFont="False" WordBreak="True" VAlign="vaCenter" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
       <TfrxMemoView Name="MemCantidad" Left="491,92" Top="0" Width="47,15" Height="16" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="0" GapY="0" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" VAlign="vaCenter" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
@@ -22,10 +22,10 @@
     <TfrxReportSummary Name="ReportSummary1" Height="132" Left="0" Top="1440" Width="718,101251175" OnAfterCalcHeight="ReportSummary1OnAfterCalcHeight" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxMemoView Name="Memo8" Left="8" Top="8" Width="129,3859" Height="14,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� TRANSPORTISTA:"/>
       <TfrxMemoView Name="Memo30" Left="9,13389" Top="95,50402" Width="113,3859" Height="18,89765" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="RECIB� CLIENTE:"/>
-      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="50" ShowHint="False" Color="14672103"/>
+      <TfrxShapeView Name="Shape10" Left="491,92" Top="0" Width="226,08" Height="72" ShowHint="False" Color="14672103"/>
       <TfrxMemoView Name="Memo9" Left="629,29133858" Top="14" Width="86,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo1" Left="495" Top="14" Width="122,92913386" Height="19,11812" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Entrega a cuenta"/>
-      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="50" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Left="626" Top="0" Width="0" Height="72" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line4" Left="4" Top="72" Width="715" Height="0" ShowHint="False" Frame.Typ="4"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="714" Height="0" ShowHint="False" Frame.Typ="4"/>
     </TfrxReportSummary>
diff --git a/Source/Informes/InfPedidoProveedor.fr3 b/Source/Informes/InfPedidoProveedor.fr3
index 01f71de9..bd3fe3dd 100644
--- a/Source/Informes/InfPedidoProveedor.fr3
+++ b/Source/Informes/InfPedidoProveedor.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="43591,5728189699" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;       DireccionEnvio.Lines.Add(#10#13 + 'Persona de contacto:');&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;);&#13;&#10;  end;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;         &#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;    if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + eImporteTotal.Width + eImporteUnidad.Width;&#13;&#10;     Concepto.Width := eConcepto.Width - 10;&#13;&#10;     eCantidad.Left := eCantidad.Left + eImporteUnidad.Width;                                                         &#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo14OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;FECHA_ENVIO&#34;&#62; &#60;&#62; 0) then&#13;&#10;     Memo14.visible := True&#13;&#10;  else&#13;&#10;     Memo14.visible := false;                &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end.  " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C14000000204E616D653D22546F74616C506167696E61732200010C0E000000204E616D653D22506167696E612200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F776C6F676F7469706F220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="43595,5193544213" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;    if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + eImporteTotal.Width + eImporteUnidad.Width;&#13;&#10;     Concepto.Width := eConcepto.Width - 10;&#13;&#10;     eCantidad.Left := eCantidad.Left + eImporteUnidad.Width;                                                         &#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo14OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;FECHA_ENVIO&#34;&#62; &#60;&#62; 0) then&#13;&#10;     Memo14.visible := True&#13;&#10;  else&#13;&#10;     Memo14.visible := false;                &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end.  " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C14000000204E616D653D22546F74616C506167696E61732200010C0E000000204E616D653D22506167696E612200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F776C6F676F7469706F220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="18" Left="0" Top="493" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
@@ -13,14 +13,13 @@
       <TfrxMemoView Name="Memo17" Left="5" Top="4" Width="704" Height="75" ShowHint="False" StretchMode="smActualHeight" Text="[frxDBCabecera.&#34;OBSERVACIONES&#34;]"/>
     </TfrxPageFooter>
     <TfrxPageHeader Name="PageHeader1" Height="417" Left="0" Top="16" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
-      <TfrxShapeView Name="Shape1" Left="0" Top="175,22047" Width="717,92125984" Height="191,96062016" ShowHint="False" Color="-16777211" Frame.Color="8421504"/>
-      <TfrxMemoView Name="Memo3" Left="363,25201" Top="285" Width="351,91342" Height="70,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;TELEFONOS_VENDEDOR&#34;]"/>
+      <TfrxShapeView Name="Shape1" Left="0" Top="175,22047" Width="717,92125984" Height="213,96062016" ShowHint="False" Color="-16777211" Frame.Color="8421504"/>
       <TfrxMemoView Name="eConcepto" Align="baLeft" Left="0" Top="392,94094" Width="442,7" Height="26,45669291" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Concepto"/>
       <TfrxMemoView Name="Memo8" Align="baRight" Left="442,74273333" Top="392,94094" Width="59,25726667" Height="26" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Cantidad"/>
       <TfrxMemoView Name="Memo12" Left="366,1812" Top="152,81107" Width="348,58287" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Página nº: [&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
-      <TfrxMemoView Name="Memo10" Left="5,61441" Top="243,22047" Width="349,29159" Height="17,60637" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DIRECCIÓN DE ENTREGA:"/>
+      <TfrxMemoView Name="Memo10" Left="5,61441" Top="235,22047" Width="349,29159" Height="17,60637" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DIRECCIÓN DE ENTREGA:"/>
       <TfrxMemoView Name="Memo11" Left="366,08689" Top="49,89765" Width="347,11812" Height="66,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="DireccionEnvio" Left="5,61441" Top="268,22047" Width="347,46475" Height="86,40483" OnBeforePrint="DireccionEnvioOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
+      <TfrxMemoView Name="DireccionEnvio" Left="5,61441" Top="255,22047" Width="347,46475" Height="119,40483" OnBeforePrint="DireccionEnvioOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
       <TfrxLineView Name="Line1" Left="718,5" Top="392,36222913" Width="0" Height="570" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line2" Left="0" Top="392,36222913" Width="0" Height="570" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line3" Align="baLeft" Left="442,7" Top="392,36222913" Width="0" Height="570" ShowHint="False" Frame.Typ="1"/>
@@ -33,11 +32,11 @@
       <TfrxLineView Name="lImporteTotal" Left="603" Top="393" Width="0" Height="570" ShowHint="False" Frame.Typ="1"/>
       <TfrxMemoView Name="Memo22" Left="7" Top="79" Width="325" Height="91" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaBottom" Text="ALISO DESIGN&#13;&#10;C/ La Fundición, 27. Pol. Santa Ana&#13;&#10;Rivas Vaciamadrid 28522 Madrid&#13;&#10;tel. 91 301 65 57 / fax. 91 301 65 58&#13;&#10;info@acanainteriorismo.com &#13;&#10;www.acanainteriorismo.com"/>
       <TfrxPictureView Name="Picture2" Left="6" Top="4" Width="240" Height="71" ShowHint="False" Picture.PropData="04446174610AD26300000A544A504547496D616765C3630000FFD8FFE000104A46494600010200006400640000FFEC00114475636B79000100040000003C0000FFEE002641646F62650064C0000000010300150403060A0D00001927000032CB00004BC6000063C1FFDB0084000604040405040605050609060506090B080606080B0C0A0A0B0A0A0C100C0C0C0C0C0C100C0E0F100F0E0C1313141413131C1B1B1B1C1F1F1F1F1F1F1F1F1F1F010707070D0C0D181010181A1511151A1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1FFFC20011080124032003011100021101031101FFC400E70001000203010101000000000000000000000607040508030201010100000000000000000000000000000000100000060102040503040202030000000001020304050600102030121334113314351631321540602436212370B0802225110001020302060C0B0604060203000000010203001104211210203141516130718191B1D1223252721323A1C1E14262B2C23353730582A2831424346092D24340F1E263A315F0B37080441201000000000000000000000000000000B0130100010302050402030101010101000001110021314151102061718130F091A1B1C140D1F160E1B07080FFDA000C03010002110311000001B5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011A36A6C000000000000000000000000000000000000000000000000000000000000000000000000014C9242C200000000000000000000000000000000000000000000000000000000000000000000000031083162000000000000000000000000000000000000000000000000000000000000000000000000022A6393200000000000000000000000000000000000000000000000000000000000000000000000023E5464C0B300000000000000000000000000000000000000000000000000000000000000000000000310A58FA2685785A04A4C80000000000000000000000000000000000000000000000000000000000000000000002913545F47A1E455C609748000000000000000000000000000000000000000000000000000000000000000000001CEE5B24BC02B53684D80000001A220445CD51E2659BE26E4E8FB3C0ACC1681F600001A7200454D49E4659BD2664ECF600000007990821847CC23F4D99282C137C0891192444C4022C454DF13535A56C444D61E86DC9796219C0000000000A64999323F4D61CFC4F8B58000006214E9033F003F4FC00DD1779B239901D487B0001E05445767C807E9F801B22E4268000002225326A403F41F80FA2C52DF2A72B12C62E400AACAA49F1382923181FA7E006517313A0000000002085204EC9115396516D1FA00001AE2813487B16213A37C7B18445CAD88A9905DC5120EA43D8006BCA10D01EE5844E8DF9EC609172B622C7E96B16980002BC29A3E4DF16512C3667C9A721256A6113137656658C5C801559549BD34C7A16813B36A7811A2AE2287E97713B000000001CEC694E8D22852C5F84B800003CCE7B23A6F4BD0DC8000056E53E651860EA43D803C0E7B340488BC4DB8000056A5427C972962800879439F25A25AE7D0000300A308B99861963172005565520CD2FF0037C0007E14C15E99474919C00001F26A4CC21652A5B659E468E7A2E92C100000AB0AA0DA9D0E6700000015B94E807521EC014E95B9213A04C80000002B529F3DCE903660F139B4D696896C80000018E73D9A1058C5C8015595482EB27E00001E67389A72DB2CF0000011429C34648CE853E8C53980B54B44FB0003C4E6730CBD89A0000000073F91507521EC0D61CD87C9D186F000000002AF3049892D05725366ECE8D3E800000011D39E0FC2C62E400AACAA4CA3A70F40000015815212A3A00000000A0C8A9689926D4919CF84BC8A9D1A7A800869439B43A5800000000424A2C1D487B02B22A22605F4000000000000504448B7CB2C0000000073E9172C62E400AACAA49617F00000011739F4CD3A74000000A0C951691F86B48D95E1EE7A96A9B90015615413B2EF0000000018673083A90F6051A41CB68B40000000000000E6130CE87246000000002A82AC2C62E400AACAA49E1770000001A939ACFD3AA0FD00000831A52D23F400578684B8400014F15B16596F8000000001CB6789D487B039F08C17693D000000000001F072C9F874B9B30000000015C94D963172005565524F8BB0000000D69CCE0EA73EC0001E273817792600035E4749900002A22B22C72E3000000001F272D1F07521EC0E7E22C5D64FC000000000007E1CB27C1D266DC0000000056A53E58C5C8015595493E2EC00000035A73383A9CFB000055861170000034E53E5F00000AE0A709817D000000000D29CDE0EA43D81499012D02DA00000000000039B0D417D92F0000000014C95D963172005565524F8BB0000000D69CCE0EA73EC000D69409D0E6480003C4E6D3A5CFD00034473919074D190000000015715303A90F6057A52E6E8E8F3F40000000000052E57A5965BE00000001F07349AE2C62E400AACAA49F1760000001AD399C1D4E7D8001481362720000039A4E8C3280001CF4468B68B400000001867379820EA43D818C7349885CC5880000000FC2A130CB0495023073E19674899C0000000AD4A7C163172005565524F8BB0000000D69CCE0EA73EC00458AB8BE8000000A50B4CDC000022A5007A17E928000001E650E44403A90F600AE0A70F62FA25400000054A55E6E0E8C3D8028A2144B4BE0F5000001172833C4163172005565524F8BB0000000D69CCE0EA73EC0073F1751B70000002B325049000002AA2AA3DCB80B08FD0003525284589391807521EC002942007B16E9631FA0006215115E9907409210018473C9A824E5D46E400015F94E1E64848D963172005565524F8BB0000000D69CCE0EA73EC02086B8B300000001163C497800000AA0AB4FC3724DCDE9EA6BC8A10C3CC981721CD60EA43D8007E14E95C03724E8DE1F66B88D10B31CCE2F524E0000D51431A33EC9912B364799A321268CF52EB23A56258C5C8015595493E2EC00000035A73383A9CFB07E14E1719FA0000000D491F26C000000444A908F000032CB40B34C239901D487B00002165466940001EA4F8B60CF000001E055857063000024E5C4484A8CAC4B18B9002AB2A927C5D80000006B4E6707539F608D1B536000000001E44349B8000000047C8A9A93C8CB2444C4F707C1A506F0FD00000FC230458D69F8671BF25865800000000C7224478C13E8DA92C2420180609986C40304C1328D90000001F06981BC00F33D0000000000D41B70000000000000000000000000000000000000000000000000000000000000000000000000000000003E0D19BF001AB3680D11B93D0023647413D324023E46413136A01E0400F425E6CC00688DC9E8003C08018A4BC9080011A23E671363F40047491000D290627C6D4007E18467031CFC3240008F1103289F9EE0000000000F12BB2CA001481661232B927865007915A13F3607E805605847A1EE7D006B8859372AC2E10015C13D32803E4A7CB40D815D9B725E002AD2C934647CB140055A5A4002A62D42304B0006B0AD4B7415912824A00226690B14C02AE2DF3EC000000000F12BB2CA001561F25804389E194002B42C2324005607A1F44D0DA806B8AC4941192DD0015C13D328022A7C12D00AA0B5C00556484D29BC262002AD2D20010F3485947E800899062D6324AA4DF93D0015396C00450FC2580000000007895D965000AACB48A94CA2C83280056858464800AC0B10F43D4FA00D71591F85BC7E800AE09E99401143F096005505AE002AD3C4991260002AD2D200023C440B40005764D0811944CC81166800A9CB6002287E12C0000000003C4AECB28005565A87814297B994002B42C2324005605847D9EE7D806B8889927B92F0015C13D32803E4A7CB48CF2BC36C4B80055C5A05465AE7B000AB4B48004009E15216F000AC4B38AE4C62CF2B02CF001113505886015796E9F60000000007C1A337E0023848C1AF330F4001A03787D8008F11A04C8DA00781AC37445095800D11B93D0007815F1824D09100011D244611AF37A0023A48800474851601B70011E2427818E6791E2420004788599858264000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFDA0008010100010502FF00C2677628A6A66520D1EA5FB89E535F82D5DAF3B8F71FB85DADD06B537524EFF71D9D7E942D492E485FDC3213B1AC726EC2B49057A41CBB27EDF76ED06884ADA5EBB1AAC61DD3F7D5C62E24D18A9B4420AC093E49172DD7FDBD6378BC84B44422CF9F366C8B64554FA89B66C9B74EE51A9A66A91DC377DFB7517E763335C7E0F92D6EEE0A0DA09689731FC27F371AC71D5D951C5ACB34AE1A4E44F9EB5E627312A9E37B74BA58C6E0C16C22845098E15E8A1F390CF9C8610DCC4DEFA5A3D883BBB1B16B34D2B8692913E7AD7B89CC4AA78DEDD2E9632B9315712592589C25144D323DB7C7218E2E328A629392EA60BE7A38120FCB88D8665216975725C8F9B8E7DACDCFFE2CFF00390C85B17E4D7D67273F179F390C86B20493AC7D22CD8A6F6EAA88AD60985B05F3D1C2C9481310B34CA38CAEA51C68F9A3C4F8D6A88141D41AB0044C040747F22D18A32720AC83CA7C4A807E03A74DDAA32D6B74E47811D2EF63D4889A6B24948761A23E4ED5D74504A5ADCBAC26318C3BD9483C64A43599B3EE0CCD8DAC7E3F947AF8FBC044061AD8AA229A89A84BC79F949EFF005BCFD3297EEB3F624E3C1C385DC2BB9BB970D9582B324F78D6F90E830CA9B15D77D6F72F5AAAA2AA2A6AD571159200000DEFDFB762DA5259D48AF8922AACA47D31C280DAB70E8011B374F394B8AC7B15B1DD462D6C93AE4831D105D641567329C943E88F93B1F3E6EC5BCB4C3A925B12455594614C70A037ADC320046CDD3CE52E2B1EC56C79508B5B24EBB20C35AED984C3BAC763F4B82222391D0AFE4059D318A788C4C62380420619248D8E20A257C7F4A0C74CDCB5572027948F56EA629D4CA4F7FADE7E99132431EA1CE750E83759C2B1D4C2F837888C6F80428628D9BA98F2AD12E025ABAF63F401101ACCE8BD4F893B21EBA4914545958B8F4D832BA25CD1D9543F3426F5142249CDCBA924EF22A21D492D1B12CE3D2DF3B564D6010128B674B3653447C9D575D241198965A49D643C23A92563A2D9C7A5BE76AC4540404072AB382E09B2C735F8F6C2222390555E70294A52EE7AC5ABD466A09C46A98A3A59443293DFEB79FA68CDA2EEDC44C3B68D43688008596BC0D346CE156CBB1769BB69BCC3E058A924A41ABA78D9AA7659C4536195088E52E5911EAC2E5294F18DDF729410D2363D67EED932419B7E0DA608154F547C9D6DF2DD55B2162149274DDBA2DD1E0DA604152622B288AB1AF88F9968B2C9A28C8BE55F3CCAAC101F84E1BA2E11998A5235DE949EFF005BCFD34A8C6020CF7A899144E5981983FCA4BCF14F80FE080EB4BBC7AE5DE41451A45E94A52971D25D66B9475339C9B965488A4EDCA8E9CE55A341A47F0EC719E8243447C9D249E032627398E700111868D2C7B1E1BDA6751CFC21CE40C3B98C2E9737DD36990F1E2FE40A5290BC29E8C07F1FA527BFD6F3F4C6A80AEE5321532702ECD3C53CAC38E8CCF06C7149C7BB4D33A876A958E1920B82A9E2570883E37948E719268F4646967109049E9916C9285552D96C73D188C8C6BEAE43E9C4B733EBC5E88F93A5D9D782195667EA25BF436873D799CA534E56FC4B233F4B2F949EFF005BCFD32AE97526B836647A90B8C94E9BCE0D818CA95ED4223C0304007168C8E5F17A946994B5A3D39AA78F84C3F8951A270C53962B65E15FF194D4B9E5B88F11059A688F93A5C15E797CA3A3FEAFD0BB53AAEB2BA974A1B897847FF6CA4F7FADE7E994D0FF00EB70658BCD1781FE043FC86FB2CEAB1E10760967F200001B6CD04EDFB8AFC5BC652FBAEE3FCCCA407F2B8AB0782B88F93A5947C66F2985008AFD01FECD22C3C23789760FE0E527BFD6F3F4CA5FBAF064FDB7427D9B965534529078ABF7D011211CCB6BF75E919FC91A74375E0BFC8CA49BF9BC4308014C6E63623E4E9662F2CDE52CFE317FA010F1031794D90E7E78AE25DCFF00C5CA4F7FADE7E994BF75E0C9FB6E84FB375CA53FC54223AAAEE992F3449BFCC46EBB23CCCF2A8BF4A678934E3D3C5688F93A5C91E494CA438F053F432E8F464F2AABF561B897571CEFF293DFEB79FA652FDD78327EDBA13ECDB22F9362CDB20EA5649B3749BA1B9627512F58706403E21B671A7AA8AC416320BB75C8BA1C3BABF0E4D11F274B9B4EA30C877DE8A4404043F417369D390CA53D022FC339CA99241D99E3DCA4F7FADE7E994BF75E0C9FB6E84FB36DAE57D53CAAC4FA467C0934BA522D0DCED775823FD149653A54049C278ED168D9EBB55E3AD11F27472DD370DDDB651AB9CA94C02E870844001E5CDD839F9A4AE57DFC83F6FA58A3FD6C663570A3670C5E24F1AF0ADF2C09A5A527BFD6F3F4CA5FBAF064FDB7427D9B2C52BE81856A27D7BDE0D8A3BC5FC39B9A2B758A27F20C8404052554494829B4A490E028A26927609C348ADAA3E4EB6D871592C455511560E751914B8367B002819151CAC83C4514D14B5B3C47A27995F9B3472E92A9AA9F02766D28D415554554D293DFEB79FA652FDD78327EDBA13ECD4440025DEAB2D2B151C9C7B2E0DC5B8F2D70FCD0BBED3023E388ACAA2AC45B5BAE002021B6425593024CCFBA923644C328F13D11F276592BE2D0F892AA24A43DB51540040C1B5CBB6CD539AB52AE83104155D584884E35AEC7ACD178DA4E35C47B9C879E751A68F9662FC9B447C3262D6DDB82CBAABAA5298C6968918E47293DFEB79FA652FDD78327EDBA13ECD6DB27E998D461F909C2B1A6268CAA0F8C2702C1571F1D18CBC832C6D7750309738A1C1B843E2D776818F2DD28BE1CE739B20ABEB481DCA292117A23E4EC3140C13B565111D18CBC831C6D7737812E5122037188C56EED031D5C64D5C59C2EB9F19B272F1685826F1A9EE918D6D20DE5221DC72B8531886676C954311BBB51C0B8C3E1EE71400E2EE7C7D3324F744D351552BF5C2B1CBC79F949EFF5BCFD3297EEBC193F6DD09F66822000DDB9EC13600001C2964D55632A1E3F88E0CB56D93FC908291623B9BB570E5489A794985294A590EC3447C9DD2D5866F71FC3C8311DC9A4A2A78DA7BB5B19306AC92E02C822BA7294E397176EBA07DD1B5E917C31506CA38B978F3F293DFEB79FA652FDD78327EDBA13ECD270CBA8830628316BC3548274AA043923786EE0225D62D486A386A43BCF84C862547531AD42292C45BA08134390A727E0A1F3F050F800001BC40041DD6A21CE2D47260D25F60525FE27471C6F50894F1BB46AD8BC459BA0B91CD46215C568E383497F85A43DC429080633808A69B1CB064E87F050F8DA398B636AE58B3759F8387C6F1AC1B1F827210E4FC1C3E7E0E1F674C9D4E2C6B23B40FDDA73729622611934F62722DCEFB49696463524CFCE9EB2F388460FCD98E7CD98E365CAE1BEB2F328C617E6CC73E6CC7232413906BAB8581143E6CC70B758E116324CDF27B25A5D18D4933F513D8BAE8A09B9B9B603FCC9720C6CEC7C86E979D4230DF36618DADF12A98040C1B1BCD20B49EC9496691C885D8DCD1D26D6410D823E00C5E24F1AE8E174DBA0D972B86FB64A763E3F3E64B9C5BDD1B09D0708B84B8CBF9348ED765805C96C7093094936CBB762D7B6D4E9247CBA24911B376CDFD3800006B78F288D9B727A56D8521481AC97B7539144F18762C8E0E10086B26CBB764D3B5D4C6294BFCAB249B28E64C886294C137594C4B5B981906BB2E1DE7A56D92904C5DB6A5BB51467B233FB86C972917B599248C9C6D7D160FB64A2BD28DA648F22BA5CE47952AE2BD485D96398FC7B483AD1394A52941E473378410755A9221CA727157F2691DAEC57FBBCC46B88A77192484835BB762D7B6D977ED9B76FB2F1E516ECD003E6ED3232408FDA6B25EDD5B9D8F60C4F7088295891DCE4D6CBB764D3B5D6CEB8A30B566C5461F5665F4771D9723015D7CBA1B24ADC8A885622D462CB6467F70D96183FC8A71566512500404365A55E9C2BC60A210EC1DA6F1A2CA9114A31B292834C579A2B63F2FADB7EB676E55A1AACB19585E2AFE4D23B5D8AFF0077314A62BB6EE6BB216C7483A8A6BDB6CBBF6CDBB7D978F288821C9E9D0C294A50D64BDBA0619AC842D7FD1A2F00000365DBB269DAEB68445585ABB82AD0DAB337ACB8ECB8800BBB1C111B6419E31C35DB19FDC36CC42B69246B4FDCB679B2EAAF8302B54CCC2B6B28C642D8F143031649B4674F1E9AFB1F1BD1DC75B3B82A30D5744C942F157F2691DAEC57FBBE2E824BA3351CEE34CD7B6D977ED9B76FB2F1E511D36E4F54D70A721C3592F6EA5FB5D92145E255D9A0906FB2EDD934ED75390A72FF002AB524CE419BC4C440A137654CA5AE438C7B5D970EF4400C0E135AB9288AC9AC96C8CFEE1B19589609431C852B65024ADBB2D3FEE94CB5B45123575352464F22BFD16DD96387FC8B583B2104A02020F2419B32185CD9648842909C5397989110E8C627B0D0888CBE8FD8A0F9B244E44F64BC3A32644C9C84D92F0C8C997E12C73E12C7235826C1A6AE110590898B4A35BE1EBCDFF23B25A21293493274D3D8BA08AE93AA623CC14F7A718D818F8FDD290A8C82B8F59A0F1B454504727B1BC2A28CA6C9683672450A6BC118D8B691E8EC730C8B893C5D04D7458B249935C18647F2FB64A0A3E43069EF482D6988F320DD16E97FCA1FFFDA0008010200010502FF00B9D3FFDA0008010300010502FF00B9D3FFDA0008010202063F02674FFFDA0008010302063F02674FFFDA0008010101063F02FF00E935C53D79615754945B28ED299CBE9161CC46D83FC46A34CA4B8D1364CC9436E1550FB82D4DDEC916EF9FE2279EF86852B7843CED4BE5C651C84A4CB9D9673CB67F11BFA57240DD36F821B3F114A57865E2FE2221D72F3A3FB48B55E4DD80D5C0DD3A557827292759DD8628A9D1D8D3D2806A1E9CCABD11A2F1FE2053EFAAE369CF050C134F4FA0738ED9E28150B4FE9D8B544E42ACC3C700767D936E32A24B760ED12A4C8E8C8A83534C95F74B299A39D34FA3963B37C86EAD1CE06CBDAC42BB1712E5D3255D3391FE1EFC9336A1A5766DA34AF213BF642985CDB4327F50738CD2DB84B2CA6E368C8910A45E526F5979264770C14373912544A895199D661BAE6C5D2E1B8EEB3941F0422F0229EB02908398A9BB7F879CAA28ED16971C9A4EB988A8A8EC90D38A7794119F92244EBC4A7A7F394BBFB8912F6A28D8BC82F312506CD8A0E0B49036393CEF79F0D36ABC9BB12A5A7091D272DF00947EE0A0684009F2C72AA9D3F6D51EFDCFE631C9AB777544F0C77852F0F484BC299404D424D3AF4F393BF016850520E450B46071D94FB34954B684E3F67FF27FA63F67FF0027FA612AD227B07EA1D015F0C5AADE822929FEDBBFD238E3F7170684003CB1CAAA74FDB547BF73F98C726ADDDD513C31DE14BC3D212F56501352834EAE97393C7E080E34B0B41C8A4998D8CADC504206551B0414B00D42F5589DF3C51DD0432350BC7C31CAAB7370DDE0945B50E1FB6A8E4D4BA3EDAA2CAA52BAF2570C0154CA5C1D24724F8C4499724E7C2558AF2EE61693D8F6BDA0279D7726E18FD9FF00C9FE985B5D87657137A77AF67968188CF73DAF6B7BCEBB2BB2D474C7ECFF00E4FF004C163F2FD9490577AF4F210340D382FD4B811A139CED0829A3642474DCB4EF08E5552C6A4723D5945B50E1FB6A8E4D4BA3EDAA3DFDF1A1602BCB01358CCBFDC6FF00A4F1C7694CE07139E5946D8CDB3FE79099D3BC7BD0332BFD505542B0D1740BED2D7CAB3528EBCD165B80BB50B97453E72B5010BA872C9D884F4539841FA83A24995D601CF3CAAD84BCFAC21B4E7305BA49B0C74BCF56EE6DCD86F30BE479CD1E69DC8E4721E4FBC64E51AC691153F297EAE1475463175E584369CAA305AA1EE5AF8BE79DAD1054A3327293B07694CE141CE331DB10197BB9AAE8F9AAEAF16C25B4F7D55F0C641D68BD50E5E1E6A32246D0D8262C220335E4B8CE67BCE4EDE980E36A0A42AD4A8648A5EAAB84607FE57B43128FF13D9C0BF92AF5931D83325D59CD991ACF14175F5971C56551C70EB0B2DB8338814F5326EAB37457B5AF56CDF964FBCA9B3EC0CB83B6BCA453B16AA448BCACC9E38A75D3BCB692E2541412481C9FF38BEE2CAD5D2519984D755F2D07DD359ACCEAE2890C9B02AA1F3248C83393A04768E99207BB686448C01B69256B5644A6D30175AE7623E1A6D56FE411653870F49CE5792390D213B4008C91DED3B6BDB4889B57A9D7E8DA378C15CBB5607F7519B6C66C09799514388B52A115279B508695DAA3ECE51A8E1475462A9F7D5248C83393A045E7392D0F76D0C838CE00DB482B59C894DA602EB1CEC47C34DAADFC823F6E1C3D27395E48E43484ED2408C91DED3B6BDB4889B37A9D7E8DA378C1594F6AC0FEEA336D8CD853475CAB7234F9E0571E39A4A43FA8FEE39D0D435C124CC9CA7077289379DD5589F2EE44EA96A7D5A07253C71DDD33635DD04EF98B1204729015B623974A899CE9174FDD941550BB6FC373FA8476550D96D7A0F8B4E0EC9D25546BE70E8FA4228D49334A90A2923419607FE57B43128FF13D9C0F3C813754D9437A01245A76A5056B3796A33528E7301A6505C715912202EBDCB7E0B7E357147754C81AC899DF3331600224E3485F5920C725BEC17D26ECF06482BF7D4FF1539BAC336098CB1F96A83FAA6C58AE9A78C6CAE3A0CDA4F21AEA8E3CB0869B179C59BA91ACC229D1945AE2B4A8E530D39F0DCF01070323A2563EF13E3D814E386EA1026A51D022FE46116328D5A76CE0B8D725B4FBC74E41E58B8C279479EE9E72B60554D0A6E3D954CE656D6830411222C20C5F68C894942866295091070A3AA3116F3AABADA04D463B4558D26C65BD038CE0E472184FBC78E4DA1A4C5CA745BE73879CADB3B02AA681375DCAA6064575741891B08CA307E4AA1537D03BA51F392336D8C5ECDA3FAA7B99E88E97144CDA4E5381353F501665453FF571404A45D48C806396AA117D39B48D60C4FDE532B98EF895AF034CACCD0C4FB3D57B3607FE57B43128FF0013D9C28A7644DC5FFE4CC5C6F94EABDE3B9CF931A46D072883574A3F4C7DE23A078B021F68C9C6CCD30D54B7CD704E5A0E71B87602653966101E4725591C6F3A4C76950E06D3904E3B1A5752E395134DE410649F3B26F60FFB17872956538D59D5BB82A467480BFE533C0EA3A2E9F081B027E9ED9CBCB7FD94F8F0269DACF6A95D14E7309A761324277C9D2762557D3A7BD47BE48F393D2DB1888EA8C4FC8347BB6AD7B5AF46E60ECC725945AF2F40D1B6612CB29B8DA2C4A46C4AAFA64F7A9B5F40F3874B6C6043AD9BAE20DE49D621BA9479E3949D0A194615BCE1921B054A3A843952E6559E48D0330C03EA1529B3FF00CE83EB716C4A65E4DF6D624A105A36B4AB5A5E91C630BFF2BDA18947F89ECE1FCDAC77B51CDD48CDBF9760536B1790B12524E830E539E68B5B3A5272607E8D479BDE2368D87C5B09ABA174D256675279AAEB08956105E63BA3772724EF60083EE11CA795AB46EC04A44929B001A303ACFC44293BE2582ADBEA2878639C2CCBBB93196EAEC4360A95B421CA8739CE2AF1E2C01E50EFAA7967527CD1E3D90840930EF2DAD5A46E614754617AA4F989E48F4B20F0C15A8CD4A3351D66001693904219FEE1E53C74A8F16C8B729DE4B4D28CC364648FDD23F94C3ADADE4B8D2F940004495E5C2DD224DAF9BCBEAA78CE06E9FCCE73A7D11978A025224948900346C6B401DF2396C9D6336EE17FE57B43128FF13D9C0D309CAE28277CC25B4092502491A86C2C558CA93D9AB76D1E3C0C68726D9DD1678762171DBFDB4D770E5489E9CF096D02F2D66491ACC764D52B6FB5CE5291699F80F823F5542B6F5CF3ED10205FBED7593FD33893350859D13B77A2A5AC975C54B6A7643CDF49A27788E385B5687BB643A17D49D8774C25C4E45898C55A4657941BF19E0C0C53E65AC5EEAE53E0D94BA072E9CDE1B46C3851D51869E9479E4AD5F66C1C381055CC6076A76C64F0FF008277A2D49B4EE65F09381FAB39567B34ED26D3E13B2BC058877BD4FDACBE19E07FE57B43128FF13D9C0C6845E56F0D8AA34A64B1B878B030E741C49DE3B13B53548250B5725C16A6EE61AA3FEC5E169B29C70ABC582D8EF699B56BBA27BF097189B2B4A82AEF390647248C3A733812B1BD2F140D6DAA2BEA2A99F787F4A47280BCB99C99393A62942F9DD989E2D235D751F00C057F0DB51DF90F1ECAF35F110A4EF8C28EA8C377E1B694EFF2BC782A9ED25281B96F8FFC13CE74D6A56F9C14C34A6F7F319ECB4AF69BC83E02303FF2BDA18947F89ECE056A695C2362AB1FECAFD5C20EC0D354F2EDD7CA54ED923CA612C2D28532412EC93290FF003890C98AD3D4C124A51755332C86638629CD4A6E1712E5D4CEDE4FF9E3D38FF6CF0E0A93E80E1D9963D23811D5186AB6C7AA302CE9755C03FC09DAC3483FD947AA36560FFB9EC9C0FF00CAF686251FE27B3817F255EB2762ABF92E7AA70A76B1D6EB8648402A51D421C7C8E5387908D591220057EE1CE53C7813B98CED4DDBFD909DDC938A37D4CAA756541B0244A4A5574E8C7A55694A86F1F2E0A84E96E7BC7CBB29272082AD267811D5186A75DD3F7460713D174F840FF032829D0658290FFB48F0096CB4C8D2B277879703FF002BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC74FD39B3964B7FD94F8E3F3EF0EEDBB19073AB4EE63D58FF697E011F4B73E13EE277D4158EC3DF0D777F987FA70340E474291E09F08D96A5CCF70A46DAB923870A3AA30A5CCCEB637C5982A69CF9C0389DCB0F08FF0554DE87152DA368F060686768A9077E7C07656981FDA44CEDABC80607FE57B43128FF13D9C0BF92AF593B155FC973D53853B58CE54B9E60E4A74AB308BB39BAFAAF38BD0339DC8430D0936D892463AD1D3491BF09A4958874BB3D72025E08071AA1A16AEEDE46DA6DC0DBC8E736A0A1B90DBCDF31C4852777646A8526D3DE39B5913851D5185BA81958572BAABB3865819A8F301939D5361898B41C87FC0A2A0735F4DBD6459C12C0F51A8FBD17DBDB4E5F06C8A5ACC9091351D421EA93FDC54C0D5986F607FE57B43128FF13D9C0BF92AF593B155FC973D53853B58DF966CF714F61D6BCFBD923F30E8FD4545BB48CC3772EC352DF45C54B6A76432AE92127C18EE200EE9CEF1ADA39B70E03F4F70F2933531B5E727C7B1AEA1E324204F6F56EC3952E739C33DAD03730A3AA30B8C39CC712527761CA7739ED991E3C1F9178F7CC8EEBD2468FB3B1CCD806530B14A86FB006482A06675E511EED9DE57F542AA2A5284B64C9ABA089CB29B49C2B4A44DD6BBC6F6C651BA3036FB7CF6CDE10DD435CD58C9A0E71B9B1FFD7B47BC72D7B52730DDC2FF00CAF686251FE27B3817F255EB2762ABF92E7AA70A76B14DC3FA87B92D78D5B917DC1FA66794E6B3993B17D42A2FDDECD2D3811D2BF241DE31487FD947063F207EA19E535AF4A7762472C25C6CDD5A0CD2A1A624649AA47BC6FDA1AB61538E282509B54A3171BB291B3DDA749E91C44754627E7D91DE343BE1A51A773025D69575C419A5422EAA48AB48EF1BD3E92756C4AA0A4572723EE0CFE88F1E0453A3265715D14E730869B175B40BA91A86276ED8FD33E663D15674F160BABB695CF789D07A4212E36A0A42AD4A86C32125552FDD37ED1D50A71C55E5ACCD4A3A70BFF2BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC499C91DC8BC99F674E9D5A776114E9B48B5C56951CA76243CDAE4B526EB8D6752106F4FECCED8A53E891BCA236057D42953AEA103D7E3C0975A514389B52A101AAE932F64ED3CC57144C5A0E438D7AA1C91F35B16A8ED08BBEEE98735A1C2AD381EA95CC53308519F4940641E3C28EA8C53554C9FD2AB9C91E61E2C0971B5142D36A5420355F269DCCF79876F444C198390E376950E06D1A4F8A0B147369836297E72B88604B2D26FB8B324A445CE73CBB5E7349D0350C55D3BC2685F835882C3DF61799434E0BA3BCA73CE68F08D11361CE579CD9B143731A672416A8E4F3FD3F313C70A75E515B8AB54A301291351B00114A1CFDC3A14A74661924303FF2BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC4FCB20F7B5361D48CFBF923FEC1E1CB5D8C039939D5BBB1B920E2A40CC3440CD955E88D10CEA2BF58EC2AAAA04D995CA71C29E2C3FA77884FC336A778C4AA6982BD26CCBC0671CA43A93B438E3FB9FCBE58EE69D6B3E9109FEA8BAD5DA74FA1CEDF3056B51528E551B4E00E3936E90655E756A4F1C3CD349B8DA19584A47570A3AA314A54269361061553429BECE55339D3B5A461FD3BA427E19B53BC625534D3F49B32F01E38B43A9FB23C463FB87ECF963BAA75ABAC427FAA24C8430348E52B7CF145F796A717D2519E00CD3A2FACEF0D6627EF2A55CF77C49D58E597C75179D27488BAF09B67DDBA39A7CB802924A543211962EB845423D3CBBE23BEA75A3AA42B86EC7F707D9F2C7252EAB7071C4A9A9A5E93867E01C7127DE373E1A6C4EF0C01B6D256B558948CB02A2A64AAB390664796297AAAE1181FF0095ED0C4A3FC4F6702FE4ABD64EC557F25CF54E14ED6199B00CA61CA95CFF0022D197D91CD4EEE53121601906C752DB226E29B5048D3123952E286C45C4F7353F1139FAC20975BBCDFC545A9F26EE3F66C365C5E84C077EA06F1CCC2727DA39E0252249160022A7E52FD5C28EA8C72EB5DC541F38734ED88EFDA373E226D4EFE3843692B59C89489980BAC3D837D0CAB3E211D953B6109CFA4ED9D84B4F202DB5654982E7D3D5793F0159770F1C5C79B536BD0A12C70528EC99F8ABB06E698EEC5F78F39E565DCD03052F555C2303FF002BDA18947F89ECE05FC957AC9D8AAFE4B9EA9C29DAC29A0A7F7F57C99F45B1CF51E08453B23929CA73939C9D9168064549201DB871B5892D0FAD2A1AC01B24DC60059F3D1C93E08EE6A168D4A015FD31C8A941DB0471C7BF6BEF71477B54075533E12226E5E7CFA4643784A2E32DA5B4684896128509A5424A1A8C7ED1BDE8FDA37BD121906C123922659ECD5D26F93E0C9E08EE6A88D4B4CFC225163ED7DEE28B5F6BEF71477B57B89479626E5F78FA4643EECA2EB0D25B1E8896CB71E6D2E274284E2680A64FA06CDE338EEAAF7148E23163ED7DEE28E5543636AF1E28EFEA54AD4817786F44DB602963CF5F28F87101A8652E94F36F08FDA37BD0574EC25B5112252336227F30D25DB9CDBC324E3F68DEF4768C3086D7295E48CDB1290B1790A12524E7063F68DEF47ED1BDEC42E4B9644AF6AD1B35405282BB67D6F03A97A7F8B8AB409C38B690A406CC8DE978B15DA2E6BED00647CE044ECDAC2871D429616ABA2ECBC70958F3803BF88D875B52FB59CAECB36DEDC7B877EEF1C7B877EEF1C34FA4492EA42C03AC4F11B2EA14BED672BB2CDB71EE1DFBBC71EE1DFBBC702A1B494A49224ACB66238F1130DA4AC81A84E3DC3BF778E394CBA35F278E2FD3397A5CE4E4236C62A1C750A585AAE8BB2F1C256322803BF8A5D79610DA72A8C5CA5614FEB3C9DECA63BFA0294E9991C222EB4BBAEFC25D8ADCD38CD875B52FB59CAECB36DEDC7B877EEF1C04AEFB33CEB16782701493306D0462B9F4F0DA838D4E6A329598A1C7CDAAF76D8CA62668BBAD37BC91DAD3ABAC83CE49D78A4E886EA5AE639A728D585C7DCE63692A56E434FA6C4BA90B00FA4278D75D5DE77E122D57923B8A02A4E9993C022ED530A63491CAE2301D6561C6D591436773AA7822A7AE38315C5D34FB6404A93772F25133E08BDCD7D1EF9BF18D47053FCCF6619EA2783139680A964989C535C404F2CE412CD0DF748E68F3468890B00C831293ACBF1427BA464E888F748FE511248091A062557C95FAA61C2B42547B636913F353125B0DA86B488A7FCB58CBF7668F4566E91E3C5A7F99ECC33D44F0621528C922D2608BC5BA06383FA951729DA08D2AF38ED989284C1CA0C1ABFA70ECAA1BE57668B272E8E83052EFEE59B1CF4866562FD3F6CF0A63DD23F9442D21A4B6F4BBB7122467AE59A1EA759986142E6D2B378316B3697E2C5A766A7DC72000721CFE154764A402DCA572564B6A1DA969C55C5D8867301AF4EAC5A973A2D2A5BD0BA059B1CE5B5D61946E8C28A041B5CE5BBD51906FC531D00A7F94CB164DFEE5EB1BD5A5502B3EA23B57DCE506D76CA7D2D262EA4480C8045CA8682F42BCE1B46132517281EF08FEA1095A0CD2A1349D476673AA7822A7AE383151B9FF00AA07D57E9D6373EF5BCC2796CE8980FB5B4B46749D114FF33D9867A89E0C5A6EB9E086BA89E0C5A4EB2FC5007E59766B11FB65EF884D4A12501448BA7562557C95FAA616CD4294165C2AB04EC90E289A7B459D013C709FA8388B948C11774726D091A6DCB8B4FF0033D9867A89E0C47E5957247F31B7C10D11CE766B56FC87806238CA2C43D7ACEB27B4E1C5A051C82F13BE98E7AFF94C298A042D4F39C90B22529E819498517849E7CDE5274019062D66D2FC58A9759376ADAE67A4347147E4BEAC3B3751C9ED8FB7C71319315FD2BBA9FBD1F4EFA9B163AC04959D4A3792770986AA5191C1396839C6E185BAE192100A947508FA97D4DF1CF42DB6068253EC8B2148F86E9F080715AA75DADB576CEAA7B4C47A7CE6A4E2773C90CDECA89A378D9E0D99CEA9E08A9EB8E0C546E7FEA829509A4D8418FCDD302AA074C948F64FB26291F65579B5B966F433D44F062D375CF0435D44F062D27597E284F769C9A047BB4EF08924486818955F257EA987EFA407FB421B7B389012DC857D37EA14CDFE6527BB714906DD16F82240480C83169FE67B30CF513C188F4B2A24BDE36F8219039CD4D0ADC3C4711C7916A19BD6F553D9F0E2D003683398DD4C26BE8DA1D9A25DB3329A76E5A34C26A29186DA5E4712902695689E3566D2FC58D25725F4FBB77C474885FD1EAF2A67D94F3116CB688B462B2D74DC9FF28F2C2695C1347661B50D5294547D1DF39CA993A7FCD36C33F4B62D7AA48BC354EC1BA61BA54F350991D6739DD315F4A7CC5096E120E2B4FAEC43B76DEB27B3E1C47A7CE764DA777C90CDECAB9AF7CD9E0D99CEA9E08A9EB8E0C546E7FEAC0A65D4DE6D624A4C7E54A8AA896AED1A39A7937E50CF513C18B4DD73C10D7513C18B49D65F8A13DF23274847BE47F3089A4850D2312ABE4AFD530E7CE3EAA63F334E2558CE49655019B6C668ECDD3FAB687783A43A5C78B4FF0033D9867A89E0C428509A5424A1A8C1B0B9F4F7F83FA9317E9DD0B19C671B62264C80CA60D27D38F6B52E726FA2DBB3E8E93054EFEE5EB5CF44664E2FD3F6CF0A60A54260D84180FB40ABE9EFD853ECED8CD0975A55E6D626950C5ACDA5F8B15EA3FA904B06726B40DD3D2CC60AD442522D2A3923F314FEE5BB4AF521329EE9C5FA752E9393ACA03C5818FAAB163B4E405ED4F9277EC87FEAEF8C86EB23419789382B5ACCE5E3BE42F1416BF72CDADEB19D3028FEA27B2A86F93DA2EC9CBA5A0C4C19839E2FD43A11AB39DA19613205BFA7B1C19FED18084892522491A86CC53A44A1C436B52C38666F4B147D4FB457683CCB2EF36EE1553BC26956439C1D22128CB74013DAC56D0E2D480D998BB2CF0947444B7B15B0EAD48ECA72BB2CFB71FB873EEC7EE1CFBB09A66D45494926672DB88E324C838928246B128530DACAC2957E6ADA03C583F3EC3AB61D9CCA532BA4E7DFC5436E2D480855EE4C2503CD006F62969E405B6ACA9317E89E5327A2AB46E1CB0054564D1F68F0C5E69379EF8ABB4EE68C665C71C520B192ECBFF33605D3BC2685EF8D6214D21E5B8D1B42572E49CF2DBC577EA01C5171D9CD0652B71417390F279AEA72ED1D2202175936466B78324766C0CBCF59E72B6F159AF5B8ABECCAEA2C9596F8F02D9704D0E02956EC2299AE6A339CA4E7383FECC38A0EE7459779B771AF3A9BAEFC5458ADDD30453D6491AE63822FD63C5D3D14D93DB396034CA036DA72247FF28FFFDA0008010103013F21FF00F899A0AF4CDEB316B45E9B199AA8EC13FE8D98E9B68B8959EE3452EB144328CB0168D3E7FE88D5C7CECFEA8A85A1D4ABAC608F9FFA3688C7C7BFC0D5818FFA27708BDC575D3C850634A92083D8C0FBACC6E79A5618D44F49BFFD0043C9595D00D576AC5B80B6FA78EDF6A9004A04ACD5CA4CBFF4A99C162101045CA5B5A37E12680B7DC3C5413DC4620DFF00B34A211B347D2313FF003C751248C0ACAEBB980EF5E3F95AD9D24887CF4A0BE28FCC775D568DD08B91F62E352E54A216599168A041A621F2D14F8A47EFFE6BE2E79FF9E32F34B17697BC37DA9BF1C1590485CDCDF924A5F47645DDDA01A4C6BA6C45BAB25BD3943A3FF7C3F4538E8A3ABEB1F2D397FF006041F9534A93BFF7506C84FBF5A66D3A09F0929C01F90D517D6DAF2F6127928A12CB443A25B8751D7C4CD09EB15D5D1D5D16222287727D0DF0B2E7E37F2D4A183449A4CB77FB663F2A795B77FEEA0990DF7EB5F5B05F8914E00FC86BE694D09EDA00A63A5E09E4F4EE201680755B53C06D7FBF7C51A4D2FF009199F55339391C55F6E49FBAFA810FDD0C4ADBF46D29A9957BB0C9F550FEFAE18F23C495CF18241D4CD757411FDE7AC84753906F7B605C9AF5741BFE08611C24328F5BB6DDAD144FE72683E5A6981750143F2D754FDD342E9B7F65245FFED88FCA94EA7593CDCA7F913012EBBFAF3BE6B693E7B194EFE2A78B4C419C4A2FBACA1250372FC0D81D1BA7CAFC6F5D78C32061FDF5ABDCE817FC0458DE5F472BE4DED832AEC53ED870B1751F5F952AAAB2B757921DB9334466F7BFA1EA5EA7562947B033F35EC1BB8FBA6DCC7B925B07FBD2A69702BFC5FBED4841D28957ABC90EDC9E7247D34B34C904B1A8EA75EAFBF44187B87655A76CD49F0323FA6F9CF202E39002640991AC73164FD5FDF7A370F2328751F48A504608617CAE4E3ABB793D72AD032F6E8743882E39318797FA744E8D23A44CB7E87F86DEB01A124BA42BF2C1F3C2248C471D09277E8B6B4E6609850CDB5AB557CA3E665A0544AEBA51D4B9FB50008160311E862424F2F05AAD32BA123C4DDDDD785A13C453C152806F6FCFFD8A0DB8646F87F028A8276FC614A1084DA28A490D5EFCC4D1E8A30BBBD67FA4A1D738C8C3E6FC3AF0762DA81FF9B94F881E7DD1EE0C71F74DB971D6E1D91EAB539E5DF5BDDFB1E16A57914F051C25BD9F3FF628C46A2AB7C3FA51504EDF882942109B4514921ABDF989A0590615F3CFF49436583220F9BF0EBC05192C986A526BA8BA3FE3E5CF91EEC1703ECEDDF0FD9529755CABC2797D8B37CFE12A24D69FD5DFF344DFFD805AB491D00A360A7407F341B13FF4D5105532FEBFD879A6C09A164DD6075381A406EADF6A6BDE8E338A914423B3E8504EAF5B6775A18538F498952EAB58A70197FF000EB4248E5258E9A9ED34302C697DE9AD07026C0141C036FC814966D2587973F4AB33D17F63F4EBC00240B8991A713E43686BF937CEFEAFFB7C3FCA7CA90B863D520A8D6420FBC60E951A9288BB0DF90F486D838AA630095A48A662F4DCFB3E38467D00B7FB5A15891B51DC76E85BD030581DBF17A1869EB3F0089912984C28BC00352FC7DD36E4244D3740FDEC538927E877DFB1E102B8402CF611F3566466B3DC60B73A090E28E81689D6FC0C34E8D54259134780AEB896B1B8FC9D9E52C224F88BF6BF669FBAA94BAAE55E13AA3855976759ECED479C3068036039C43AE5ABE50D6674C45AFD5F97E2B6B6EEE10B2D492DE8D04959C8360D5340335142013977F434399D18084B88E8D21776CEA613ADF878427A5BB68F44B358107F009D413D0BB2817518D0EB50FF002DCC8F471DC6A4C2B23CAE819692C83429D94CAEE1E76E1A795618C7F00E93BF040704F1BFA1E08E336C6C7EDCFA0061C29B67F63C70B4B3BD8197DE6A0F173E436ABE94588A74C68E86773B5F8FBA6DC883730878BB0FDF6E1371805F00EC5BE68048BD865757D28011EC0E8FB373EEA2EE63D2E55B93E8A789C74E3DA41A04B5F00013B0F6381D3459D526B3A3FB6DE903C963EEC9A352D779FEFF0081FF00DF4A8233EB3645FCA7847A058D4C62108D4A32B27AA7F167AF05CC10FD8C3F6F451539723CF9DD7E469A021DC125B64BB701C92117C4BBE27974A37C62CC02C01D381B58F91BF6E0D79B587C5FD55E4B900496C25DDC7329722BA32FE2B3198369C0E81638462885D7FA47E5EA0E1A21893F6BEA38FBA6DC63A16F1AAB3E5149A9E6E54957BB47DAA80CAB828AE117C95E303D4BBD1B2DF9087138AF707EE9A138B00B2DF644F6E2B137E231F0FC70BC29B034BFF2C3AB4778CB300B01DBD393375C45F436FF002911873E8504C187DDAD4F8A86826D0203E3D121970FD3F0D3E5C12EA3DE66D3D29E7C71B44CB266FD2909805CA900776A627AC83ADE158C52DAE6208F64D68A919CDC8F9550937493E486AC440E7B8FD28C5FBC8D4059DDF09DD62429C492F692795D541AEDFD51E139633B1FA4D0000202C07A812A0DB5C5FD8F8E3EE9B7176385F41F62BE3811E947C07DE3E3F84C1991F0B3C10C0DBAF4AC77FA3D5207603D3FABE82821CAD47CB1F69E901F47C4D7F2E0C759F835F49D039B7E59CD05AF15BE11BB63CF879E9C00812391ACE0EEFA086B30620DC0A49BE2CD27F46E5FDBA856D7F0FEAB764CA44A37481F855808C07DEDCAD130BE141F9784A458D7AAFC2BD567927CA071F74DB8AAE920F2E08092EE3B15F87F09D7659CEEBFBE0639767E6FC5F5401970DEDFB0FA141266DD7D7FBF4897FF0014F0503B5E9F5427D065675AC02D8F743582C600CCCCBB0BD00040C072AE601CE6C04F75077B5C36019893A2F59E64D909F3FF009E05BA0FE7FF003EB009803EF87BA6DC55CE83F05C3588E7C1FF000542ECBF1C404C1EAB16E88FCFF47F16823005F51F8E7E894F309691B30C2E9818E9F2D1C65BB1B3A0ED3F99E6EFB4FF006431F148DBD1C8132B62BA73C3FF00850780CD69C3B27AAC290AF8AEB35F2E1EE9B71795A83CF08358F86BFE0C86E22996CB2F1C03A1DE457E3D523551FE2FE2E823005F51F8E786E29136CA7E5E2A46F584EEF6E9EBDB9ECDCB30775FD5225ACEFB8D39DC632AED37E780144257BC1F47AA72703DCE678BDD36E2F07709EAABEA381AAB8CEFFE122C6C0AEF7F20E072B3E2B83E9F545249DB1E63F8A2823005F51F8E6BF01DC2B1F768134C4093376C60F1503B9ED357AB95E715F08F8452A31DD995ABA53AC84F3293C0B5C70EF11C3EE833727E2932952E827D405D4DBD0487965F071F74DB8B9398EBB0BEBC12468CFF0076064A34E0242E23AFF050360AF23EDC1090201F10EADDE3D43A8D37004ABD8AB64CC8D0DBC403F8B411802FA8FC73663AB0631BFC1E77AC45020E73FE63C6DE8BC74031DD7E9420E04F25E758C9BA13FEC1C35978F5570ECD9E76F4EF2866EB41D558ADB36B4180E800E3EE9B710427B22224EA69412C2FAD181D12E7003AD0743F2FC3B3E9BF70529600CAB4A2531D235464C96E0123BC8D8D4B026C79E2F8692651FB04EF1C16B83ECDB47A259A5CE676ED47AAB7A7A658E777BB9BD3BFF1A823005F51F8E59AC326F9FD17E62A125C3263F7597A77F4ADAAC8E50D13A415DA63E09FAE799BD37BC68B758A40102C8D23533300C343144EF7ED7D7C4FA0609E420037A0F25E8B38A0FC6C79E4F74DB92FA710725F9EBE9DB82C82330251F6F6205FA34FBF4A78199DA1ADB6ED71BF09481F62FF0081D6A2EE63D2C7232435438CBD2DFA3B705D3BC82EE2837DF73C5006791911DBD15AA2763F4BEFE619B399857F1A823005F51F8E440902EAD44D981F596E889DEF8F1510FED5C743A7A4A9C818584040D9A656AD4C8F6636F42F983FB607BEBBF05C632308D30D80C7A8EFEF6FC51A72E02E273417393EC3776D521DECBB3D4D5F470235678A9A377CB8FBA6DC882438A9773CEB2FDF4DB1B704CC72308D2ED8383F6BF5DA8E98521713A3CCF4BB573D0657A1433492EC7B5B37CFE3827AD5017DE5A8722103C1DC2DF3CB042113AAD3A8342649933A11FB34E19A8E5DF6EAFA68D998CFCB5FB16E600A40BAB4BBE139A77D7DADD74A68AB232AD2206834AAD803769646EC46160F506FD7F8B411802FA8FC726014D168FB9E6B4BE2364B5CD713A77F4DB74E68CD95BB04A3351ADB7DDFBF445275B89B8EDFE36A4461B264E0BC6A7FD9C1E282106A9F79D689EC25FF00151169F43FBD0376245FD502513B27ED7D055FE4ED51EAB7E039A7B506E7DE0519FC20025C7DD36E50A0546911C894C8AE8AFD7D7F61C5AEABB9FCC1E28204B5FDD74953BA8A7E4A0E3C47F628067F48AFAA14B5E8FE868C5E3285F7C10C64460DCC056351C4583EAFCB9FAC543CD3DCD5F74ECDFD6E1E0F1C65501E8946819A1FD67E668227B588A105FB49FD2ABD9760BF269C207A7E8BA4AA0FDD97F33C1C51C0CA7A144084DF1741D77BE0EBFC529411802FA8FC7144D025300508A012C4E3759F125E947CC140580343D379070E6460EE5450A130E987F7E933755E2B3FB3BE69B08E315D5CF80E73CBDA131D5701D5A48E3BA2DF62C5BAB4080B0D001800AF60DDC7DD36E7762DF2377F3F53EE9984D17BF0C7661E7CD0E013C1496A7C205F7E5F8A0BAA52EBBE45F448C24164696D72960F7ECF6F952F32D62FBE799239360E9CF85BAD48E35191E9F80799FE394A08C017D47E38E6655E8F81213CAD7A8C26772FE53EA332296C88893B523A6072028F9F510737325BB68F92995DB3F0DA19B1FBA8A1A94A9486D47FB505C86E9EE56ED1030D30FAE2129C6E10847B9C4E70010101D0F41004AB238A4999E56A92C99A07EC7E153EF8EB0FDAB44BB4BF4A9D211ED4BFA52E00B4FACFDB5B8770A5DD2EF9F57A793C3EE9557FABECF4A97211ED4FE8AD52EF0FDA92D8BA3F451411750FD97E14B188196DCC0F07218E845240E6381ECF0F516531F2726BAC666098EF057F97A76A52C06578FAF48DAA5780108F72BFCBD7F97A0020C18E2040C47AA173B25F5A1169566C5BA88D3FEB81E2464762682080B3293693CB33DB1640D2F343C636822F0C4DE46D445A0347364F23FCC3D15B991C5C70E5333408831DF9076E868ADCC8DF8F1C59A986C91A4F227ACFC11904F6E1C1C03E8556E43D43EA5CE589A08BC313791B518E81A39213CB75C2360A973B0345EC86F2140CA7DD3E91A7A7472F98D4783CC9B20B456E647051235D81FEEE3E68E81F20238479755F5736E2F3AF2A20672E5CCC6C1376A09C3622E7F5ABD245AD3602FF0038E5377025F15263048640C2BA89C5888DF28136EAE9414B91A00418D49E6BC2864F11383C9A9643EE9F685166D8544EE47C4359A50193FDE9FC54AFBB4E7BEC523520C9B50BB2101A3FE07C70FB9FCABDE367240F4B287CD3A26CA97D14D5665DEC3A50212C02C0727BC6D5723323E1ED5ED8FD574AF201F072F622206128EA53B68B22FF0054A4D75CB6EE58243C72FDEFE55EC5B79012155600BAB4C2D15BA62318B1AE0FB1365609EA2DDA424B6048F72988DE6D334831E914AD96D3126875887AF7E58DEB986AF6C7EA83CC48E44B609DC34981CB749FE02DF3CBEE3BF2EF1F1C38641F434B51E541E9688A1B6B4ACCBA3BDAF875E5DCA4F74C3EEB55AE7D8FA89F1C746AA3DCFB84F82AF54AEF97F03950D4B9AF1343A4DBAD25DE9A9924B9751C77A020B6040760A6F65608EC372A683EE3A19B609FCFE0301C5C2122773F8895FF004FF2D1359C7DB11F1E8E34849E26E1EA57E9D6BEE7F2AF78D9CDD7B46CE5F78DAB80883B3C250624145BE34E5EC408C8E24793AD1E268227DA0A716C27BB29A9BFFC72FDEFE55EC5B79121C5FF00A01F29505D75FBAFE01C83B77188B6F0797F17381B86410D58930492EC2A3ED9A934375BABDF97DC77E5C2016136324DD11BAA98064062FB7B4DF7A0092AE26239605A83E42FD0D7CFEB911D2079AC24D5E07804AE8D4F2096A52B3CDEC16F087AD5CAB863A7E41794B0DADB1204EAB0F23E8C8765C3F74A9452B3744FA20FE2257FBEEBA040546911B226CD01BA53B03793733FFA4DD6C0B52F91344735EF1B39BAF68D9CBEF1B55C99C7C5DABDBDFAA800DA20E5EC7D61E6FAC759372A27E91A1CA6CA64BBD7E28F1AC82C1CBF7BF957B16DE4877367E85F4934F05D3ECC87D1C85B7B188BEF2B949C905351AAEFD7460C75983E77AC7D1E512E8129B3B737B8EFCD8021AD973D847C54F4D9668B22EBEE0F2B159B6DC5FD8A9CABE6AAAF3A1A6A0963C47B3578D1176BEE7C55EF651B97F30B5AD070F66B1CA198F4B11297B0E435580EEB97EAB518A162E8DF603FC44AFF007DD7C0B54F4D4FEF6691C99AC8196C543BD7BC6CE6EBDA3672FBC6D5283283E1EF5EE5FDD4C79C209F27376E845C19C376C3B9F0A8C80460D009EC3DCE5FBDFCABD8B6F205A71B84211EE50A2BCB46A317C13793E813B617C594A7A6BA4B079AE9119982119748C51B05A0CC1A9D26FD7B73163A0740911C894B59757065BBBADC9E6836118C4797DC77E5C4FD21B31A39810FF65133290006EADAA024BC4D7F528E9CB3CB42BC1BBC18D3B89D0B9BCD413CD6A242DF179E0B43123A81F4BCAA28BDA136A758B75EF5868ED86284E1D673DE8F1AE8171A422F46FC4DD5247D75D16EC59C687D86A38B80200EC7AC0DB0327B91400D0D8208B4072A62CD1B4E9CE2FC725A418786D1284F613ACB089E552686C908BC8D008C8057A2394F6A96AADCC1DABDCFF4AF73FD28D0208F2CE91C88EB3F006913DE949754132C0B4700271E5A1AC4C6B3962BEA309588D677A35D21AB9611CB6742164A6DE4C962EC47CA68F8CF7097C614C4D8A1F33A0F039A5D109B0CA3791E0801A8932689A234CD57E58007872E8E6886DC5A74E508504699F07B0A044AC66C745499F98B7E8615D340B72C21083D5A349CF044F9474116EB535B1F50329D55E0A10040DCF0CE399C970C1E2351E456DF1C97E71A25EF4B65DC4FC2B14A0307FBD7FF00D47FFFDA0008010203013F21FF00ECE9FFDA0008010303013F21FF00ECE9FFDA000C03010002110311000010924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924920924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924904924924924924924924924924924924924924924924924924924924924924924924924924824924924924924924924924924924924924924924924924924924924924924924924924924004924924924924924924924924924924924924924924924924924924924924924924924904100124924924924924924924924924924924924924924924924924924924924924924924900800924924924924924924924924924924924924924924924924924924924924924924924920920124924920004900800924924920024924924924820124920124024124120924924924924920924924924924920024924900924924024924920920120824924920124924924924924904824924924024004024824924804120924824924804024800904924904800804824924924900020924920904924924824924024924924824924824124920104924924924924824924924924824924924824924924124924924924924920120924924924924924924924924104924920120900924920924924924824924124924924924924804924924804924924924924124924924124924024904824924924824924824924924924920824924924924924904924924924924924824104124904924924924924924924924924924920824924924924924904924924920924924924904924924924924924924920924924924924920824924924904924924924924124924920124924924924924924924924920924924924924924824924924904924924924924124924920924904924924124924924824920924924924924924924924924924924924924924124924804924924124924124924924824924824924924924920924924924824924924924924124924924924920124920924924924124924924924924820124804924924824924924924924124924824924920924920904924920124924924924924920124924924924824924924924924124920024924924924924104924900924924820824920100924020924904824924924924924124924124924920124924824924104124924824804124904924924824104824924924924924124924924924924124924920924904824924924924924024924920124920924924924924924124920924924920124924924100904924924924920904924924924800004904924004924924000924924924924124924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924120920904904924920924120924904124924924924804924924920924924924900924920924904924804904924920924124924900924924900924804924920100924924924900924100924924924024900124920924124124900124924900924904824924924924924924900924904924924924824900824920924924124820924924920124924004924924924924924900924904924924924124904124920920804124800924924904924820924924800924924924924924920124804924004900924900924024924920124824920924920124924804924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924924FFFDA0008010103013F10FF00F89A2374819238DBB013235005E81B0452F492FA7FD1B63E7760420A031919831451B602E6516D03F83FF42DEC750D943BD24D810C22140B28987B7FE8FE63EC203CD5CD235609865EB6FF00A29FB1A36D3044A847F19D6C86C66B104E6CA9F8B5100A82035925A0C4FF00CF85929BC461AEAC0A478D60D36CDC48D68D172A9DAE07510F0DC08026281B24E0A44AB810C2735697E8BC13319B4E4C914665A1B26022F6EBBA5254B9E84959C1BFFCF12E63C1C8B0015EA245A69246604147D5DDE2C43744B43BFF000D546545D12B769960D0DDD7CA4534127A8F0FD912E0A6DE0B7C9C00C55EB1AA55058960121DC63EE8D7FE7A6C32335A42439DE55048600B091BC3009DA67900F26E1D95781D9A06D60A7648137310DF5F4DA0A3178ACBC94C73932FAC9424730C1C3B7DB533174907C5B5D48606D64050CFBB85A55B51C993A647546A0E4A4B2F66F8D37AEB6FD7C4A51DB86C877934C4C6098AFF00235FF235EBAB5988A13E7D0516F6AA311281E81D69D703194ECC807CEA704701CEC7ECA6728120F8B6BAE980DFAAAC25064F991FAAACC8C4C9D333AA351C7A1191B4BF390EB45C527CF2093D3D311B3D4EA582A58FA19A34815DD8EB4F8159C67777F06AD4C7EA6A2A7A5EDFF315685030FE32A28864853666FC358DA9301B9D3D0691A284A316ACAB0710DA61E4E188CEECAFF2356819D81D02F5CCF214D76C3D8A2D8AFF00235458A6667DC36F99D384302BAD8D2677A20D52AF4123A73611FBD4C738D801D082AEAC318FBAE2AB118F8AC745E463DD8F8D63A760489DD303B2ED50CAE096112484E901EBA2CA0AD8BD07245F9CE6502E6F904C1058DC695D6FC80F93806763660E240A5D70CA0BD0C58CE91B2189895504A58262947BC084B4E702FBE85FD03165BC560D3A304B4C982B4D0258C1DC9DD629FB2942556EAAF2264A81C29C849302449ADCF81EAA50E1809D092D77416D05B916FBFEDE6B2E3C4360D55805D6C50E57A7014E721BA79E148C6CF1CBAA4AAF2264A81C29C8091910611BB1F724D22AEEEF4BDF29177367D115282D1552439EA8DDD066BF1BF010596D52B55E44202BB17A446121DB8BAF50B201911309563D88CED985F7DC7E140E9252F601679EE01F73F1E3B61248700E42658CFD44510854CF1B0D034B069C70858CC13C9A6E5394D41956A08D120905A49D5F3B3F07AB2BA734959709050E74517384EC0CBDB92D168AE425850C1B2A964209119CDBA559856D40DDE84E2E1B9BBDB4F1846A98A040506000800301E869DA5298CD25976095805A90BF0C2ED30975C9E820292394943A02D00101821D1A5BB5460264A06F6FE1A026781DF055D546025117F2F00283C357ADA2BDF0B3A542F738100D5FCCDF800EC29C261365164B259B5602FDE2531AADAEEAED1787BFEDE5D3A09978ACA59760BB00B4812D4A3846094CA7682DC1D23C943A03E5A206061A746BDDAA685B400DDE3E0D013BC0BF82AEBA7012B5FACF005878682CBA272F51674AC762607B81BE767800114485912A497C7AE96432B84EDBB9CC121B784EC2CA8E994FA8250BAAE5E0561924583084551A82DE8AC385E93A90DEE47B50A0D443B4E2C7DF43C05A19F4522CCA16F80D0D865EFADEE27BD30A091123D0847417AD2E3B73B2467AC1386B1A0ECB067B785E827F620C5964191E603EE7E3C32F25CC5918E09485D8D29ECF0A7320BAAB496EA1E4DD740D558D69CD38B075913D403A2A86970582A874A708F80A5AB7926F86A7D5236C1D2E93B07AD06A01B3484C195DF2F72DC110345900C88984A06B8236DA7BFC5783D35015602EAE22AE940D895038B3DCE8A8B1AA53004B0176EB62AD78E888C4FAC5AE600694FBE6B4B1C29484A87C0FAF40D65388508EC14E332E33B732D6C765A487064040BCAF05A368B7E84A051440A28BF4E588877BF3A0889239280D198DD7A9B7F8C397AC4195D085C46C8D1BF120A54A09097441C9C7DFF6F261A8738B432AC05D6C5E9B75242E1C059887C580E08092D03AB0DACE86DA8B4990144761AC05A7100D0E740028846E2352CA230D5218FE890E52C80950420DC47821E5175AA547099CDDCA3C818104D971A74C07375C0A452A7D41285D572F02B87E82670C1F3F9501850B1D600003639E7A90BD9A440B2DCECC96A1094E38429402C416D05CD4E036D0211BD9B700E25E603EE7E3C7901DB635E21CB2FDD121B8283DE0CCEC2F7965E64B242401083644A62A04948F8EA74474B08159ACB2C4E4044CA0D452ACF17AA50BB6E0F53D063D71B4C69814958286A0274E0DF84898173CD013B608BA014A762C5DB567C5130B1092F910CF049D8C9A5A6FEE3763EA03813B743638174820CDE71F4F4109A9A37BA446E917F7E036DE28549048C4804DD06B45EAF8A1504544B2EF82003D2B6197B16E069BFB1C87BFEDE4BFD92ED04AC655737DC93C0E40B3655B9B5F13EB7045036D816032AB745D2EB76FE9174402C0B81A47CCC9C0ADB250442DA9B8E4A2F8B4067CA36593983AF1D774AD0A80D582C6B482A6433B3A5B35AECB97808C8F5B273B40B5D4EA7A4C2E18F46E225D1085C6E5E9A1153B56221692CF67039C0FB9F8F1C44CAE1A384E2E1BF47D015C9C4A8E888D24DAAEB34412981A1E12105C996C99B02BBAF44015D8EE65008B900CE51564781CC4E6C8B2806D6E17CC3B8895830C740C940CB970340960040703965E94844512132545B27BCB2FEA88BC198993804DB16EE6E9595B4BFC514499D0A1591B2E81C0C9A945C13F7CEB0707A6824371C95159E990501E9B668F8BDFF6F139D3388D1717811E94E3D91950A6E93469D46AA100195697A005BC2333363A64E57D46BFE27D32F233462C5B49E108B0AE6123C92047638CD21406E28A7711DFC17C0458DD73A36A6C51975381A0460041E99A40308BA4CED90F498688010308D913980FB9F8F0CBE036BC83EE4D0F8377011BB0F46CCF3F94D97A70264D22EE343E4FA4100BB6940BA4189032A0F05FC8C1B748A4A1224F2593C242F2D6AB27574AC64B37CEA7C6A0C3EA99078A0E38122D49CBF4D3F42A2CD93BB1A596031E97F47459C01739D040735E6A61C90D90FCF2C8CFC0DE6BE15977E1009444CE54ED58EB0802002C007A91D45C26583E973C7EFF00B78C08634CDA2F44BBF047F6AB854F39FC250CE053620780BD06997008B620FAB961A0882E2034021D3980FB9F8F0C1F91144DFEBD9E9260959D979F47052A077DB63D25578AC542034E029CDF342B6C1D2D7C4CCDDD196AB82121A00223D1A399A4B1575DB1F6D0EF8C028CE2030E36714DCC231166822C8A4886B19EA8BE0C3A4D1784100CEA628A17528249267B394093006923850664D9119F55581C1BB98F85E3EFFB78B755D340C8FC384B036B81B3BFD5FC295A07BB84A3B0B7AACB3E13D5F19628C7CD81F73F1E1368B97DDF490D09143B85F6705072C1E19A9D34BE44FA12076859891697901DBA552B72724E475CA20CCC750081404001800E508AFA2610A8575D2A572BA1673C0C1829290089236470958E5768C1DD47815A547645F5960415D8670F7FDBC5E15879D028FAE0212FC766FC7F054BCA4F0A95556EB9E07CC061EA8ED7B1D90F300FB9F8FAF37A3DA76738A3792F24905DB1828F04670B80F24016323AD31542D261B04C8232CA459E6722EAF0C209D6B75462E75684382DF469CE90D69FE1D62B00774F7AA55A16FA0969942140EE5FDF0F7FDBC47C59FEE3F86F8FBB1BEE7F824B61979228B1820EAD1FC7002B32DF644FAA6CB696E053F4E603EE7E3EBEDE8F69D9CE19CE0161F30C17EED5D15F6C1E19CCB0A3A59E7A84A026541A20EC0F5E73C9605A6972F80E12E404C4C5F917AA9F945E859F1BC7DFF6F132795E3DE0F0FC97041FC2A7641975BC34CEEC24A1F8F56C9A08E7537C979E603EE7E3EBEDE8F69D9CD07909243BD06EDD8B12E0A7725948330903581A0D28721C998C90CA4EA1579FEB2C677F9A88CC6D6384D62EF9AE905F2279AF65022531D53EFF0007AA26FC4527A4DD5BD4702301D9261347D491444D6A463718EA6BC7DFF6F1B31C269307B0FCF057A9134B2380CA05B85059232009025913F831E53EEE293E2F9E1012462C921B77E1EA6D475FD674E05A0155969793FCC7301F73F1F5F6F47B4ECE67BF142752744DA666314C35B04F38A3F8249F44C9EF9A21E58D29D28C6A7EE39E77B0A101CA3B50EC0EBC20ACC85AEEB1316A3E992DDA0234A772C3A94809399642125A11D0E3EFFB78DA1C8E2445C6322DEB083DE84991B2E83C064979EF86272568E9DCF4D14A9F004A1600CB487FF65EF698310C081BF09D753F7F34505D2B53A38CDB0444A0862EA20E04ABE63325DE289941A8D45551A64D683B95F25BD319301BDE69298400DB7B73C0FB9F8FAFB7A3DA767281146E24A96C9C5837BE56A4942C58CF95999198704B43D204A65CC3526134B6666AE34B29EAFF003ACEA54B0C8CEED1D9BA269003519111844709483E8485643CD0D2386C5B042DD6C9976757A27C8F3D772A69F870C88256F9142FC8F23DFF006F200B3DDC8A40CFFEADA705CBA342D227EC6CEB44894CB012CC974D72766D0BD1296EEAC57166783E0BA8055E392249B49BC3AA0A16D8280217CAEEB9792DC367BCD058372B64197076EFF08086D8589F2140E2F398728F45011E5642DA12E360CBB1AA8BF28495655E703EE7E3EBEDE8F69D9C8000AAD00175574A496955411210255B82068B4848C8486816B12DC01E91A21E4F05456942E2F62AF7DD1F03E85F78C2EE3A164767EE28963E089FA4B2364B36AB4B1E528CAE7D7E52816484442E22591E64E9840F64231D81AB4C24BA8246031D13B04CAD087635ED786C0182C5B2DB87BFEDE440028846E234D5224A67E20D66FD576EA32654876A251361043B98E7D5FEAA39C84C42E216479A645110946867A6168CD65C0B644AC341919427808DC8C947D005D2C176D415E2D9806437BE259BD931CB7FEF8407BB998BE3EE492B2611813E24CC772EB75E03571AE05CDDF5FC8610E31B0F777593AAF5730502AB4005D55D2AEDFA47469863D05D543793C913F00580B058B539FF0090FE012A8C01484C348108A5D49CA385897940FB9F8FAFB7A3DA767245C73AD59373AC339185CAC758E43335202EDB36E7A79F2B3608177E2A24B485B8AF9F4090486E392AE63C65CC8595A9C74D8E8D522108991380603660A4E7207783D684C403CA10FE3A16EB60BE16FC54A12EC27E8A29393340E99AFAA370F1921DED9EB511C7751894A7BF0C3D02C9578D7DBE41B504C93E05E555BAB75BB7E3EFFB794384401D084888C234CE2DDBAE42E3DBE42E70124FE62C8CE40EAC1EB46A384D4B7B15045DD18F348F90FB11A11E3E6E16D9AA170084107B9F115A4B5C9EC2983A16E095FF00044985767BBF9A62D02A8090A0DC9CB977740E69A41724B0811F66066AE59001457CED6E8EA42D4F498E2B5408F6AB3E06544E8C8F5A8D6C91F5F396A4523A85044E871FE5FC4A67346721B58AA73F2480A313111DE6E0734291BC0176ADC6050621C24181B1B12F3AE01F73F1F5F6F47B4ECE276D4620095570054F8C024A1D9AFC1D40B2052A2401001600F4D220D30CA3BCC806B498E2F50A2611C33E90C4B941625B19DB4DCB8A582EC15F711CE08AB45EC4FF0069015194E9A20C90FB6B16A30F8007A20000603936FBFEDE772A404B9D2510B58DD5283403067670596CF439D22AC289D0D5A9DE309F604171BC9A58AC5B052274F74DB483D18DC68C6DEF84C8971C5672421EA22374607AAB33E18CB72049D4B73A4DB9406E5F1C3A854C4403893922DF31ABD05C03EE7E3EBCDE8F69D9C740DFAC70AE103BEAC6502A024177888D57E080B01EA34D64D490C5C5335F23031D8625E9A090DC7255FF007925FA827BD530965283A4B514D0D08ABF1FB6A5D81B8B7F0A5AD4E9BDBF03403DF1B9BA0A8E8958982CDFBA125EAF1056A8CA8135121AFF00015FE028DF103B00401E80202A30A1B2239A0B6F5964B7580A7AB469235D98EB4F12D9495F8296369DFF006288A0B5217E3D1D444B247B4A3A2AAD82E11BB249D57AAC1B66D72EA0587A95786613C9D9B3A228094D081F9B40B62DE47D5400D68A1F0FE6A91149F1F541AFD4A911D43F6B905C9966C112DD2BFC0544EB0A60489A40F2748FABAD58CAEDC226A6E10E8299A297D204C3E4A8739111E314448A000180388C644C4CF40E9218DFD680C3A50924D6990B663FEB94E059946813DAAE06CC1727E43970DC47485C55C2A0EB738AADE5A81CF01145E118E8000624927916D01D80CBB861C70C22652145A40921743C9AF3C3C86EE38C71C3031EFAC4CC598BF2401256BE80094812F0C120361053AA41A74DA0C2A60852430E1D179516F2D40E7808A34C8A74004624927942FE418F62F95C01774A7D22DDEF712BB8AD115A88E87CE0A112081180950447598BA1CCD3B3EC045DC365125C0A17842499389F3C0147408B03A40B225C4E53748AC930D8AFC6DCAA8B8483C60508091824D504698A128F452DE93E681B0B0D10243B9681568E795A18637412D2D12B142034525861E2A0D8045D901498206AD461CF88A12920830E7997633004492A689E92E834EB3CE88373E70D4D9AC1D7BB94EE2822D49CF1918C0C2AE6BEBFB56EAF78DDCB1B73A118304C0881194DA8A31EAB2D826EC53B32C4BCD25738D294AE4CC41898A0A73B320605052EEB6655468774804008002C072B291845B5746DC06821C2A192E58039420A6641922242C5E83BDA1486DAD2F713006572CDE0E1E89F4B4B473435C0F20E0025ABD7751ACB2974C744D98A01840084C6A8CF78DA85FD410DB248D25E2907642B0245AE006F4A050405CE3100C825813601CA1181054089891E06A4C75C364C2536D0621869D4893295A7A11E9016DE22C0A26A375B152A1B1AC22F18348A1D92A563A856E710CCAFCB1930C9317DC7B8AB195E0C589D91EFDF8BC1B70B171F7CF6EB51F8F1B8B3E1E593536A1044EACDA03A8C8252D419C4762619B363A8D02EFA086DA0051F9D4204466031D18DE80247C09404C40211203B4A51EAB272216D924F5BDAB757BC6EE569131B1D6AC4C13B72581299D959449AB6311930E27782CBF4E792BBDDF6F3F2643D8729611D382C539D0155AB65E394243C174ACBB925A8A411BDD742154EEF1A4C1D684E4E10138B3D2D2D1E51446D4FC3A2686B9D2F80BC98BA46D020218201B72B848A80945107628D96AB3A2A49CEE09B2006F7C2F91FCCA3FA785991F4812AB852BAEFF31802B399223E8A9C2C0E8BA0B8BEE02028B0A4488991E5851095EA98564D12F30EB4C8F70E855966784A376EFE0147ED35BC9346B63156C88C8170B7EC85392813913D86FE79413D75ABB6B8B475C1C821D95F455F3E5A8010AD32AF0F603D6F6ADD5EF1BB97E95031FF0000FC8244184684E39E9414C98BA8BE8CD02C9EC740FA330DF9977BBEDE7E4C9292ADB7746DC010796CA00A6ED8839422756194872350E82C5E11E8ADFF00DD4256DD61BD05D20080300160F4B4B49E67C4EB5F278288B207D53E76F243ACA37A00175251BF28DFC2E0023DCA7E5BEB054EAE289FB08D4A85F2C8199D65BC87A609F2525DBC90E572B19834BCCA9C528B302A74B6CE4436C58C818A53CE52B28246C9A3A35A2B0901E0DEC44D371A9186F50E7DB072742FB344E84478BF41D81D69ED4EA23964A1928AD0730D810BB1C831496F451F1E1AA7426B11134F607D6F6ADD5EF1BB97E9700AFF001854D92E06E171B97A7D88CE35B122CCE210C6239577BBEDE7E4CA1E816F5C1B7064233D85DA30C2273045D95E1322B6DD35D359D4226438210F913607800F4B4B4076A0CA8135121A8AE9564E58A80110C136266852A0401DD543F728E52498035558A5BAE94EA598DF45F15E648AB6DCE25C63122C8B2CA8B81E684740860E842444611A4297139321517D732135C763E0691BDC771B8D9F4413316CE95347B531DA62C2907C0216265A6F2403AD49016340097D21D491D7958A906DA935F0B805E82ED1636A5930260A34CF498518ED33138BB3CF0D2B3DB13A4728B750F50149D40302DB022C26911AEEB8644DB428994E146E925403A89668FF00D14858D262F6284211C6940A44A30024DE85A10F6460409B041EB2880B320D227BD1A69C429A1AA729FD5B07706EB5678C77CD9A319A9BBF248C8A523D29000198209634E526F38A5023448D293F47CA5002C6B6E5846C794C1760C62BFC9A7FC9A44AFA612AE622D3C904414A74404909134082B3254088882F01B0830EC126B0E6CAB9E568C43DA1C58D9146991CE800AC5A58E535FD067D9BE13225CD29B4D045E8602772EB43458C726C6068B5DA0862408037A4C595E667CC5D2BFD506385D7D2800DDC1CB1F7249442DA745264D02C9C2492EB3C8789812034D82CC6FCB6D1DE433901190CC372F22591BF48021DCC18A547228012000449800BDA567902941A9678CACE73C37AC7BCC4AD04C8E8D1589A5A91320120FD701B923106777979CF3368EC8110409023AC86128C9BAE357625359F7E07A6929DC3D6822D41C1395DD655775FFF0051FFDA0008010203013F10FF00ECE9FFDA0008010303013F10FF00ECE9FFD9" HightQuality="False"/>
-      <TfrxMemoView Name="Memo16" Left="362,86642" Top="265,27035667" Width="349,91342" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Vendedor [frxDBCabecera.&#34;VENDEDOR&#34;]"/>
-      <TfrxMemoView Name="Memo14" Left="5,61441" Top="218" Width="409" Height="18,67718" OnBeforePrint="Memo14OnBeforePrint" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" Text="Fecha prevista de entrega: [frxDBCabecera.&#34;FECHA_ENVIO&#34;]"/>
-      <TfrxMemoView Name="Memo9" Left="5,61441" Top="180" Width="149" Height="21,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Referencia pedido:"/>
-      <TfrxMemoView Name="Memo15" Left="157,86642" Top="180" Width="556,91342" Height="37" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[Copy(&#60;frxDBCabecera.&#34;referencia_contrato&#34;&#62;,8,6)] - [frxDBCabecera.&#34;REF_VENDEDOR&#34;] - [frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;] - [frxDBCabecera.&#34;DESCRIPCION_GENERAL&#34;]"/>
-      <TfrxMemoView Name="Memo4" Left="363" Top="243" Width="349,29159" Height="17,60637" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DATOS DE CONTACTO:"/>
+      <TfrxMemoView Name="Memo14" Left="5,61441" Top="199" Width="151" Height="31,67718" OnBeforePrint="Memo14OnBeforePrint" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" Text="Fecha prevista de entrega&#13;&#10;[frxDBCabecera.&#34;FECHA_ENVIO&#34;]"/>
+      <TfrxMemoView Name="Memo9" Left="5,61441" Top="177" Width="149" Height="21,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Referencia pedido:"/>
+      <TfrxMemoView Name="Memo15" Left="157,86642" Top="177" Width="556,91342" Height="43" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[Copy(&#60;frxDBCabecera.&#34;referencia_contrato&#34;&#62;,8,6)] - [frxDBCabecera.&#34;REF_VENDEDOR&#34;] - [frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;] - [frxDBCabecera.&#34;DESCRIPCION_GENERAL&#34;]"/>
+      <TfrxMemoView Name="Memo4" Left="363" Top="233" Width="349,29159" Height="65,60637" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="&#60;b&#62;DATOS DE CONTACTO PARA LA ENTREGA&#60;/b&#62;&#13;&#10;&#13;&#10;[frxDBCabecera.&#34;PERSONA_CONTACTO&#34;]  -  [frxDBCabecera.&#34;TELEFONO&#34;]"/>
+      <TfrxMemoView Name="Memo5" Left="363" Top="301" Width="349,29159" Height="74,60637" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="&#60;b&#62;DATOS DE CONTACTO DEL VENDEDOR&#60;/b&#62;&#13;&#10;&#13;&#10;[frxDBCabecera.&#34;VENDEDOR&#34;]  -  [frxDBCabecera.&#34;TELEFONOS_VENDEDOR&#34;]"/>
     </TfrxPageHeader>
   </TfrxReportPage>
 </TfrxReport>
diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj
index 252da7f3..523c633b 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj	
+++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj	
@@ -41,17 +41,17 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AlbaranesCliente_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AlbaranesCliente_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="AlbaranesCliente_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Presupuestos de cliente\Model\AlbaranesCliente_data.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Model\AlbaranesCliente_model.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Model\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Model\Contactos_controller.dcp" />
+    <DCCReference Include="..\AlbaranesCliente_data.dcp" />
+    <DCCReference Include="..\AlbaranesCliente_model.dcp" />
+    <DCCReference Include="..\Articulos_controller.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
     <DCCReference Include="uAlbaranesClienteController.pas" />
     <DCCReference Include="uAlbaranesClienteReportController.pas" />
     <DCCReference Include="uArticulosAlbaranClienteController.pas" />
diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
index b5152802..db14b8ec 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas	
+++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas	
@@ -42,8 +42,8 @@ type
     function ExtraerSeleccionados(AAlbaran: IBizAlbaranCliente) : IBizAlbaranCliente;
     function ElegirAlbaranes(AAlbaran: IBizAlbaranCliente; AMensaje: String; AMultiSelect: Boolean): IBizAlbaranCliente;
 
-    procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false);
-    procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false);
+    procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
+    procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
     procedure EtiquetasPreview(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean);
     procedure EtiquetasPrint(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean);
 
@@ -136,8 +136,8 @@ type
       DoPost: Boolean = True) : Boolean;
 
     procedure EnviarAlbaranPorEMail(AAlbaran : IBizAlbaranCliente);
-    procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false);
-    procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false);
+    procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
+    procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
     procedure EtiquetasPreview(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean);
     procedure EtiquetasPrint(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean);
 
@@ -1003,7 +1003,7 @@ begin
   end;    
 end;
 
-procedure TAlbaranesClienteController.Preview(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false);
+procedure TAlbaranesClienteController.Preview(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
 var
   AReportController : IAlbaranesClienteReportController;
   ID_Albaranes: TIntegerList;
@@ -1031,7 +1031,7 @@ begin
    else
      ID_Albaranes.Add(AAlbaran.ID);
 
-    AReportController.Preview(ID_Albaranes);
+    AReportController.Preview(ID_Albaranes, VerPrecios);
 
   finally
     AReportController := NIL;
@@ -1039,7 +1039,7 @@ begin
   end;
 end;
 
-procedure TAlbaranesClienteController.Print(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false);
+procedure TAlbaranesClienteController.Print(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false; const VerPrecios: Boolean = True);
 var
   AReportController : IAlbaranesClienteReportController;
   ID_Albaranes: TIntegerList;
@@ -1065,7 +1065,7 @@ begin
    else
      ID_Albaranes.Add(AAlbaran.ID);
 
-    AReportController.Print(ID_Albaranes);
+    AReportController.Print(ID_Albaranes, VerPrecios);
 
   finally
     AReportController := NIL;
diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas
index 794b8095..5f963f8a 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas	
+++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas	
@@ -10,11 +10,11 @@ uses
 type
   IAlbaranesClienteReportController = interface(IControllerBase)
   ['{4BCC7A93-3322-494C-A3FA-118F4B62CB15}']
-    procedure Preview(const AListaID : TIntegerList);
-    procedure Print(const AListaID : TIntegerList);
+    procedure Preview(const AListaID : TIntegerList; const VerPrecios: Boolean);
+    procedure Print(const AListaID : TIntegerList; const VerPrecios: Boolean);
     procedure EtiquetasPreview(const AID : integer; Const withRefCliente: Boolean);
     procedure EtiquetasPrint(const AID : integer; Const withRefCliente: Boolean);
-    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerPrecios: Boolean = True): Boolean;
   end;
 
   TAlbaranesClienteReportController = class(TControllerBase, IAlbaranesClienteReportController)
@@ -26,11 +26,11 @@ type
     constructor Create; override;
     destructor Destroy; override;
 
-    procedure Preview(const AListaID : TIntegerList);
-    procedure Print(const AListaID : TIntegerList);
+    procedure Preview(const AListaID : TIntegerList; const VerPrecios: Boolean);
+    procedure Print(const AListaID : TIntegerList; const VerPrecios: Boolean);
     procedure EtiquetasPreview(const AID : integer; Const withRefCliente: Boolean);
     procedure EtiquetasPrint(const AID : integer; Const withRefCliente: Boolean);
-    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerPrecios: Boolean =  True): Boolean;
   end;
 
 
@@ -113,8 +113,7 @@ begin
   end;
 end;
 
-function TAlbaranesClienteReportController.ExportToPDF(const AID: Integer;
-  const AFileName: String): Boolean;
+function TAlbaranesClienteReportController.ExportToPDF(const AID: Integer; const AFileName: String = ''; const VerPrecios: Boolean = True): Boolean;
 var
   AStream: Binary;
 begin
@@ -136,14 +135,14 @@ begin
   end;
 end;
 
-procedure TAlbaranesClienteReportController.Preview(const AListaID : TIntegerList);
+procedure TAlbaranesClienteReportController.Preview(const AListaID : TIntegerList; const VerPrecios: Boolean);
 var
   AStream: Binary;
   AEditor : IEditorAlbaranesClientePreview;
 begin
   AEditor := NIL;
 
-  AStream := FDataModule.GetRptAlbaranes(AListaID);
+  AStream := FDataModule.GetRptAlbaranes(AListaID, VerPrecios);
   try
     CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
     if Assigned(AEditor) then
@@ -164,7 +163,7 @@ begin
   end;
 end;
 
-procedure TAlbaranesClienteReportController.Print(const AListaID : TIntegerList);
+procedure TAlbaranesClienteReportController.Print(const AListaID : TIntegerList; const VerPrecios: Boolean);
 var
   AStream: Binary;
   AEditor : IEditorAlbaranesClientePreview;
@@ -173,7 +172,7 @@ begin
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetRptAlbaranes(AListaID);
+    AStream := FDataModule.GetRptAlbaranes(AListaID, VerPrecios);
     try
       CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor);
       if Assigned(AEditor) then
diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas
index dac9c608..38a137aa 100644
--- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas	
@@ -37,9 +37,9 @@ type
     function NewItem : IBizAlbaranCliente;
 
     // Report
-    function GetRptAlbaranes(const ListaID: TIntegerList): Binary;
+    function GetRptAlbaranes(const ListaID: TIntegerList; const VerPrecios: Boolean = False): Binary;
     function GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
-    function GetRptPDFAlbaran(const AID: Integer): Binary;
+    function GetRptPDFAlbaran(const AID: Integer; const VerPrecios: Boolean = False): Binary;
   end;
 
 implementation
@@ -63,27 +63,26 @@ begin
   RORemoteService.Message := dmConexion.Message;
 end;
 
-function TDataModuleAlbaranesCliente.GetRptAlbaranes(const ListaID: TIntegerList): Binary;
+function TDataModuleAlbaranesCliente.GetRptAlbaranes(const ListaID: TIntegerList; const VerPrecios: Boolean = False): Binary;
 var
   AParam : TIntegerArray;
 begin
   AParam := ListaID.ToIntegerArray;
   try
-    Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam);
+    Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam, VerPrecios);
   finally
     FreeAndNil(AParam);
   end;
 end;
 
-function TDataModuleAlbaranesCliente.GetRptPDFAlbaran(
-  const AID: Integer): Binary;
+function TDataModuleAlbaranesCliente.GetRptPDFAlbaran(const AID: Integer; const VerPrecios: Boolean = False): Binary;
 var
   AParam : TIntegerArray;
 begin
   AParam := TIntegerArray.Create;
   try
     AParam.Add(AID);
-    Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam);
+    Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam, VerPrecios);
   finally
     FreeAndNil(AParam);
   end;
diff --git a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas
index 1b2f8715..de3b82bb 100644
--- a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas	
@@ -8,9 +8,9 @@ uses
 type
   IDataModuleAlbaranesClienteReport = interface
   ['{42C55204-5AB9-403E-8385-1A62B02D8234}']
-    function GetRptAlbaranes(const ListaID: TIntegerList): Binary;
+    function GetRptAlbaranes(const ListaID: TIntegerList; const VerPrecios: Boolean = False): Binary;
     function GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
-    function GetRptPDFAlbaran(const AID: Integer): Binary;
+    function GetRptPDFAlbaran(const AID: Integer; const VerPrecios: Boolean = False): Binary;
   end;
 
 implementation
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas
index f9d22703..393720cf 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas	
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas	
@@ -36,11 +36,12 @@ type
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
+    FVerPrecios: Boolean;
     //Genera cada uno de los albaranes a imprimir
     procedure _GenerarAlbaran(const ID: Integer);
   public
-    function GenerarAlbaran(const ListaID : TIntegerArray): Binary;
-    function GenerarAlbaranEnPDF(const ListaID : TIntegerArray): Binary;
+    function GenerarAlbaran(const ListaID : TIntegerArray; const VerPrecios: Boolean): Binary;
+    function GenerarAlbaranEnPDF(const ListaID : TIntegerArray; const VerPrecios: Boolean): Binary;
     function GenerarEtiquetas(const AID : Integer; withRefCliente: Boolean): Binary;
   end;
 
@@ -72,11 +73,14 @@ begin
 end;
 
 
-function TRptAlbaranesCliente.GenerarAlbaran(const ListaID : TIntegerArray): Binary;
+function TRptAlbaranesCliente.GenerarAlbaran(const ListaID : TIntegerArray; const VerPrecios: Boolean): Binary;
 var
   i: Integer;
 begin
   Result := Binary.Create;
+  //Inicializamos parametros
+  FVerPrecios := VerPrecios;
+
   //Vamos generando todos y cada uno de los presupuestos recibidos
   for i := 0 to ListaID.Count - 1 do
     _GenerarAlbaran(ListaID.Items[i]);
@@ -84,12 +88,13 @@ begin
   frxReport.PreviewPages.SaveToStream(Result);
 end;
 
-function TRptAlbaranesCliente.GenerarAlbaranEnPDF(
-  const ListaID: TIntegerArray): Binary;
+function TRptAlbaranesCliente.GenerarAlbaranEnPDF(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
 var
   i: Integer;
 begin
   Result := Binary.Create;
+  //Inicializamos parametros
+  FVerPrecios := VerPrecios;
 
   //Vamos generando todos y cada uno de los presupuestos recibidos
   for i := 0 to ListaID.Count - 1 do
@@ -120,7 +125,8 @@ begin
        raise Exception.Create (('Error Servidor: _GenerarAlbaran, no encuentra informe' + rptInfAlbaran));
 
     frxReport.LoadFromFile(AInforme, True);
-    frxReport.ReportOptions.Name := 'Albarán de cliente ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString;    
+    frxReport.Variables.Variables['VerPrecios'] := FVerPrecios;    
+    frxReport.ReportOptions.Name := 'Albarán de cliente ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString;
     frxReport.PrepareReport(False);
   finally
     FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas
index 28dfe9c4..3f68d4c6 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas	
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas	
@@ -32,7 +32,7 @@ type
     procedure DARemoteServiceCreate(Sender: TObject);
   protected
     { IsrvAlbaranesCliente methods }
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
     function GenerarInformeEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary;
   end;
 
@@ -81,14 +81,13 @@ begin
   ConnectionName := dmServer.ConnectionName;
 end;
 
-function TsrvAlbaranesCliente.GenerarInforme(
-  const ListaID: TIntegerArray): Binary;
+function TsrvAlbaranesCliente.GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
 var
   AReportGenerator : TRptAlbaranesCliente;
 begin
   AReportGenerator := TRptAlbaranesCliente.Create(nil);
   try
-    Result := AReportGenerator.GenerarAlbaran(ListaID);
+    Result := AReportGenerator.GenerarAlbaran(ListaID, VerPrecios);
   finally
     FreeAndNIL(AReportGenerator);
   end;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm
index a062057e..080e53b9 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm	
@@ -2,7 +2,6 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
   Caption = 'Lista de albaranes de cliente'
   ClientWidth = 583
   ExplicitWidth = 591
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas
index 4d11a1c7..117ff1c2 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas	
@@ -506,7 +506,10 @@ begin
                     AAlbaranes := Albaranes;
 
                   if Assigned(AAlbaranes) then
-                     FController.Preview(AAlbaranes, AllItems);
+                     if (Application.MessageBox('¿Desea ver los precios en el\los albaran\es de cliente seleccionados?', 'Atención', MB_YESNO) = IDYES) then
+                        FController.Preview(AAlbaranes, AllItems)
+                     else
+                        FController.Preview(AAlbaranes, AllItems, False);                     
                 end;
       end;
     end;
diff --git a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj
index fdecb19b..b01a96d7 100644
--- a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj	
+++ b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj	
@@ -245,15 +245,6 @@
   <Target Name="PedidosProveedor_controller:Make">
     <MSBuild Projects="..\Pedidos a proveedor\Controller\PedidosProveedor_controller.dproj" Targets="Make" />
   </Target>
-  <Target Name="PedidosProveedor_plugin">
-    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="" />
-  </Target>
-  <Target Name="PedidosProveedor_plugin:Clean">
-    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="PedidosProveedor_plugin:Make">
-    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="Make" />
-  </Target>
   <Target Name="PedidosProveedor_view">
     <MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="" />
   </Target>
@@ -263,14 +254,14 @@
   <Target Name="PedidosProveedor_view:Make">
     <MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Make" />
   </Target>
-  <Target Name="FacturasProveedor_plugin">
-    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="" />
+  <Target Name="PedidosProveedor_plugin">
+    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="" />
   </Target>
-  <Target Name="FacturasProveedor_plugin:Clean">
-    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="Clean" />
+  <Target Name="PedidosProveedor_plugin:Clean">
+    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="Clean" />
   </Target>
-  <Target Name="FacturasProveedor_plugin:Make">
-    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="Make" />
+  <Target Name="PedidosProveedor_plugin:Make">
+    <MSBuild Projects="..\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dproj" Targets="Make" />
   </Target>
   <Target Name="FacturasProveedor_controller">
     <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="" />
@@ -281,14 +272,23 @@
   <Target Name="FacturasProveedor_controller:Make">
     <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasProveedor_plugin">
+    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_plugin:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_plugin:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;ConCli_AlbCli_relation;ConCli_FacCli_relation;PreCli_ConCli_relation;ConCli_PedProv_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_controller;PedidosProveedor_plugin;PedidosProveedor_view;FacturasProveedor_plugin;FacturasProveedor_controller" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;ConCli_AlbCli_relation;ConCli_FacCli_relation;PreCli_ConCli_relation;ConCli_PedProv_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FacturasProveedor_controller;FacturasProveedor_plugin" />
   </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_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;ConCli_AlbCli_relation:Clean;ConCli_FacCli_relation:Clean;PreCli_ConCli_relation:Clean;ConCli_PedProv_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_plugin:Clean;PedidosProveedor_view:Clean;FacturasProveedor_plugin:Clean;FacturasProveedor_controller:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;ConCli_AlbCli_relation:Clean;ConCli_FacCli_relation:Clean;PreCli_ConCli_relation:Clean;ConCli_PedProv_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_plugin: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_data:Make;Articulos_controller:Make;Articulos_view:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;ConCli_AlbCli_relation:Make;ConCli_FacCli_relation:Make;PreCli_ConCli_relation:Make;ConCli_PedProv_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_controller:Make;PedidosProveedor_plugin:Make;PedidosProveedor_view:Make;FacturasProveedor_plugin:Make;FacturasProveedor_controller:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;ConCli_AlbCli_relation:Make;ConCli_FacCli_relation:Make;PreCli_ConCli_relation:Make;ConCli_PedProv_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FacturasProveedor_controller:Make;FacturasProveedor_plugin:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm
index ab4044af..3c3bc85b 100644
--- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm	
+++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm	
@@ -578,6 +578,11 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
       item
         Name = 'PORCENTAJE_BENEFICIO'
         DataType = datCurrency
+      end
+      item
+        Name = 'SITUACION'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
index a8ca9cb5..679ddd51 100644
--- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas	
+++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas	
@@ -9,13 +9,13 @@ 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_Valores = '{70561B10-CF0E-4CB0-9EDE-9E07CA3DC825}';
-  RID_Propiedades = '{42795964-B53A-4ABC-8C07-3AAF06D510F2}';
-  RID_ListaAnosContratos = '{3C8A3C5F-0BF7-4ED2-A43F-09AB91F800DD}';
-  RID_ContratosClienteBeneficios = '{298384FF-93DD-400F-99FF-6F94B609A8F3}';
-  RID_ContratosCliente = '{599407C8-CB47-4921-A309-EA98160811DB}';
-  RID_TiposCapitulos = '{9AEF97F4-6F51-4965-847A-2AE04F02AF26}';
-  RID_ContratosCliente_Detalles = '{F3C415E0-E714-4252-82B0-A62CD86B7ED8}';
+  RID_Valores = '{8D0A6005-9221-49D8-850E-9132CB554EF3}';
+  RID_Propiedades = '{8B55BD13-9462-4069-8727-FC0E5CC3B5CE}';
+  RID_ListaAnosContratos = '{C307F363-E262-45D7-92C8-C8A315917474}';
+  RID_ContratosClienteBeneficios = '{2A105B52-7E4A-4F48-9BAC-4E919F6619A5}';
+  RID_ContratosCliente = '{E6050152-2E8E-4AAB-BD2F-C7A863966187}';
+  RID_TiposCapitulos = '{8DC00365-1B40-406A-94F0-0A706EA1889C}';
+  RID_ContratosCliente_Detalles = '{9BAA7277-F710-4A9B-8EC7-FFC449E23AF6}';
 
   { Data table names }
   nme_Valores = 'Valores';
@@ -64,6 +64,7 @@ const
   fld_ContratosClienteBeneficiosIMPORTE_FACTURAS_PROVEEDOR = 'IMPORTE_FACTURAS_PROVEEDOR';
   fld_ContratosClienteBeneficiosIMPORTE_BENEFICIO = 'IMPORTE_BENEFICIO';
   fld_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO = 'PORCENTAJE_BENEFICIO';
+  fld_ContratosClienteBeneficiosSITUACION = 'SITUACION';
 
   { ContratosClienteBeneficios field indexes }
   idx_ContratosClienteBeneficiosID = 0;
@@ -77,6 +78,7 @@ const
   idx_ContratosClienteBeneficiosIMPORTE_FACTURAS_PROVEEDOR = 8;
   idx_ContratosClienteBeneficiosIMPORTE_BENEFICIO = 9;
   idx_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO = 10;
+  idx_ContratosClienteBeneficiosSITUACION = 11;
 
   { ContratosCliente fields }
   fld_ContratosClienteID = 'ID';
@@ -237,7 +239,7 @@ const
 type
   { IValores }
   IValores = interface(IDAStronglyTypedDataTable)
-  ['{2620E76F-9DE4-4A08-9B01-F4FDC10BE790}']
+  ['{BE709E0D-DA15-433E-845D-A94BC20A4918}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -296,7 +298,7 @@ type
 
   { IPropiedades }
   IPropiedades = interface(IDAStronglyTypedDataTable)
-  ['{9C04A9FE-841E-4326-AE5F-88AFA615E660}']
+  ['{5B1734E1-7B39-4B14-B907-21077C041461}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -355,7 +357,7 @@ type
 
   { IListaAnosContratos }
   IListaAnosContratos = interface(IDAStronglyTypedDataTable)
-  ['{8DF60C08-E50F-4823-9294-DB2BD0124094}']
+  ['{ABCA5139-F042-4033-BCA2-09D644B80C2C}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -390,7 +392,7 @@ type
 
   { IContratosClienteBeneficios }
   IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
-  ['{613D5F73-5101-403F-B998-0FCE68876699}']
+  ['{6429E1F0-65EC-42C4-B326-A3FDFD709C6B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -436,6 +438,10 @@ type
     procedure SetPORCENTAJE_BENEFICIOValue(const aValue: Currency);
     function GetPORCENTAJE_BENEFICIOIsNull: Boolean;
     procedure SetPORCENTAJE_BENEFICIOIsNull(const aValue: Boolean);
+    function GetSITUACIONValue: String;
+    procedure SetSITUACIONValue(const aValue: String);
+    function GetSITUACIONIsNull: Boolean;
+    procedure SetSITUACIONIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -461,6 +467,8 @@ type
     property IMPORTE_BENEFICIOIsNull: Boolean read GetIMPORTE_BENEFICIOIsNull write SetIMPORTE_BENEFICIOIsNull;
     property PORCENTAJE_BENEFICIO: Currency read GetPORCENTAJE_BENEFICIOValue write SetPORCENTAJE_BENEFICIOValue;
     property PORCENTAJE_BENEFICIOIsNull: Boolean read GetPORCENTAJE_BENEFICIOIsNull write SetPORCENTAJE_BENEFICIOIsNull;
+    property SITUACION: String read GetSITUACIONValue write SetSITUACIONValue;
+    property SITUACIONIsNull: Boolean read GetSITUACIONIsNull write SetSITUACIONIsNull;
   end;
 
   { TContratosClienteBeneficiosDataTableRules }
@@ -512,6 +520,10 @@ type
     procedure SetPORCENTAJE_BENEFICIOValue(const aValue: Currency); virtual;
     function GetPORCENTAJE_BENEFICIOIsNull: Boolean; virtual;
     procedure SetPORCENTAJE_BENEFICIOIsNull(const aValue: Boolean); virtual;
+    function GetSITUACIONValue: String; virtual;
+    procedure SetSITUACIONValue(const aValue: String); virtual;
+    function GetSITUACIONIsNull: Boolean; virtual;
+    procedure SetSITUACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -536,6 +548,8 @@ type
     property IMPORTE_BENEFICIOIsNull: Boolean read GetIMPORTE_BENEFICIOIsNull write SetIMPORTE_BENEFICIOIsNull;
     property PORCENTAJE_BENEFICIO: Currency read GetPORCENTAJE_BENEFICIOValue write SetPORCENTAJE_BENEFICIOValue;
     property PORCENTAJE_BENEFICIOIsNull: Boolean read GetPORCENTAJE_BENEFICIOIsNull write SetPORCENTAJE_BENEFICIOIsNull;
+    property SITUACION: String read GetSITUACIONValue write SetSITUACIONValue;
+    property SITUACIONIsNull: Boolean read GetSITUACIONIsNull write SetSITUACIONIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -545,7 +559,7 @@ type
 
   { IContratosCliente }
   IContratosCliente = interface(IDAStronglyTypedDataTable)
-  ['{01B1FEF2-2A92-4080-8AA6-D0668432174B}']
+  ['{F6CA8D2A-7FE2-492D-9C31-17EEED90EA92}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1159,7 +1173,7 @@ type
   }
   { ITiposCapitulos }
   ITiposCapitulos = interface(IDAStronglyTypedDataTable)
-  ['{F69A1386-D2A9-4D05-82A9-F050398B2E40}']
+  ['{83723322-56DB-4D52-A7F2-71BE5705EFF4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1254,7 +1268,7 @@ type
 
   { IContratosCliente_Detalles }
   IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{E34606BE-1525-42AA-85DF-2F29600C6B53}']
+  ['{E4351EBD-42E9-42AA-A32C-EBF448AF3AAB}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1908,6 +1922,27 @@ begin
     DataTable.Fields[idx_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO].AsVariant := Null;
 end;
 
+function TContratosClienteBeneficiosDataTableRules.GetSITUACIONValue: String;
+begin
+  result := DataTable.Fields[idx_ContratosClienteBeneficiosSITUACION].AsString;
+end;
+
+procedure TContratosClienteBeneficiosDataTableRules.SetSITUACIONValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ContratosClienteBeneficiosSITUACION].AsString := aValue;
+end;
+
+function TContratosClienteBeneficiosDataTableRules.GetSITUACIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ContratosClienteBeneficiosSITUACION].IsNull;
+end;
+
+procedure TContratosClienteBeneficiosDataTableRules.SetSITUACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ContratosClienteBeneficiosSITUACION].AsVariant := Null;
+end;
+
 
 { TContratosClienteDataTableRules }
 constructor TContratosClienteDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas
index 4cb26070..0b4d8d45 100644
--- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas	
+++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas	
@@ -9,18 +9,18 @@ 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_ValoresDelta = '{4C6DB20B-7CD7-4030-BD89-8AAA22A9CBB8}';
-  RID_PropiedadesDelta = '{F5FC8E51-B4DB-46CF-A7AB-8A54CE4C8E15}';
-  RID_ListaAnosContratosDelta = '{17BC2843-25E2-47F3-AD18-7C7A78284701}';
-  RID_ContratosClienteBeneficiosDelta = '{6F425251-01C7-4E7F-A383-9B80DCF50117}';
-  RID_ContratosClienteDelta = '{C99393C6-A96C-4C04-AE04-35FD4EF00ED2}';
-  RID_TiposCapitulosDelta = '{E50EF164-9D6C-4B3D-A69F-C4C22D137585}';
-  RID_ContratosCliente_DetallesDelta = '{B74A0577-D340-49D9-B145-7D9407B03919}';
+  RID_ValoresDelta = '{684CE7DA-07CD-44B6-B5D0-A53167809071}';
+  RID_PropiedadesDelta = '{9411016A-2563-45A8-A869-AD6D77B08D8D}';
+  RID_ListaAnosContratosDelta = '{3904C59D-140E-4B09-8883-BAD4283361E1}';
+  RID_ContratosClienteBeneficiosDelta = '{33BCE36F-E764-4D57-B64F-CC3336F86D08}';
+  RID_ContratosClienteDelta = '{5A623AB9-EB89-4FE8-B2EB-DCA2DF9DE9E2}';
+  RID_TiposCapitulosDelta = '{9005E869-C4FF-4100-B6D7-7C3AB110EF02}';
+  RID_ContratosCliente_DetallesDelta = '{922730A0-E1D3-48AF-B9FA-C766F808A26F}';
 
 type
   { IValoresDelta }
   IValoresDelta = interface(IValores)
-  ['{4C6DB20B-7CD7-4030-BD89-8AAA22A9CBB8}']
+  ['{684CE7DA-07CD-44B6-B5D0-A53167809071}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PROPIEDADValue : Integer;
@@ -78,7 +78,7 @@ type
 
   { IPropiedadesDelta }
   IPropiedadesDelta = interface(IPropiedades)
-  ['{F5FC8E51-B4DB-46CF-A7AB-8A54CE4C8E15}']
+  ['{9411016A-2563-45A8-A869-AD6D77B08D8D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -136,7 +136,7 @@ type
 
   { IListaAnosContratosDelta }
   IListaAnosContratosDelta = interface(IListaAnosContratos)
-  ['{17BC2843-25E2-47F3-AD18-7C7A78284701}']
+  ['{3904C59D-140E-4B09-8883-BAD4283361E1}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -170,7 +170,7 @@ type
 
   { IContratosClienteBeneficiosDelta }
   IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
-  ['{6F425251-01C7-4E7F-A383-9B80DCF50117}']
+  ['{33BCE36F-E764-4D57-B64F-CC3336F86D08}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldREFERENCIAValue : String;
@@ -183,6 +183,7 @@ type
     function GetOldIMPORTE_FACTURAS_PROVEEDORValue : Currency;
     function GetOldIMPORTE_BENEFICIOValue : Currency;
     function GetOldPORCENTAJE_BENEFICIOValue : Currency;
+    function GetOldSITUACIONValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -196,6 +197,7 @@ type
     property OldIMPORTE_FACTURAS_PROVEEDOR : Currency read GetOldIMPORTE_FACTURAS_PROVEEDORValue;
     property OldIMPORTE_BENEFICIO : Currency read GetOldIMPORTE_BENEFICIOValue;
     property OldPORCENTAJE_BENEFICIO : Currency read GetOldPORCENTAJE_BENEFICIOValue;
+    property OldSITUACION : String read GetOldSITUACIONValue;
   end;
 
   { TContratosClienteBeneficiosBusinessProcessorRules }
@@ -269,6 +271,12 @@ type
     function GetOldPORCENTAJE_BENEFICIOIsNull: Boolean; virtual;
     procedure SetPORCENTAJE_BENEFICIOValue(const aValue: Currency); virtual;
     procedure SetPORCENTAJE_BENEFICIOIsNull(const aValue: Boolean); virtual;
+    function GetSITUACIONValue: String; virtual;
+    function GetSITUACIONIsNull: Boolean; virtual;
+    function GetOldSITUACIONValue: String; virtual;
+    function GetOldSITUACIONIsNull: Boolean; virtual;
+    procedure SetSITUACIONValue(const aValue: String); virtual;
+    procedure SetSITUACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -315,6 +323,10 @@ type
     property PORCENTAJE_BENEFICIOIsNull : Boolean read GetPORCENTAJE_BENEFICIOIsNull write SetPORCENTAJE_BENEFICIOIsNull;
     property OldPORCENTAJE_BENEFICIO : Currency read GetOldPORCENTAJE_BENEFICIOValue;
     property OldPORCENTAJE_BENEFICIOIsNull : Boolean read GetOldPORCENTAJE_BENEFICIOIsNull;
+    property SITUACION : String read GetSITUACIONValue write SetSITUACIONValue;
+    property SITUACIONIsNull : Boolean read GetSITUACIONIsNull write SetSITUACIONIsNull;
+    property OldSITUACION : String read GetOldSITUACIONValue;
+    property OldSITUACIONIsNull : Boolean read GetOldSITUACIONIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -324,7 +336,7 @@ type
 
   { IContratosClienteDelta }
   IContratosClienteDelta = interface(IContratosCliente)
-  ['{C99393C6-A96C-4C04-AE04-35FD4EF00ED2}']
+  ['{5A623AB9-EB89-4FE8-B2EB-DCA2DF9DE9E2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -940,7 +952,7 @@ type
 
   { ITiposCapitulosDelta }
   ITiposCapitulosDelta = interface(ITiposCapitulos)
-  ['{E50EF164-9D6C-4B3D-A69F-C4C22D137585}']
+  ['{9005E869-C4FF-4100-B6D7-7C3AB110EF02}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldPOSICIONValue : Integer;
@@ -1034,7 +1046,7 @@ type
 
   { IContratosCliente_DetallesDelta }
   IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
-  ['{B74A0577-D340-49D9-B145-7D9407B03919}']
+  ['{922730A0-E1D3-48AF-B9FA-C766F808A26F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTRATOValue : Integer;
@@ -1868,6 +1880,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO] := Null;
 end;
 
+function TContratosClienteBeneficiosBusinessProcessorRules.GetSITUACIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosSITUACION];
+end;
+
+function TContratosClienteBeneficiosBusinessProcessorRules.GetSITUACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosSITUACION]);
+end;
+
+function TContratosClienteBeneficiosBusinessProcessorRules.GetOldSITUACIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteBeneficiosSITUACION];
+end;
+
+function TContratosClienteBeneficiosBusinessProcessorRules.GetOldSITUACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteBeneficiosSITUACION]);
+end;
+
+procedure TContratosClienteBeneficiosBusinessProcessorRules.SetSITUACIONValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosSITUACION] := aValue;
+end;
+
+procedure TContratosClienteBeneficiosBusinessProcessorRules.SetSITUACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosSITUACION] := Null;
+end;
+
 
 { TContratosClienteBusinessProcessorRules }
 constructor TContratosClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm
index 54f72f04..6b2d3530 100644
--- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm	
+++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm	
@@ -139,8 +139,8 @@ object srvContratosCliente: TsrvContratosCliente
             SQL = 
               'SELECT '#10'    ID, REFERENCIA, FECHA_CONTRATO, NOMBRE, NIF_CIF, IMP' +
               'ORTE_NETO, '#10'    IMPORTE_DESCUENTO, BASE_IMPONIBLE, IMPORTE_FACTU' +
-              'RAS_PROVEEDOR, '#10'    IMPORTE_BENEFICIO, PORCENTAJE_BENEFICIO'#10'  FR' +
-              'OM'#10'    V_CONTRATOS_BENEFICIOS'#10'  WHERE {Where}'
+              'RAS_PROVEEDOR, '#10'    IMPORTE_BENEFICIO, PORCENTAJE_BENEFICIO, SIT' +
+              'UACION'#10'  FROM'#10'    V_CONTRATOS_BENEFICIOS'#10'  WHERE {Where}'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -186,6 +186,10 @@ object srvContratosCliente: TsrvContratosCliente
               item
                 DatasetField = 'PORCENTAJE_BENEFICIO'
                 TableField = 'PORCENTAJE_BENEFICIO'
+              end
+              item
+                DatasetField = 'SITUACION'
+                TableField = 'SITUACION'
               end>
           end>
         Name = 'ContratosClienteBeneficios'
@@ -236,6 +240,11 @@ object srvContratosCliente: TsrvContratosCliente
           item
             Name = 'PORCENTAJE_BENEFICIO'
             DataType = datCurrency
+          end
+          item
+            Name = 'SITUACION'
+            DataType = datString
+            Size = 255
           end>
       end
       item
diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm
index 9323731c..61517f28 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm	
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm	
@@ -202,7 +202,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       DockPos = 343
       Visible = True
       ExplicitLeft = 431
-      ExplicitWidth = 688
+      ExplicitWidth = 687
       object TBXSeparatorItem18: TTBXSeparatorItem
       end
       object TBXItem44: TTBXItem
@@ -304,7 +304,9 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
     object actVerFacturasProveedor: TAction
       Category = 'Acciones'
       Caption = 'Ver facturas prov relacionadas'
+      Enabled = False
       ImageIndex = 6
+      Visible = False
       OnExecute = actVerFacturasProveedorExecute
     end
   end
diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratosClienteBeneficios.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratosClienteBeneficios.dfm
index 7e64b1f6..d6f3ad72 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorContratosClienteBeneficios.dfm	
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratosClienteBeneficios.dfm	
@@ -33,6 +33,19 @@ inherited fEditorContratosClienteBeneficios: TfEditorContratosClienteBeneficios
       ExplicitWidth = 543
       ExplicitHeight = 195
       inherited cxGridView: TcxGridDBTableView
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+            Column = frViewContratosClienteBeneficios1.cxGridViewIMPORTE_BENEFICIO
+          end
+          item
+            Kind = skSum
+            Column = frViewContratosClienteBeneficios1.cxGridViewIMPORTE_FACTURAS_PROVEEDOR
+          end
+          item
+            Kind = skSum
+            Column = frViewContratosClienteBeneficios1.cxGridViewBASE_IMPONIBLE
+          end>
         inherited cxGridViewIMPORTE_NETO: TcxGridDBColumn
           HeaderAlignmentHorz = taRightJustify
         end
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.dfm
index 92e62f9b..8f8e2f50 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.dfm	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.dfm	
@@ -1,7 +1,22 @@
 inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
   OnDestroy = CustomViewDestroy
   inherited cxGrid: TcxGrid
+    RootLevelOptions.DetailTabsPosition = dtpTop
+    OnActiveTabChanged = cxGridActiveTabChanged
     inherited cxGridView: TcxGridDBTableView
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+          Column = cxGridViewIMPORTE_BENEFICIO
+        end
+        item
+          Kind = skSum
+          Column = cxGridViewIMPORTE_FACTURAS_PROVEEDOR
+        end
+        item
+          Kind = skSum
+          Column = cxGridViewBASE_IMPONIBLE
+        end>
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
         Visible = False
@@ -16,6 +31,10 @@ inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
         DataBinding.FieldName = 'FECHA_CONTRATO'
         PropertiesClassName = 'TcxDateEditProperties'
       end
+      object cxGridViewSITUACION: TcxGridDBColumn
+        Caption = 'Situaci'#243'n'
+        DataBinding.FieldName = 'SITUACION'
+      end
       object cxGridViewNOMBRE: TcxGridDBColumn
         Caption = 'Cliente'
         DataBinding.FieldName = 'NOMBRE'
@@ -41,18 +60,21 @@ inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
         DataBinding.FieldName = 'BASE_IMPONIBLE'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        FooterAlignmentHorz = taRightJustify
       end
       object cxGridViewIMPORTE_FACTURAS_PROVEEDOR: TcxGridDBColumn
         Caption = 'Importe facturas proveedor'
         DataBinding.FieldName = 'IMPORTE_FACTURAS_PROVEEDOR'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        FooterAlignmentHorz = taRightJustify
       end
       object cxGridViewIMPORTE_BENEFICIO: TcxGridDBColumn
         Caption = 'Importe beneficio'
         DataBinding.FieldName = 'IMPORTE_BENEFICIO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        FooterAlignmentHorz = taRightJustify
       end
       object cxGridViewPORCENTAJE_BENEFICIO: TcxGridDBColumn
         Caption = 'Porcentaje beneficio'
@@ -62,6 +84,15 @@ inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
         Properties.DisplayFormat = ',0.00 %;-,0.00 %'
       end
     end
+    inherited cxGridLevel: TcxGridLevel
+      Caption = 'Todos'
+    end
+    object cxGridPendientes: TcxGridLevel
+      Caption = 'Pendientes'
+    end
+    object cxGridTerminados: TcxGridLevel
+      Caption = 'Terminados'
+    end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
     inherited TBXDockablePanel1: TTBXDockablePanel
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.pas
index 40009583..8bac50b8 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.pas	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.pas	
@@ -27,13 +27,23 @@ type
     cxGridViewIMPORTE_FACTURAS_PROVEEDOR: TcxGridDBColumn;
     cxGridViewIMPORTE_BENEFICIO: TcxGridDBColumn;
     cxGridViewPORCENTAJE_BENEFICIO: TcxGridDBColumn;
+    cxGridPendientes: TcxGridLevel;
+    cxGridTerminados: TcxGridLevel;
+    cxGridViewSITUACION: TcxGridDBColumn;
     procedure CustomViewDestroy(Sender: TObject);
+    procedure cxGridActiveTabChanged(Sender: TcxCustomGrid;
+      ALevel: TcxGridLevel);
   private
     FContratos: IBizContratosClienteBeneficios;
     function GetContratos: IBizContratosClienteBeneficios;
     procedure SetContratos(const Value: IBizContratosClienteBeneficios);
 
+    //Filtros relativos a la vista
+    procedure AnadirFiltroSituaciones;
+    procedure AnadirFiltroFechas;
+
   public
+    procedure AnadirOtrosFiltros; override;
     property Contratos: IBizContratosClienteBeneficios read GetContratos write SetContratos;
   end;
 
@@ -46,12 +56,66 @@ implementation
 
 { TfrViewContratosClienteBeneficios }
 
+procedure TfrViewContratosClienteBeneficios.AnadirFiltroFechas;
+var
+  Columna: TcxGridDBColumn;
+  Fecha1, Fecha2: Variant;
+  FFiltro : TcxFilterCriteriaItemList;
+begin
+  Fecha1 := frViewFiltroBase1.edtFechaIniFiltro.EditValue;
+  Fecha2 := frViewFiltroBase1.edtFechaFinFiltro.EditValue;
+
+  if  not VarIsNull(Fecha1)
+  and not VarIsNull(Fecha2) then
+  begin
+    cxGridView.DataController.Filter.Options := [fcoCaseInsensitive, fcoSoftCompare];
+    FFiltro := AddFilterGrid(fboAnd);
+
+    Columna := (cxGridView as TcxGridDBTableView).GetColumnByFieldName('FECHA_CONTRATO');
+    FFiltro.AddItem(Columna, foBetween, varArrayOf([Fecha1, Fecha2]), VarToStr(Fecha1) + ' and ' + VarToStr(Fecha2));
+  end;
+end;
+
+procedure TfrViewContratosClienteBeneficios.AnadirFiltroSituaciones;
+var
+  FFiltro : TcxFilterCriteriaItemList;
+begin
+  FFiltro := AddFilterGrid(fboAnd);
+
+  case cxGrid.ActiveLevel.Index of
+    1   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, SITUACION_CONTRATO_PENDIENTE, SITUACION_CONTRATO_PENDIENTE);
+    2   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, SITUACION_CONTRATO_TERMINADO, SITUACION_CONTRATO_TERMINADO);
+  end;
+end;
+
+procedure TfrViewContratosClienteBeneficios.AnadirOtrosFiltros;
+begin
+  inherited;
+
+  AnadirFiltroSituaciones;
+  AnadirFiltroFechas;
+
+  //Finalmente activamos el filtro si tenemos algo
+  if cxGridView.DataController.Filter.IsEmpty then
+    cxGridView.DataController.Filter.Active := False
+  else
+    cxGridView.DataController.Filter.Active := True;
+  cxGrid.ActiveLevel.GridView := cxGridView;
+end;
+
 procedure TfrViewContratosClienteBeneficios.CustomViewDestroy(Sender: TObject);
 begin
   FContratos := NIL;
   inherited;
 end;
 
+procedure TfrViewContratosClienteBeneficios.cxGridActiveTabChanged(
+  Sender: TcxCustomGrid; ALevel: TcxGridLevel);
+begin
+  inherited;
+  RefrescarFiltro;
+end;
+
 function TfrViewContratosClienteBeneficios.GetContratos: IBizContratosClienteBeneficios;
 begin
   Result := FContratos;
diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas
index 8e82b9bf..de27dd1d 100644
--- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas	
+++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas	
@@ -25,8 +25,11 @@ type
 
     function Buscar(const ID: Integer): IBizFacturaProveedor;
     function BuscarTodos: IBizFacturaProveedor;
+    function BuscarDelContrato(const ID_CONTRATO: Integer): IBizFacturaProveedor;
     procedure Ver(AFactura : IBizFacturaProveedor);
-    procedure VerTodos(AFacturas: IBizFacturaProveedor);
+    procedure VerTodos(AFacturas: IBizFacturaProveedor;
+      const AVerModal : Boolean = False; const AWindowCaption: String = '';
+      const AHeaderText: String = '');
     function Nuevo (WithInsert: Boolean = True): IBizFacturaProveedor;
     function Anadir(AFactura : IBizFacturaProveedor) : Boolean; overload;
     function AnadirAbono(AFactura : IBizFacturaProveedor) : Boolean;
@@ -104,10 +107,13 @@ type
     function Anadir(AFactura : IBizFacturaProveedor; const IDPedido : Integer): Boolean; overload;
     function Buscar(const ID: Integer): IBizFacturaProveedor;
     function BuscarTodos: IBizFacturaProveedor;
+    function BuscarDelContrato(const ID_CONTRATO: Integer): IBizFacturaProveedor;
 //    function BuscarTodasPendientesComision(IdAgente: Integer; IdComision: Integer; IdFacturasAsociadas: String): IBizFacturaProveedor;
     function Nuevo (WithInsert: Boolean = True) : IBizFacturaProveedor;
     procedure Ver(AFactura : IBizFacturaProveedor);
-    procedure VerTodos(AFacturas: IBizFacturaProveedor);
+    procedure VerTodos(AFacturas: IBizFacturaProveedor;
+      const AVerModal : Boolean = False; const AWindowCaption: String = '';
+      const AHeaderText: String = '');
     function Duplicar(AFactura: IBizFacturaProveedor): IBizFacturaProveedor;
     function GenerarAbono(AFactura: IBizFacturaProveedor): IBizFacturaProveedor;
     procedure RecuperarProveedor(AFactura : IBizFacturaProveedor);
@@ -133,7 +139,7 @@ type
 implementation
 
 uses
-  Windows, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasProveedorClient_Intf,
+  Windows, uStringsUtils, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasProveedorClient_Intf,
   uBizContactos, uIEditorFacturasProveedor, uIEditorFacturaProveedor, uFactuGES_App,
   uDataModuleFacturasProveedor, uBizDetallesFacturaProveedor, uControllerDetallesBase,
   uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uDateUtils, uROTypes,
@@ -450,6 +456,32 @@ begin
   FiltrarEmpresa(Result);  
 end;
 
+function TFacturasProveedorController.BuscarDelContrato(
+  const ID_CONTRATO: Integer): IBizFacturaProveedor;
+var
+  Condicion: TDAWhereExpression;
+begin
+{  ShowHourglassCursor;
+  try
+    Result := BuscarTodos;
+
+    // Filtrar los pedidos pendientes de recepcion
+    with Result.DataTable.DynamicWhere do
+    begin
+      // (ID_CONTRATO_CLIENTE = ID_CONTRATO)
+      Condicion := NewBinaryExpression(NewField('', fld_FacturaProveedorID_CONTRATO_CLIENTE), NewConstant(ID_CONTRATO, datInteger), dboEqual);
+
+      if IsEmpty then
+         Expression := Condicion
+      else
+         Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+}
+end;
+
 {REPASARRRRR
 function TFacturasProveedorController.BuscarTodasPendientesComision(IdAgente:Integer; IdComision: Integer; IdFacturasAsociadas: String): IBizFacturaProveedor;
 begin
@@ -761,20 +793,35 @@ begin
     end;
 end;
 
-procedure TFacturasProveedorController.VerTodos(AFacturas: IBizFacturaProveedor);
+procedure TFacturasProveedorController.VerTodos(AFacturas: IBizFacturaProveedor;
+      const AVerModal : Boolean = False; const AWindowCaption: String = '';
+      const AHeaderText: String = '');
 var
   AEditor : IEditorFacturasProveedor;
 begin
   AEditor := NIL;
 
   CreateEditor('EditorFacturasProveedor', IEditorFacturasProveedor, AEditor);
-  with AEditor do
-  begin
-    Controller := Self; //OJO ORDEN MUY IMPORTANTE
-    Facturas := AFacturas;
-    MultiSelect := True;
-    ShowEmbedded;
-  end;
+  if Assigned(AEditor) then
+    try
+      if not EsCadenaVacia(AWindowCaption) then
+        AEditor.WindowCaption := AWindowCaption;
+
+      if not EsCadenaVacia(AHeaderText) then
+        AEditor.HeaderText := AHeaderText;
+
+       AEditor.Controller := Self; //OJO ORDEN MUY IMPORTANTE
+       AEditor.Facturas := AFacturas;
+       AEditor.MultiSelect := True;
+       if AVerModal then
+          AEditor.ShowModal
+       else
+          AEditor.ShowEmbedded;
+    finally
+      if AVerModal then
+        AEditor.Release;
+      AEditor := NIL;
+    end;
 end;
 
 function TFacturasProveedorController._Vacio: IBizFacturaProveedor;
diff --git a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas
index 0a4ebb40..da198ef0 100644
--- a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas	
@@ -79,7 +79,7 @@ begin
     finally
       HideHourglassCursor;
     end;
-    AFacturasProveedorController.VerTodos(AFacturas); //, True, AText);
+    AFacturasProveedorController.VerTodos(AFacturas, True, AText);
   finally
     AFacturas := NIL;
     AFacturasProveedorController := NIL;
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm
index d73c6002..555ef849 100644
--- a/Source/Modulos/Inventario/Views/uViewInventario.dfm
+++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm
@@ -46,8 +46,9 @@ inherited frViewInventario: TfrViewInventario
           Kind = skSum
           Column = cxGridViewPENDIENTE_RECEPCION
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
+      OptionsCustomize.ColumnGrouping = False
       OptionsCustomize.ColumnHidingOnGrouping = False
-      OptionsCustomize.GroupBySorting = True
       object cxGridViewID_ALMACEN: TcxGridDBColumn
         DataBinding.FieldName = 'ID_ALMACEN'
         Visible = False
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas
index 3a955a3d2138f458252858589b43750bbbe18988..a250736fe5427af41c6f42e75d47ebe8540b3ed9 100644
GIT binary patch
delta 606
zcmb`F!AgZd7=<Asx<%Bo&4quLLvlfviiDVjK`rd&e$YP~((y7*WvlxT_YHc0h+MYm
z#ezoDTNXr%W;gujoSE;;yzM_2PuHWx<NEIWkV@(mT#6#gP<TZ?qXM<94QQ7;99uAr
zEAOV1MLrzZ;D#6%A_;hcm7x!|roM~|B<8Kef`Cg*aUyJp3tmcylq)hVh^SzcOB-&f
zfbKrMTGZ+2bY&dkB?{y*qveHUS*b%@b+%HkpEnOyf5G}kB=-kSPqX(o9I|-X8PB!P
z9B>rMv0zEW@GkU^{Lnx10(a7OMu769t5Q?E)B71}kwKJcxid+tf^T!x<+&7$rv&5`
o@{f?N+!L^zu4pR0RI8$!7a@%pvl0iU#-k4H|4S#WU$>pLcQWwDX#fBK

delta 22
ecmZ2v_*Z*FHs@v&E>EV-b9ii7Hcu1cVFLhTC<kQ#

diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 534fac95..5db76fb4 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -94,23 +94,22 @@ object RptPedidosProveedor: TRptPedidosProveedor
               'VIO,'#10'  PEDIDOS_PROVEEDOR.DESCRIPCION_GENERAL,'#10'  PEDIDOS_PROVEEDO' +
               'R.OBSERVACIONES,'#10'  VENDEDORES.NOMBRE as VENDEDOR,'#10'  VENDEDORES.R' +
               'EFERENCIA as REF_VENDEDOR,'#10'  COALESCE(VENDEDORES.MOVIL_1,'#39#39') || ' +
-              #39' - '#39' || COALESCE(VENDEDORES.MOVIL_2,'#39#39') || '#39' - '#39' || COALESCE(VE' +
-              'NDEDORES.TELEFONO_1,'#39#39') || '#39' - '#39' || COALESCE(VENDEDORES.TELEFONO' +
-              '_2,'#39#39') as TELEFONOS_VENDEDOR,'#10'  PROVEEDOR.NOMBRE,'#10'  PROVEEDOR.FA' +
-              'X,'#10#10'  CONTRATOS_CLIENTE.referencia as referencia_contrato,'#10'  CON' +
-              'TRATOS_CLIENTE.referencia_CLIENTE,'#10'  CLIENTES.NOMBRE AS NOMBRE_C' +
-              'LIENTE,'#10'  '#10'  PEDIDOS_PROVEEDOR.ID_ALMACEN,'#10'  '#10'  PEDIDOS_PROVEEDO' +
-              'R.CALLE,'#10'  PEDIDOS_PROVEEDOR.POBLACION,'#10'  PEDIDOS_PROVEEDOR.PROV' +
-              'INCIA,'#10'  PEDIDOS_PROVEEDOR.CODIGO_POSTAL,'#10'  PEDIDOS_PROVEEDOR.PE' +
-              'RSONA_CONTACTO,'#10'  PEDIDOS_PROVEEDOR.TELEFONO'#10#10'FROM'#10'  PEDIDOS_PRO' +
-              'VEEDOR'#10'  LEFT OUTER JOIN CONTACTOS PROVEEDOR ON (PROVEEDOR .ID =' +
-              ' PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT OUTER JOIN CONTACTOS VEN' +
-              'DEDORES ON (VENDEDORES.ID = PEDIDOS_PROVEEDOR.ID_VENDEDOR)'#10'  LEF' +
-              'T OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS_CLIENTE.ID = PEDIDO' +
-              'S_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LEFT OUTER JOIN CONTACTOS CLI' +
-              'ENTES ON (CLIENTES.ID = CONTRATOS_CLIENTE.ID_CLIENTE)'#10'  LEFT OUT' +
-              'ER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACE' +
-              'N)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10
+              #39' / '#39' || COALESCE(VENDEDORES.TELEFONO_1,'#39#39') as TELEFONOS_VENDEDO' +
+              'R,'#10'  PROVEEDOR.NOMBRE,'#10'  PROVEEDOR.FAX,'#10#10'  CONTRATOS_CLIENTE.ref' +
+              'erencia as referencia_contrato,'#10'  CONTRATOS_CLIENTE.referencia_C' +
+              'LIENTE,'#10'  CLIENTES.NOMBRE AS NOMBRE_CLIENTE,'#10'  '#10'  PEDIDOS_PROVEE' +
+              'DOR.ID_ALMACEN,'#10'  '#10'  PEDIDOS_PROVEEDOR.CALLE,'#10'  PEDIDOS_PROVEEDO' +
+              'R.POBLACION,'#10'  PEDIDOS_PROVEEDOR.PROVINCIA,'#10'  PEDIDOS_PROVEEDOR.' +
+              'CODIGO_POSTAL,'#10'  PEDIDOS_PROVEEDOR.PERSONA_CONTACTO,'#10'  PEDIDOS_P' +
+              'ROVEEDOR.TELEFONO'#10#10'FROM'#10'  PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN CO' +
+              'NTACTOS PROVEEDOR ON (PROVEEDOR .ID = PEDIDOS_PROVEEDOR.ID_PROVE' +
+              'EDOR)'#10'  LEFT OUTER JOIN CONTACTOS VENDEDORES ON (VENDEDORES.ID =' +
+              ' PEDIDOS_PROVEEDOR.ID_VENDEDOR)'#10'  LEFT OUTER JOIN CONTRATOS_CLIE' +
+              'NTE ON (CONTRATOS_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_CONTRATO_CLI' +
+              'ENTE)'#10'  LEFT OUTER JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = CON' +
+              'TRATOS_CLIENTE.ID_CLIENTE)'#10'  LEFT OUTER JOIN ALMACENES ON (ALMAC' +
+              'ENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHERE PEDIDOS_PROVEEDOR.' +
+              'ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -263,7 +262,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
           item
             Name = 'TELEFONOS_VENDEDOR'
             DataType = datString
-            Size = 109
+            Size = 53
           end
           item
             Name = 'NOMBRE'
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas
index 9d694069..144ccfa5 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas	
@@ -130,11 +130,13 @@ begin
   if Assigned(FPedido) and Assigned(FAlmacenes) then
   begin
     FPedido.Edit;
-    FPedido.CALLE := FAlmacenes.CALLE;
+    FPedido.CALLE := FAlmacenes.NOMBRE + #10#13 + FAlmacenes.CALLE;
     FPedido.POBLACION := FAlmacenes.POBLACION;
     FPedido.POBLACION := FAlmacenes.POBLACION;
     FPedido.PROVINCIA := FAlmacenes.PROVINCIA;
     FPedido.CODIGO_POSTAL := FAlmacenes.CODIGO_POSTAL;
+    FPedido.PERSONA_CONTACTO := FAlmacenes.PERSONA_CONTACTO;
+    FPedido.TELEFONO := FAlmacenes.TELEFONO;
     RefrescarDireccion;
   end;
 end;
@@ -144,11 +146,13 @@ begin
   if Assigned(FPedido) and Assigned(FDireccionesCliente) then
   begin
     FPedido.Edit;
-    FPedido.CALLE := FDireccionesCliente.CALLE;
+    FPedido.CALLE :=     FDireccionesCliente.NOMBRE + #10#13 + FDireccionesCliente.CALLE;
     FPedido.POBLACION := FDireccionesCliente.POBLACION;
     FPedido.POBLACION := FDireccionesCliente.POBLACION;
     FPedido.PROVINCIA := FDireccionesCliente.PROVINCIA;
     FPedido.CODIGO_POSTAL := FDireccionesCliente.CODIGO_POSTAL;
+    FPedido.PERSONA_CONTACTO := FDireccionesCliente.PERSONA_CONTACTO;
+    FPedido.TELEFONO := FDireccionesCliente.TELEFONO;
     RefrescarDireccion;
   end;
 end;
diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL
index 236e6b5e..9e13a53f 100644
--- a/Source/Servicios/FactuGES.RODL
+++ b/Source/Servicios/FactuGES.RODL
@@ -390,6 +390,8 @@
 </Parameter>
 <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
 </Parameter>
+<Parameter Name="VerPrecios" DataType="Boolean" Flag="In" >
+</Parameter>
 </Parameters>
 </Operation>
 <Operation Name="GenerarInformeEtiquetas" UID="{260CD213-F125-422B-9BD1-401729460DF0}">
diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas
index 6d8d0869..199e16f7 100644
--- a/Source/Servicios/FactuGES_Intf.pas
+++ b/Source/Servicios/FactuGES_Intf.pas
@@ -598,7 +598,7 @@ type
   { IsrvAlbaranesCliente }
   IsrvAlbaranesCliente = interface(IDataAbstractService)
     ['{6E910718-9AB0-47BB-9875-B0DE66A68D7A}']
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
     function GenerarInformeEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary;
   end;
 
@@ -612,7 +612,7 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
     function GenerarInformeEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary;
   end;
 
@@ -1992,12 +1992,13 @@ begin
   result := 'srvAlbaranesCliente';
 end;
 
-function TsrvAlbaranesCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray): Binary;
+function TsrvAlbaranesCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary;
 begin
   try
     result := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
     __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('VerPrecios', TypeInfo(Boolean), VerPrecios, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas
index 045778ed..9887927c 100644
--- a/Source/Servicios/FactuGES_Invk.pas
+++ b/Source/Servicios/FactuGES_Invk.pas
@@ -1172,9 +1172,10 @@ begin
 end;
 
 procedure TsrvAlbaranesCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function GenerarInforme(const ListaID: TIntegerArray): Binary; }
+{ function GenerarInforme(const ListaID: TIntegerArray; const VerPrecios: Boolean): Binary; }
 var
   ListaID: FactuGES_Intf.TIntegerArray;
+  VerPrecios: Boolean;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
@@ -1182,8 +1183,9 @@ begin
   lResult := nil;
   try
     __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('VerPrecios', TypeInfo(Boolean), VerPrecios, []);
 
-    lResult := (__Instance as IsrvAlbaranesCliente).GenerarInforme(ListaID);
+    lResult := (__Instance as IsrvAlbaranesCliente).GenerarInforme(ListaID, VerPrecios);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvAlbaranesCliente', 'GenerarInformeResponse');
     __Message.Write('Result', TypeInfo(Binary), lResult, []);
diff --git a/Source/Servicios/RODLFile.res b/Source/Servicios/RODLFile.res
index a27a732e19c45039124c5de134cd85110929e494..aa48c3d9421585c85f49357922c7b20055dfd225 100644
GIT binary patch
delta 45
zcmbPypXuIxrU?p+eH#^*2Te9G6y!`T3MfiV&de{K+`wlzIl;$f@-=yZ%_70|F#w*V
B5mEpE

delta 23
fcmcb2pK0=arU?p+&Knh%2Te}!vDxe&+#dq~dXfpQ

diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 4da443dc..fc97ab30 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -117,8 +117,6 @@ uses
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_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',
   uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule},
   uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
@@ -138,7 +136,9 @@ uses
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
   schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
-  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas';
+  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
+  schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
+  schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 424a5482..5e4cc6a8 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,298 +1,299 @@
-<?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>
-		<MainSource>FactuGES_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_Define>DEBUG;</DCC_Define>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-	</PropertyGroup>
-	<ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
-		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.9.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.9.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 01 de abril de 2019 16:07</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_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-	</ProjectExtensions>
-	<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\schEjerciciosServer_Intf.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\schEmpresasServer_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-			<Form>srvEmpresas</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-			<Form>srvProvinciasPoblaciones</Form>
-			<DesignClass>TRORemoteDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
-		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
-		<DCCReference Include="..\Base\Utiles\uStringsUtils.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\uBizAlbaranClienteServer.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\schAlbaranesProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-			<Form>srvAlbaranesProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_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\schArticulosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
-		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
-		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-			<Form>RptComisiones</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-			<Form>srvComisiones</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.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\schContactosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas">
-			<Form>RptListadosContactos</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-			<Form>srvContactos</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<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\uBizContratosClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
-			<Form>RptContratosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
-			<Form>srvContratosCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizFacturasClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-			<Form>RptFacturasCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-			<Form>srvFacturasCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizFacturasProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-			<Form>RptFacturasProveedor</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-			<Form>srvFacturasProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.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\schFormasPagoServer_Intf.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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-			<Form>srvGestorInformes</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\Servidor\srvHistoricoMovimientos_Impl.pas">
-			<Form>srvHistoricoMovimientos</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-			<Form>srvInventario</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizPedidosProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-			<Form>RptPedidosProveedor</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-			<Form>srvPedidosProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-			<Form>RptPresupuestosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-			<Form>srvPresupuestosCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizPagosClienteServer.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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-			<Form>srvRecibosCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizPagosProveedorServer.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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-			<Form>srvRecibosProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.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\schRemesasClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-			<Form>srvRemesasCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\uBizRemesasProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-			<Form>srvRemesasProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<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\Servidor\srvTiposIVA_Impl.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\Servidor\srvUnidadesMedida_Impl.pas">
-			<Form>srvUnidadesMedida</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-			<Form>srvConfiguracion</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
-			<Form>frConexionBD</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
-			<Form>frConfGeneral</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
-			<Form>fConfiguracion</Form>
-			<DesignClass>TForm</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<Form>FrameConfiguracion</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="srvLogin_Impl.pas">
-			<Form>srvLogin</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
-		</DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
-			<Form>dmServer</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="uServerMainForm.pas">
-			<Form>fServerForm</Form>
-		</DCCReference>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
-	</ItemGroup>
+  <PropertyGroup>
+    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+    <MainSource>FactuGES_Server.dpr</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_Define>DEBUG;</DCC_Define>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.9.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.9.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 17 de mayo de 2019 18:40</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_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <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\schEjerciciosServer_Intf.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\schEmpresasServer_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+      <Form>srvEmpresas</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+      <Form>srvProvinciasPoblaciones</Form>
+      <DesignClass>TRORemoteDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
+    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
+    <DCCReference Include="..\Base\Utiles\uStringsUtils.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\uBizAlbaranClienteServer.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\schAlbaranesProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+      <Form>srvAlbaranesProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_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\schArticulosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
+    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
+    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+      <Form>RptComisiones</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+      <Form>srvComisiones</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.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\schContactosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas">
+      <Form>RptListadosContactos</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+      <Form>srvContactos</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <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\uBizContratosClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
+      <Form>RptContratosCliente</Form>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
+      <Form>srvContratosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizFacturasClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+      <Form>RptFacturasCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+      <Form>srvFacturasCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizFacturasProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+      <Form>RptFacturasProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+      <Form>srvFacturasProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.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\schFormasPagoServer_Intf.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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+      <Form>srvGestorInformes</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\Servidor\srvHistoricoMovimientos_Impl.pas">
+      <Form>srvHistoricoMovimientos</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+      <Form>srvInventario</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizPedidosProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+      <Form>RptPedidosProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+      <Form>srvPedidosProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+      <Form>RptPresupuestosCliente</Form>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+      <Form>srvPresupuestosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizPagosClienteServer.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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+      <Form>srvRecibosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizPagosProveedorServer.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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+      <Form>srvRecibosProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.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\schRemesasClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+      <Form>srvRemesasCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\uBizRemesasProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+      <Form>srvRemesasProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <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\Servidor\srvTiposIVA_Impl.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\Servidor\srvUnidadesMedida_Impl.pas">
+      <Form>srvUnidadesMedida</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+      <Form>srvConfiguracion</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConexionBD.pas">
+      <Form>frConexionBD</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>frConfGeneral</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>fConfiguracion</Form>
+      <DesignClass>TForm</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>FrameConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="srvLogin_Impl.pas">
+      <Form>srvLogin</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uAcercaDe.pas">
+      <Form>fAcercaDe</Form>
+    </DCCReference>
+    <DCCReference Include="uDataModuleServer.pas">
+      <Form>dmServer</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uServerMainForm.pas">
+      <Form>fServerForm</Form>
+    </DCCReference>
+    <DCCReference Include="Utiles\RegExpr.pas" />
+    <DCCReference Include="Utiles\uBusinessUtils.pas" />
+    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
+    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+    <DCCReference Include="Utiles\uServerAppUtils.pas" />
+    <DCCReference Include="Utiles\uSesionesUtils.pas" />
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index f404c78e..3a45ad54 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,9,0,0
-PRODUCTVERSION 2,9,0,0
+FILEVERSION 2,9,1,0
+PRODUCTVERSION 2,9,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.9.0.0\0"
+              VALUE "FileVersion", "2.9.1.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.9.0.0\0"
-              VALUE "CompileDate", "lunes, 06 de mayo de 2019 16:02\0"
+              VALUE "ProductVersion", "2.9.1.0\0"
+              VALUE "CompileDate", "viernes, 17 de mayo de 2019 18:40\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 3b256cf4d50b54d55f2466b16565452471623b5f..0cb97e36b4fe4f33eacbb49f8967eca1406ca5c7 100644
GIT binary patch
delta 454
zcmY*UJxc>Y6r9~8nyAP%mdbJv@e4U6V6ah86hXAHxZ6Sqp5&rN!+98N)ZTLcL<$Ql
z(Vt>t=id<LZZ{Dh>^_EhGjHC@n|OK`uUUBEc@t9@mB1K04-lv#spQ=vg`^BfC}p`p
z6(~8RFrcE0AaL9?P;rP{9rPq$GGF1GWcvvl3lcTD<&Il!H|@FYf5p=1$d}vFJVd99
zOXLOi(7_eXvCDUhGo-{lWc+V%ZRO@OT7F!|Di{cUp*kR!QIWE@s6XQ0CAKwR%p4N8
z3wDQIJ=_=GZ6s9MvI+j?PB_s*OkI~f#U&GsM(yyiGwHa+!}xg&7r@kXe{vW%hHswr
d?93exvT^e>SD>(l4fCPv<4tU$fxvw0{a+$2Ky&~A

delta 243
zcmZqJ!MJ7{<A#!mECT^99tJpIWME?u5MW?nWRPIUU<J`|9t#5l6N7>RL~aEK0|PUH
z2h_pBU|;~1<6~f8MetM^fMzl<7%)w~7a_+4r2a*iXfQBv0!;$}doT&o&jPd!6-;29
z92Kd=l*2f=E;4R1N0bJu0fQcc!Q`7!<=kKvP<aA_!sO^^S-~8JQieQ+REA;(9R>vk
W0|v9nz0s=dW(-z9w$bFB(e419!6Bgl