From a3a8d5437e8ab9a565021456ecd3d4358b72272f Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Thu, 15 Oct 2015 09:24:45 +0000
Subject: [PATCH] Se tetocan cosas de modulo de pedidos de proveedor y grupos,
 procedencias de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@627 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Base/Base.dproj                        | 152 +++++----------
 Source/Cliente/FactuGES.dproj                 |  20 +-
 Source/Cliente/FactuGES.rc                    |   8 +-
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 171984 bytes
 Source/GUIBase/GUIBase.dproj                  |  56 +++---
 Source/GUIBase/uEditorBasico.pas              |  34 ++++
 Source/GUIBase/uEditorDBItem.dfm              |  11 +-
 Source/Informes/InfPedidoProveedor.fr3        |  38 ++--
 .../Contactos/Contactos_Group.groupproj       |  24 +--
 .../Contactos/Views/uEditorGruposCliente.pas  |   7 +-
 .../Views/uEditorGruposProveedor.dfm          |   6 -
 .../Views/uEditorGruposProveedor.pas          |   9 +-
 .../Views/uEditorProcedenciasCliente.dfm      |   2 -
 .../Views/uEditorProcedenciasCliente.pas      |   7 +-
 .../Views/uViewContratoCliente.pas            |   4 +-
 .../Data/uDataModulePedidosProveedor.dfm      |   9 +
 .../Model/PedidosProveedor_model.dpk          | Bin 979 -> 1004 bytes
 .../Model/PedidosProveedor_model.dproj        |  61 +-----
 .../Model/schPedidosProveedorClient_Intf.pas  |  80 +++++++-
 .../Model/schPedidosProveedorServer_Intf.pas  |  94 ++++++++-
 .../Model/uBizPedidosProveedor.pas            |  23 ++-
 .../Reports/uRptPedidosProveedor_Server.dfm   |  45 +++--
 .../Servidor/srvPedidosProveedor_Impl.dfm     |  52 +++--
 .../Views/uEditorPedidoProveedor.dfm          | 138 ++++++++-----
 .../Views/uViewPedidoProveedor.dfm            | 183 +++++++++++-------
 .../Views/uViewPedidoProveedor.pas            |  18 +-
 Source/Servidor/FactuGES_Server.dpr           |   6 +-
 Source/Servidor/FactuGES_Server.dproj         |   2 +-
 Source/Servidor/FactuGES_Server.rc            |  10 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23356 -> 23356 bytes
 30 files changed, 663 insertions(+), 436 deletions(-)

diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 048aabdd..4a88a641 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,62 +44,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -114,6 +58,54 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -138,52 +130,11 @@
       <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\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" />
@@ -200,13 +151,6 @@
     <DCCReference Include="Utiles\uPasswordUtils.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/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 6818d12d..df278206 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,25 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.7.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>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index f91c9401..d8f55323 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,6,6,0
-PRODUCTVERSION 2,6,6,0
+FILEVERSION 2,6,7,0
+PRODUCTVERSION 2,6,7,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.6.0\0"
+              VALUE "FileVersion", "2.6.7.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.6.0\0"
+              VALUE "ProductVersion", "2.6.7.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 3fef9d6a71e34a4f053e1f0eece7242f0b2ce32a..9e5262455476ded4c746c63a3cfc5cd7da60df1c 100644
GIT binary patch
delta 42
xcmcbxpX<VYu7(!IElgtbIN2H47?>Cs7}%%F&tp2tXg>YrJf_(|s&zh-Hvk_$4HEzW

delta 42
xcmcbxpX<VYu7(!IElgtbIN2E37?>Cs7}%!E&tp2tXg2-jJf_(|s&zh-Hvk^|4G#bS

diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 4cf8df42..84e7139f 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="..\Servidor\Base.dcp" />
+    <DCCReference Include="..\Servidor\ccpackD11.dcp" />
+    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
+    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
+    <DCCReference Include="..\Servidor\frx11.dcp" />
+    <DCCReference Include="..\Servidor\frxe11.dcp" />
+    <DCCReference Include="..\Servidor\fs11.dcp" />
+    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
+    <DCCReference Include="..\Servidor\tb2k_d10.dcp" />
+    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vclactnband.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcljpg.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
diff --git a/Source/GUIBase/uEditorBasico.pas b/Source/GUIBase/uEditorBasico.pas
index 0940696e..cc2f0dd9 100644
--- a/Source/GUIBase/uEditorBasico.pas
+++ b/Source/GUIBase/uEditorBasico.pas
@@ -13,7 +13,21 @@ type
   end;
 
   TfEditorBasico = class(TCustomEditor, IEditorBasico)
+  protected
+    FWindowCaption : String;
+    FHeaderText : String;
+
+    function GetHeaderText: String;
+    function GetWindowCaption: String;
+    procedure SetHeaderText(const Value: String);
+    procedure SetWindowCaption(const Value: String);
+
+  published
     procedure CustomEditorShow(Sender: TObject);
+  published
+    property WindowCaption : String read GetWindowCaption write SetWindowCaption;
+    property HeaderText : String read GetHeaderText write SetHeaderText;
+
   end;
 
 implementation
@@ -27,6 +41,26 @@ begin
   ScaleFormFont(Self);
 end;
 
+function TfEditorBasico.GetHeaderText: String;
+begin
+  Result := FHeaderText;
+end;
+
+function TfEditorBasico.GetWindowCaption: String;
+begin
+  Result := FWindowCaption;
+end;
+
+procedure TfEditorBasico.SetHeaderText(const Value: String);
+begin
+  FHeaderText := Value;
+end;
+
+procedure TfEditorBasico.SetWindowCaption(const Value: String);
+begin
+  FWindowCaption := Value;
+end;
+
 initialization
   RegisterClass(TfEditorBasico);
 
diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm
index b86815a9..0467683b 100644
--- a/Source/GUIBase/uEditorDBItem.dfm
+++ b/Source/GUIBase/uEditorDBItem.dfm
@@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
     Width = 650
     ExplicitWidth = 650
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 650
+      ExplicitWidth = 605
       inherited TBXItem26: TTBXItem
         Visible = False
       end
@@ -77,12 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem
   object pgPaginas: TPageControl [3]
     AlignWithMargins = True
     Left = 3
-    Top = 118
+    Top = 109
     Width = 644
-    Height = 319
+    Height = 328
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 118
+    ExplicitHeight = 319
     object pagGeneral: TTabSheet
       Caption = 'General'
       ExplicitLeft = 0
@@ -93,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem
   end
   object PnlComentario: TPanel [4]
     Left = 0
-    Top = 85
+    Top = 76
     Width = 650
     Height = 30
     Align = alTop
@@ -103,6 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem
     ParentBackground = False
     TabOrder = 4
     VerticalAlignment = taAlignTop
+    ExplicitTop = 85
     object lbComentario: TLabel
       AlignWithMargins = True
       Left = 6
diff --git a/Source/Informes/InfPedidoProveedor.fr3 b/Source/Informes/InfPedidoProveedor.fr3
index 90945d5b..4eaa1787 100644
--- a/Source/Informes/InfPedidoProveedor.fr3
+++ b/Source/Informes/InfPedidoProveedor.fr3
@@ -1,13 +1,12 @@
 <?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="42258,7902906134" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;&#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;  if (&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;);&#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;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;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="42291,7971660764" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;&#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;  if (&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;);&#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;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;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="24" Left="0" Top="476" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
-      <TfrxRichView Name="Concepto" ShiftMode="smWhenOverlapped" Left="1,5" Top="1,5" Width="438,5436" Height="18" Visible="False" ShowHint="False" StretchMode="smMaxHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="2" GapY="3" Wysiwyg="False" PropData="0852696368456469740A910000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A7B5C2A5C67656E657261746F72204D7366746564697420352E34312E31352E313531323B7D5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
-      <TfrxMemoView Name="eCantidad" Left="445" Top="1,5" Width="56,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteUnidad" Left="504" Top="2" Width="96,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteTotal" Left="606" Top="2" Width="109,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
-      <TfrxMemoView Name="Memo16" Left="0" Top="2" Width="438" Height="18" ShowHint="False" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
+      <TfrxMemoView Name="eCantidad" Left="445" Top="1,5" Width="56,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
+      <TfrxMemoView Name="ImporteUnidad" Left="504" Top="2" Width="96,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="ImporteTotal" Left="606" Top="2" Width="109,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Concepto" Left="4" Top="2" Width="436,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="-16777208" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" GapY="3" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
     </TfrxMasterData>
     <TfrxPageFooter Name="PageFooter1" Height="245,87953" Left="0" Top="560" Width="718,1107">
       <TfrxLineView Name="Line4" Align="baCenter" Left="-0,94465" Top="0" Width="720" Height="0" ShowHint="False" Frame.Typ="4"/>
@@ -18,31 +17,32 @@
     <TfrxPageHeader Name="PageHeader1" Height="400" Left="0" Top="16" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
       <TfrxMemoView Name="eConcepto" Align="baLeft" Left="0" Top="373,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="373,94094" Width="59,25726667" 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="Cantidad"/>
-      <TfrxShapeView Name="Shape2" Left="357,60637" Top="177,22047" Width="360,69295" Height="184,95671" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
-      <TfrxMemoView Name="Memo7" Left="362,61441" Top="246,81107" Width="68,69295" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Página nº:"/>
-      <TfrxMemoView Name="Memo12" Left="438,86642" Top="246,81107" Width="278,58287" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
-      <TfrxShapeView Name="Shape1" Left="0" Top="178,22047" Width="357,92125984" Height="184,96062016" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
+      <TfrxShapeView Name="Shape2" Left="357,60637" Top="178,22047" Width="360,69295" Height="184,95671" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
+      <TfrxMemoView Name="Memo7" Left="362,61441" Top="186,81107" Width="68,69295" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Página nº:"/>
+      <TfrxMemoView Name="Memo12" Left="437,86642" Top="186,81107" Width="47,58287" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
+      <TfrxShapeView Name="Shape1" Left="0" Top="178,22047" Width="357,92125984" Height="184,96062016" ShowHint="False" Color="-16777211" Frame.Color="8421504"/>
       <TfrxMemoView Name="Memo10" Left="4,68491" Top="187,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="Memo5" Left="362,61441" Top="268,35436" Width="98,92919" Height="18,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="Nº pedido:"/>
-      <TfrxMemoView Name="Memo4" Left="362,61441" Top="297,89765" Width="72,47248" Height="18,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="Proveedor:"/>
-      <TfrxMemoView Name="Memo11" Left="435,08689" Top="297,89765" Width="279,11812" Height="18,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;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo3" Left="438,86642" Top="268,57483" Width="78,80303" Height="18,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;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo5" Left="362,61441" Top="211,35436" Width="98,92919" Height="18,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="Nº pedido:"/>
+      <TfrxMemoView Name="Memo11" Left="366,08689" Top="76,89765" Width="347,11812" Height="70,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="Memo3" Left="438,86642" Top="211,57483" Width="272,80303" Height="18,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;REFERENCIA&#34;]"/>
       <TfrxMemoView Name="DireccionEnvio" Left="4" Top="210,22047" Width="347,46475" Height="144,40483" OnBeforePrint="DireccionEnvioOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
       <TfrxLineView Name="Line1" Left="718,5" Top="373,36222913" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line2" Left="0" Top="373,36222913" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line3" Align="baLeft" Left="0" Top="373,36222913" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="Line5" Align="baLeft" Left="442,7" Top="373,36222913" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
-      <TfrxMemoView Name="Memo2" Left="365,92115" Top="34,89765" Width="347,93723" Height="38,89765" ShowHint="False" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="PEDIDO A PROVEEDOR"/>
-      <TfrxMemoView Name="Memo1" Left="521,57514" Top="269,04731" Width="46,01577" Height="18,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="Fecha:"/>
-      <TfrxMemoView Name="Memo6" Left="570,70903" Top="269,04731" Width="143,05504" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HideZeros="True" ParentFont="False" Text="[frxDBCabecera.&#34;FECHA_PEDIDO&#34;]"/>
-      <TfrxMemoView Name="Memo9" Left="362,83488" Top="321,96073" Width="30,89765" Height="18,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="Fax:"/>
-      <TfrxMemoView Name="Memo15" Left="396,85065" Top="321,96073" Width="316,91342" Height="18,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;FAX&#34;]"/>
+      <TfrxMemoView Name="Memo2" Left="365,92115" Top="30,89765" Width="347,93723" Height="38,89765" ShowHint="False" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="PEDIDO A PROVEEDOR"/>
+      <TfrxMemoView Name="Memo1" Left="508,57514" Top="187,04731" Width="94,01577" Height="18,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="Fecha pedido:"/>
+      <TfrxMemoView Name="Memo6" Left="608,70903" Top="187,04731" Width="102,05504" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HideZeros="True" ParentFont="False" Text="[frxDBCabecera.&#34;FECHA_PEDIDO&#34;]"/>
+      <TfrxMemoView Name="Memo9" Left="366,83488" Top="149,96073" Width="119,89765" Height="18,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="Fax del proveedor:"/>
+      <TfrxMemoView Name="Memo15" Left="494,85065" Top="149,96073" Width="217,91342" Height="18,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;FAX&#34;]"/>
       <TfrxMemoView Name="eImporteUnidad" Left="502" Top="374" Width="101,25726667" Height="26,45669291" OnBeforePrint="eImporteUnidadOnBeforePrint" 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="Importe coste"/>
       <TfrxMemoView Name="eImporteTotal" Left="603" Top="374" Width="115,25726667" 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="Importe total"/>
       <TfrxLineView Name="lImporteUnidad" Left="502" Top="374" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
       <TfrxLineView Name="lImporteTotal" Left="603" Top="374" Width="0" Height="430" ShowHint="False" Frame.Typ="1"/>
       <TfrxMemoView Name="Memo22" Left="15" Top="75" Width="229" Height="63" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaBottom" Text="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="Memo4" Left="362" Top="238" Width="68,89765" Height="18,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="Vendedor:"/>
+      <TfrxMemoView Name="Memo16" Left="432,01577" Top="238" Width="271,91342" Height="18,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;VENDEDOR&#34;]"/>
     </TfrxPageHeader>
   </TfrxReportPage>
 </TfrxReport>
diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj
index 8f0342d3..1b534ecd 100644
--- a/Source/Modulos/Contactos/Contactos_Group.groupproj
+++ b/Source/Modulos/Contactos/Contactos_Group.groupproj
@@ -97,15 +97,6 @@
   <Target Name="Contabilidad_controller:Make">
     <MSBuild Projects="..\Contabilidad\Controller\Contabilidad_controller.dproj" Targets="Make" />
   </Target>
-  <Target Name="Contactos_controller">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="" />
-  </Target>
-  <Target Name="Contactos_controller:Clean">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="Contactos_controller:Make">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Make" />
-  </Target>
   <Target Name="Contactos_view">
     <MSBuild Projects="Views\Contactos_view.dproj" Targets="" />
   </Target>
@@ -115,6 +106,15 @@
   <Target Name="Contactos_view:Make">
     <MSBuild Projects="Views\Contactos_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="Contactos_controller">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_controller:Clean">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_controller:Make">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Make" />
+  </Target>
   <Target Name="Contactos_plugin">
     <MSBuild Projects="Plugin\Contactos_plugin.dproj" Targets="" />
   </Target>
@@ -152,13 +152,13 @@
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_view;Contactos_controller;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_view:Clean;Contactos_controller:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_view:Make;Contactos_controller:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server: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/Contactos/Views/uEditorGruposCliente.pas b/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas
index 73984271..2c33b892 100644
--- a/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas
+++ b/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas
@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorGruposCliente, uEditorBase, uGUIBase, ExtCtrls,
-  ComCtrls, uBizGruposCliente, uGruposClienteController, uDAInterfaces;
+  uIEditorGruposCliente, uEditorBasico, uGUIBase, ExtCtrls,
+  ComCtrls, uBizGruposCliente, uGruposClienteController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorGruposCliente = class(TfEditorBase, IEditorGruposCliente)
+  TfEditorGruposCliente = class(TfEditorBasico, IEditorGruposCliente)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaGruposCliente: TDBLookupListBox;
diff --git a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm
index bdc5a9bd..62e46d2c 100644
--- a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm
@@ -17,8 +17,6 @@ object fEditorGruposProveedor: TfEditorGruposProveedor
   Position = poScreenCenter
   OnClose = CustomEditorClose
   OnShow = FormShow
-  InstanceID = 0
-  ReadOnly = False
   PixelsPerInch = 96
   TextHeight = 13
   object bAceptar: TButton
@@ -48,10 +46,6 @@ object fEditorGruposProveedor: TfEditorGruposProveedor
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = 'Grupos de proveedor'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Label1: TLabel
         Left = 10
         Top = 12
diff --git a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas
index e9fd1a06..3b70cc7b 100644
--- a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas
+++ b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas
@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorGruposProveedor, uEditorBase, uGUIBase, ExtCtrls,
-  ComCtrls, uBizGruposProveedor, uGruposProveedorController, uDAInterfaces;
+  uIEditorGruposProveedor, uEditorBasico, uGUIBase, ExtCtrls,
+  ComCtrls, uBizGruposProveedor, uGruposProveedorController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorGruposProveedor = class(TfEditorBase, IEditorGruposProveedor)
+  TfEditorGruposProveedor = class(TfEditorBasico, IEditorGruposProveedor)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaGruposProveedor: TDBLookupListBox;
@@ -54,7 +55,7 @@ type
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
 
     procedure actAnadirExecute(Sender: TObject);
-    procedure actEliminarExecute(Sender: TObject);
+    procedure actEliminarExecute(Sender: TObject); 
     procedure actAceptarExecute(Sender: TObject);
     procedure actCancelarExecute(Sender: TObject);
     procedure actCerrarExecute(Sender: TObject);
diff --git a/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.dfm b/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.dfm
index 2597f05d..24418767 100644
--- a/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.dfm
@@ -17,8 +17,6 @@ object fEditorProcedenciasCliente: TfEditorProcedenciasCliente
   Position = poScreenCenter
   OnClose = CustomEditorClose
   OnShow = FormShow
-  InstanceID = 0
-  ReadOnly = False
   PixelsPerInch = 96
   TextHeight = 13
   object bAceptar: TButton
diff --git a/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.pas b/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.pas
index 16b26c36..ff78d1f4 100644
--- a/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.pas
+++ b/Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.pas
@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorProcedenciasCliente, uEditorBase, uGUIBase, ExtCtrls,
-  ComCtrls, uBizProcedenciasCliente, uProcedenciasClienteController, uDAInterfaces;
+  uIEditorProcedenciasCliente, uEditorBasico, uGUIBase, ExtCtrls,
+  ComCtrls, uBizProcedenciasCliente, uProcedenciasClienteController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorProcedenciasCliente = class(TfEditorBase, IEditorProcedenciasCliente)
+  TfEditorProcedenciasCliente = class(TfEditorBasico, IEditorProcedenciasCliente)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaProcedenciasCliente: TDBLookupListBox;
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas
index 7850690b..8db0a149 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas	
@@ -125,12 +125,12 @@ end;
 
 procedure TfrViewContratoCliente.CustomViewDestroy(Sender: TObject);
 begin
-  inherited;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
   FVendedor := Nil;
   FVendedoresController := NIL;
   FViewClienteContrato := NIL;
+  inherited;  
 end;
 
 procedure TfrViewContratoCliente.frViewClienteContratoButton1Click(Sender: TObject);
@@ -185,7 +185,7 @@ begin
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
-    dsVendedor.DataTable := NIL;    
+    dsVendedor.DataTable := NIL;
     FViewClienteContrato.Contrato := Nil;
   end;
 end;
diff --git a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm
index 0a35b335..e9ca852c 100644
--- a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm	
@@ -204,6 +204,15 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'ID_VENDEDOR'
+        DataType = datInteger
+      end
+      item
+        Name = 'VENDEDOR'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'DESCRIPCION_GENERAL'
         DataType = datString
diff --git a/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dpk b/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dpk
index 27c0b6911a9d28388dd8a81468d231d7985f04a8..68e0730fbea2eb851734307a6d6287075ca27610 100644
GIT binary patch
delta 38
scmcc2{)T-6E0d%SFPDOXbADb)Vsc4-aeOk6Rg|BTlUlTymFXNK0PwO5`v3p{

delta 12
TcmaFEewlp(E7N8<rgMw{A1?$a

diff --git a/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dproj b/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dproj
index 2b1ae610..231cd2a7 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dproj	
+++ b/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dproj	
@@ -41,58 +41,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       
@@ -103,11 +52,7 @@
       
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
       <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
-    </Excluded_Packages>
-    <Source>
-      <Source Name="MainSource">PedidosProveedor_model.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
+    </Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -115,6 +60,7 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\..\Lib\Base.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
     <DCCReference Include="..\..\Lib\Contactos_model.dcp" />
     <DCCReference Include="Data\uIDataModulePedidosProveedor.pas" />
     <DCCReference Include="Data\uIDataModulePedidosProveedorReport.pas" />
@@ -125,7 +71,6 @@
     <None Include="ModelSupport_PedidosProveedor_model\default.txaPackage" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
diff --git a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas
index 96bc726c..476a4d92 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas	
@@ -9,8 +9,8 @@ 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_PedidosProveedor = '{758A0298-445B-4696-96E5-CF9C3A9F3165}';
-  RID_PedidosProveedor_Detalles = '{1460F7DE-C887-4ADA-99A2-F61D1EC6C15C}';
+  RID_PedidosProveedor = '{4E661347-2977-484B-A6B0-80499514DECB}';
+  RID_PedidosProveedor_Detalles = '{4C0745E8-E202-4453-B100-9488446601CE}';
 
   { Data table names }
   nme_PedidosProveedor = 'PedidosProveedor';
@@ -55,6 +55,8 @@ const
   fld_PedidosProveedorID_FORMA_PAGO = 'ID_FORMA_PAGO';
   fld_PedidosProveedorID_TIENDA = 'ID_TIENDA';
   fld_PedidosProveedorTIENDA = 'TIENDA';
+  fld_PedidosProveedorID_VENDEDOR = 'ID_VENDEDOR';
+  fld_PedidosProveedorVENDEDOR = 'VENDEDOR';
   fld_PedidosProveedorDESCRIPCION_GENERAL = 'DESCRIPCION_GENERAL';
 
   { PedidosProveedor field indexes }
@@ -96,7 +98,9 @@ const
   idx_PedidosProveedorID_FORMA_PAGO = 35;
   idx_PedidosProveedorID_TIENDA = 36;
   idx_PedidosProveedorTIENDA = 37;
-  idx_PedidosProveedorDESCRIPCION_GENERAL = 38;
+  idx_PedidosProveedorID_VENDEDOR = 38;
+  idx_PedidosProveedorVENDEDOR = 39;
+  idx_PedidosProveedorDESCRIPCION_GENERAL = 40;
 
   { PedidosProveedor_Detalles fields }
   fld_PedidosProveedor_DetallesID = 'ID';
@@ -129,7 +133,7 @@ const
 type
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{4ACDD73C-0542-4FAB-BE31-1C7AF24DA3B9}']
+  ['{F47C3279-7242-45E8-9365-036E76E6F64B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -281,6 +285,14 @@ type
     procedure SetTIENDAValue(const aValue: String);
     function GetTIENDAIsNull: Boolean;
     procedure SetTIENDAIsNull(const aValue: Boolean);
+    function GetID_VENDEDORValue: Integer;
+    procedure SetID_VENDEDORValue(const aValue: Integer);
+    function GetID_VENDEDORIsNull: Boolean;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean);
+    function GetVENDEDORValue: String;
+    procedure SetVENDEDORValue(const aValue: String);
+    function GetVENDEDORIsNull: Boolean;
+    procedure SetVENDEDORIsNull(const aValue: Boolean);
     function GetDESCRIPCION_GENERALValue: String;
     procedure SetDESCRIPCION_GENERALValue(const aValue: String);
     function GetDESCRIPCION_GENERALIsNull: Boolean;
@@ -364,6 +376,10 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property ID_VENDEDOR: Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull: Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property VENDEDOR: String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
     property DESCRIPCION_GENERAL: String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull: Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
   end;
@@ -527,6 +543,14 @@ type
     procedure SetTIENDAValue(const aValue: String); virtual;
     function GetTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetID_VENDEDORValue: Integer; virtual;
+    procedure SetID_VENDEDORValue(const aValue: Integer); virtual;
+    function GetID_VENDEDORIsNull: Boolean; virtual;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean); virtual;
+    function GetVENDEDORValue: String; virtual;
+    procedure SetVENDEDORValue(const aValue: String); virtual;
+    function GetVENDEDORIsNull: Boolean; virtual;
+    procedure SetVENDEDORIsNull(const aValue: Boolean); virtual;
     function GetDESCRIPCION_GENERALValue: String; virtual;
     procedure SetDESCRIPCION_GENERALValue(const aValue: String); virtual;
     function GetDESCRIPCION_GENERALIsNull: Boolean; virtual;
@@ -609,6 +633,10 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property ID_VENDEDOR: Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull: Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property VENDEDOR: String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
     property DESCRIPCION_GENERAL: String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull: Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
 
@@ -620,7 +648,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{F6271FC3-D2C6-451A-AF44-DD2BFAA0CE01}']
+  ['{B77F2CC6-6AAD-48DE-BF15-411FD2067FA1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1610,6 +1638,48 @@ begin
     DataTable.Fields[idx_PedidosProveedorTIENDA].AsVariant := Null;
 end;
 
+function TPedidosProveedorDataTableRules.GetID_VENDEDORValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsInteger;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsInteger := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetID_VENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsVariant := Null;
+end;
+
+function TPedidosProveedorDataTableRules.GetVENDEDORValue: String;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsString;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetVENDEDORValue(const aValue: String);
+begin
+  DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsString := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetVENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorVENDEDOR].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsVariant := Null;
+end;
+
 function TPedidosProveedorDataTableRules.GetDESCRIPCION_GENERALValue: String;
 begin
   result := DataTable.Fields[idx_PedidosProveedorDESCRIPCION_GENERAL].AsString;
diff --git a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas
index 0731d822..9b92bad6 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas	
@@ -9,13 +9,13 @@ 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_PedidosProveedorDelta = '{681EB6A0-478C-4A8D-8D6B-02511E481E8B}';
-  RID_PedidosProveedor_DetallesDelta = '{1BBF311F-9016-4DB3-A1F1-AF8DEDF05C62}';
+  RID_PedidosProveedorDelta = '{2B5BA176-7B75-49EB-80AB-ADC962C1A41D}';
+  RID_PedidosProveedor_DetallesDelta = '{F832D085-05C3-43CF-9354-9CC5A1A1CEF0}';
 
 type
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{681EB6A0-478C-4A8D-8D6B-02511E481E8B}']
+  ['{2B5BA176-7B75-49EB-80AB-ADC962C1A41D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -55,6 +55,8 @@ type
     function GetOldID_FORMA_PAGOValue : Integer;
     function GetOldID_TIENDAValue : Integer;
     function GetOldTIENDAValue : String;
+    function GetOldID_VENDEDORValue : Integer;
+    function GetOldVENDEDORValue : String;
     function GetOldDESCRIPCION_GENERALValue : String;
 
     { Properties }
@@ -96,6 +98,8 @@ type
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property OldID_TIENDA : Integer read GetOldID_TIENDAValue;
     property OldTIENDA : String read GetOldTIENDAValue;
+    property OldID_VENDEDOR : Integer read GetOldID_VENDEDORValue;
+    property OldVENDEDOR : String read GetOldVENDEDORValue;
     property OldDESCRIPCION_GENERAL : String read GetOldDESCRIPCION_GENERALValue;
   end;
 
@@ -334,6 +338,18 @@ type
     function GetOldTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAValue(const aValue: String); virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetID_VENDEDORValue: Integer; virtual;
+    function GetID_VENDEDORIsNull: Boolean; virtual;
+    function GetOldID_VENDEDORValue: Integer; virtual;
+    function GetOldID_VENDEDORIsNull: Boolean; virtual;
+    procedure SetID_VENDEDORValue(const aValue: Integer); virtual;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean); virtual;
+    function GetVENDEDORValue: String; virtual;
+    function GetVENDEDORIsNull: Boolean; virtual;
+    function GetOldVENDEDORValue: String; virtual;
+    function GetOldVENDEDORIsNull: Boolean; virtual;
+    procedure SetVENDEDORValue(const aValue: String); virtual;
+    procedure SetVENDEDORIsNull(const aValue: Boolean); virtual;
     function GetDESCRIPCION_GENERALValue: String; virtual;
     function GetDESCRIPCION_GENERALIsNull: Boolean; virtual;
     function GetOldDESCRIPCION_GENERALValue: String; virtual;
@@ -494,6 +510,14 @@ type
     property TIENDAIsNull : Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
     property OldTIENDA : String read GetOldTIENDAValue;
     property OldTIENDAIsNull : Boolean read GetOldTIENDAIsNull;
+    property ID_VENDEDOR : Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull : Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property OldID_VENDEDOR : Integer read GetOldID_VENDEDORValue;
+    property OldID_VENDEDORIsNull : Boolean read GetOldID_VENDEDORIsNull;
+    property VENDEDOR : String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull : Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
+    property OldVENDEDOR : String read GetOldVENDEDORValue;
+    property OldVENDEDORIsNull : Boolean read GetOldVENDEDORIsNull;
     property DESCRIPCION_GENERAL : String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull : Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
     property OldDESCRIPCION_GENERAL : String read GetOldDESCRIPCION_GENERALValue;
@@ -507,7 +531,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{1BBF311F-9016-4DB3-A1F1-AF8DEDF05C62}']
+  ['{F832D085-05C3-43CF-9354-9CC5A1A1CEF0}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -1879,6 +1903,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorTIENDA] := Null;
 end;
 
+function TPedidosProveedorBusinessProcessorRules.GetID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_VENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_VENDEDOR]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR] := Null;
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorVENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorVENDEDOR]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetVENDEDORValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR] := Null;
+end;
+
 function TPedidosProveedorBusinessProcessorRules.GetDESCRIPCION_GENERALValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorDESCRIPCION_GENERAL];
diff --git a/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas
index fa11b065..2fdfee6d 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas	
@@ -40,6 +40,8 @@ type
   private
     procedure CalcularBaseImponible;
     procedure CalcularIVA;
+    procedure AsignarVendedor;
+
   protected
     FSeleccionableInterface : ISeleccionable;
     FProveedor : IBizProveedor;
@@ -92,10 +94,23 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas;
+  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas,
+  uVendedoresController;
 
 { TBizPedidoProveedor }
 
+procedure TBizPedidoProveedor.AsignarVendedor;
+var
+  AVendedoresController: IVendedoresController;
+begin
+  AVendedoresController := TVendedoresController.Create;
+  try
+    ID_VENDEDOR := AVendedoresController.DarIDVendedorDeUsuario(AppFactuGES.UsuarioActivo.ID);
+  finally
+    AVendedoresController := nil;
+  end;
+end;
+
 procedure TBizPedidoProveedor.CalcularBaseImponible;
 begin
   if not Self.DataTable.Editing then
@@ -202,12 +217,14 @@ begin
   INCIDENCIAS_ACTIVAS := 0;
 //  ID_PEDIDO_CLIENTE := 0;
   REF_CON_CLIENTE := '';
-  ID_TIENDA := AppFactuGES.TiendaActiva.ID;
-  TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
 
   // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
   // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
   ID_ALMACEN := 1;
+
+  ID_TIENDA := AppFactuGES.TiendaActiva.ID;
+  TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
+  AsignarVendedor;
 end;
 
 procedure TBizPedidoProveedor.IVAOnChange(Sender: TDACustomField);
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 8616c18e..2f881345 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -91,22 +91,23 @@ object RptPedidosProveedor: TRptPedidosProveedor
               'SELECT'#10'  V_PEDIDOS_PROVEEDOR.ID,'#10'  V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
               'A,'#10'  V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10'  V_PEDIDOS_PROVEEDOR.FECHA' +
               '_PEDIDO,'#10'  V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10'  V_PEDIDOS_PROVEE' +
-              'DOR.FECHA_ENVIO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PROVEE' +
-              'DORES.NOMBRE,'#10'  V_PROVEEDORES.FAX,'#10#10'  V_CONTRATOS_CLIENTE.NOMBRE' +
-              ' AS NOMBRE_CLIENTE,'#10'  V_CONTRATOS_CLIENTE.CALLE,'#10'  V_CONTRATOS_C' +
-              'LIENTE.POBLACION,'#10'  V_CONTRATOS_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS' +
-              '_CLIENTE.CODIGO_POSTAL,'#10'  V_CONTRATOS_CLIENTE.PERSONA_CONTACTO,'#10 +
-              '  V_CONTRATOS_CLIENTE.TELEFONO,'#10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_E' +
-              'MPRESA,'#10'  EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SO' +
-              'CIAL AS RAZON_SOCIAL_EMPRESA,'#10'  EMPRESAS.TELEFONO_1 AS TELEFONO_' +
-              '1_EMPRESA,'#10'  EMPRESAS.FAX AS FAX_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS ' +
-              'MOVIL_1_EMPRESA,'#10'  EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRES' +
-              'AS.PAGINA_WEB AS PAGINA_WEB_EMPRESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10' ' +
-              ' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_' +
-              'PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT OUTER JOIN V_CONTRATOS_CLIENTE ON' +
-              ' (V_CONTRATOS_CLIENTE.ID = V_PEDIDOS_PROVEEDOR.ID_CONTRATO_CLIEN' +
-              'TE)'#10'  LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS_PROVE' +
-              'EDOR.ID_EMPRESA)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
+              'DOR.FECHA_ENVIO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PEDIDO' +
+              'S_PROVEEDOR.VENDEDOR,'#10'  V_PROVEEDORES.NOMBRE,'#10'  V_PROVEEDORES.FA' +
+              'X,'#10#10#10'  V_CONTRATOS_CLIENTE.NOMBRE AS NOMBRE_CLIENTE,'#10'  V_CONTRAT' +
+              'OS_CLIENTE.CALLE,'#10'  V_CONTRATOS_CLIENTE.POBLACION,'#10'  V_CONTRATOS' +
+              '_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS_CLIENTE.CODIGO_POSTAL,'#10'  V_CON' +
+              'TRATOS_CLIENTE.PERSONA_CONTACTO,'#10'  V_CONTRATOS_CLIENTE.TELEFONO,' +
+              #10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10'  EMPRESAS.NOMBRE AS NO' +
+              'MBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,'#10' ' +
+              ' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10'  EMPRESAS.FAX AS FA' +
+              'X_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10'  EMPRESAS.EMA' +
+              'IL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGINA_WEB AS PAGINA_WEB_EMP' +
+              'RESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN V_PROVEEDORES ' +
+              'ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT ' +
+              'OUTER JOIN V_CONTRATOS_CLIENTE ON (V_CONTRATOS_CLIENTE.ID = V_PE' +
+              'DIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LEFT OUTER JOIN EMPRESAS ' +
+              'ON (EMPRESAS.ID = V_PEDIDOS_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_PEDIDO' +
+              'S_PROVEEDOR.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -205,6 +206,11 @@ object RptPedidosProveedor: TRptPedidosProveedor
               item
                 DatasetField = 'FECHA_ENVIO'
                 TableField = 'FECHA_ENVIO'
+              end
+              item
+                DatasetField = 'VENDEDOR'
+                TableField = '<unknown>'
+                SQLOrigin = 'VENDEDOR'
               end>
           end>
         Name = 'Informe_Cabecera'
@@ -238,6 +244,11 @@ object RptPedidosProveedor: TRptPedidosProveedor
             Name = 'OBSERVACIONES'
             DataType = datMemo
           end
+          item
+            Name = 'VENDEDOR'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'NOMBRE'
             DataType = datString
@@ -480,7 +491,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 42258.790290613430000000
+    ReportOptions.LastChange = 42291.759212881950000000
     ScriptLanguage = 'PascalScript'
     ShowProgress = False
     StoreInDFM = False
diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm
index 4587032a..5e61d703 100644
--- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm	
@@ -175,6 +175,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               item
                 DatasetField = 'NOMBRE_CLIENTE'
                 TableField = 'NOMBRE_CLIENTE'
+              end
+              item
+                DatasetField = 'ID_VENDEDOR'
+                TableField = 'ID_VENDEDOR'
+              end
+              item
+                DatasetField = 'VENDEDOR'
+                TableField = 'VENDEDOR'
               end>
           end>
         Name = 'PedidosProveedor'
@@ -354,6 +362,15 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+          end
+          item
+            Name = 'VENDEDOR'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -845,6 +862,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datInteger
             Value = ''
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -863,16 +885,16 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               'LLE, '#10'     POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO' +
               ', '#10'     TELEFONO, ID_CONTRATO_CLIENTE, IMPORTE_NETO, IMPORTE_POR' +
               'TE,'#10'     DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '#10'   ' +
-              '  IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, DESCRIPCION_GENERAL)'#10'  ' +
-              'VALUES'#10'    (:ID, :ID_EMPRESA, CURRENT_TIMESTAMP, :ID_PROVEEDOR,'#10 +
-              '     :USUARIO, :OBSERVACIONES, :REFERENCIA, :FECHA_ENVIO,'#10'     :' +
-              'FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_ENTREGA, :INCIDENCIAS,' +
-              #10'     :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, :ID_ALMACEN, :CALLE,' +
-              #10'     :POBLACION, :PROVINCIA, :CODIGO_POSTAL, :PERSONA_CONTACTO,' +
-              #10'     :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPORTE_NETO, :IMPORTE_P' +
-              'ORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA' +
-              ','#10'     :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIENDA, :DESCRIPCION_GE' +
-              'NERAL)'#10'     '#10'     '#10'     '#10'     '#10#10
+              '  IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR, DESCRIPCIO' +
+              'N_GENERAL)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, CURRENT_TIMESTAMP, :I' +
+              'D_PROVEEDOR,'#10'     :USUARIO, :OBSERVACIONES, :REFERENCIA, :FECHA_' +
+              'ENVIO,'#10'     :FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_ENTREGA, ' +
+              ':INCIDENCIAS,'#10'     :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, :ID_ALM' +
+              'ACEN, :CALLE,'#10'     :POBLACION, :PROVINCIA, :CODIGO_POSTAL, :PERS' +
+              'ONA_CONTACTO,'#10'     :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPORTE_NET' +
+              'O, :IMPORTE_PORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IM' +
+              'PONIBLE, :IVA,'#10'     :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIENDA, :I' +
+              'D_VENDEDOR, :DESCRIPCION_GENERAL)'#10'     '#10'     '#10'     '#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1033,6 +1055,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datInteger
             Value = ''
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -1064,8 +1091,9 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               'ORTE, '#10'    DESCUENTO = :DESCUENTO, '#10'    IMPORTE_DESCUENTO = :IMP' +
               'ORTE_DESCUENTO, '#10'    BASE_IMPONIBLE = :BASE_IMPONIBLE, '#10'    IVA ' +
               '= :IVA, '#10'    IMPORTE_IVA = :IMPORTE_IVA, '#10'    ID_FORMA_PAGO = :I' +
-              'D_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    DESCRIPCION_GENERA' +
-              'L = :DESCRIPCION_GENERAL'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              'D_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    ID_VENDEDOR = :ID_' +
+              'VENDEDOR,'#10'    DESCRIPCION_GENERAL = :DESCRIPCION_GENERAL'#10'  WHERE' +
+              #10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index 8b5ea9a6..581e3fff 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -12,6 +12,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 922
     Caption = 'Nuevo pedido a proveedor'
+    ExplicitTop = 49
     ExplicitWidth = 922
     inherited Image1: TImage
       Left = 895
@@ -46,7 +47,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     Width = 922
     ExplicitWidth = 922
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 330
+      ExplicitWidth = 488
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -76,6 +77,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     Height = 491
     TabOrder = 1
     OnChanging = pgPaginasChanging
+    ExplicitTop = 109
     ExplicitWidth = 916
     ExplicitHeight = 491
     inherited pagGeneral: TTabSheet
@@ -105,50 +107,63 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
           ExplicitWidth = 908
           ExplicitHeight = 463
           inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-            Left = 413
-            ExplicitLeft = 413
+            Left = 551
+            Width = 357
+            ExplicitLeft = 551
+            ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 357
               inherited edtlNombre: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtCalle: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtPoblacion: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 176
+                Width = 176
               end
               inherited edtProvincia: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 392
+                Left = 237
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 392
+                ExplicitLeft = 237
               end
               inherited Button3: TBitBtn
-                Left = 265
-                ExplicitLeft = 265
+                Left = 110
+                ExplicitLeft = 110
               end
             end
           end
@@ -157,29 +172,41 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited edtFechaConfirmacion: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited edtFechaEntrega: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
-            Top = 306
-            ExplicitTop = 306
+            Width = 273
+            Height = 166
+            ExplicitWidth = 273
+            ExplicitHeight = 166
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 273
+              Height = 166
               inherited rdxDestino1: TRadioButton
                 Width = 253
                 ExplicitWidth = 253
@@ -197,10 +224,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
                 Width = 238
               end
               inherited bModificar: TBitBtn
-                Left = 206
-                Top = 109
-                ExplicitLeft = 206
-                ExplicitTop = 109
+                Left = 344
+                ExplicitLeft = 344
               end
               inherited txtDireccion: TStaticText
                 Width = 238
@@ -215,44 +240,56 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 20
+            Width = 20
           end
           inherited bFormasPago: TButton
-            Left = 251
-            ExplicitLeft = 251
+            Left = 389
+            ExplicitLeft = 389
           end
           inherited edtFechaEnvio: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited eReferenciaContratoCli: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 20
+            Width = 20
           end
           inherited Button1: TButton
-            Left = 251
-            ExplicitLeft = 251
+            Left = 389
+            ExplicitLeft = 389
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 413
-            ExplicitLeft = 413
+            Left = 551
+            Width = 357
+            ExplicitLeft = 551
+            ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 357
               inherited cbTienda: TcxComboBox
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 390
+                Width = 390
               end
             end
           end
           inherited frViewObservaciones1: TfrViewObservaciones
-            Left = 413
-            ExplicitLeft = 413
+            Width = 422
+            ExplicitWidth = 422
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
+              Width = 422
             end
           end
           inherited edtlDescripcion: TcxDBTextEdit
@@ -260,6 +297,20 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 283
+            Width = 283
+          end
+          inherited edtFechaEnvio2: TcxDBDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 257
+            Width = 257
+          end
+          inherited cbVendedor: TcxDBLookupComboBox
+            ExplicitWidth = 250
+            Width = 250
           end
         end
       end
@@ -312,57 +363,57 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitTop = 0
           end
           inherited UpDown1: TUpDown
-            Left = 555
+            Left = 571
             Top = 0
-            ExplicitLeft = 555
+            ExplicitLeft = 571
             ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 572
+            Left = 588
             Top = 0
-            ExplicitLeft = 572
+            ExplicitLeft = 588
             ExplicitTop = 0
           end
           inherited ToolButton6: TToolButton
-            Left = 580
+            Left = 596
             Top = 0
-            ExplicitLeft = 580
+            ExplicitLeft = 596
             ExplicitTop = 0
           end
           inherited ToolButton7: TToolButton
-            Left = 614
+            Left = 630
             Top = 0
-            ExplicitLeft = 614
+            ExplicitLeft = 630
             ExplicitTop = 0
           end
           inherited ToolButton8: TToolButton
-            Left = 648
+            Left = 664
             Top = 0
-            ExplicitLeft = 648
+            ExplicitLeft = 664
             ExplicitTop = 0
           end
           inherited ToolButton12: TToolButton
-            Left = 682
+            Left = 698
             Top = 0
-            ExplicitLeft = 682
+            ExplicitLeft = 698
             ExplicitTop = 0
           end
           inherited ToolButton9: TToolButton
-            Left = 690
+            Left = 706
             Top = 0
-            ExplicitLeft = 690
+            ExplicitLeft = 706
             ExplicitTop = 0
           end
           inherited ToolButton10: TToolButton
-            Left = 724
+            Left = 740
             Top = 0
-            ExplicitLeft = 724
+            ExplicitLeft = 740
             ExplicitTop = 0
           end
           inherited ToolButton11: TToolButton
-            Left = 758
+            Left = 774
             Top = 0
-            ExplicitLeft = 758
+            ExplicitLeft = 774
             ExplicitTop = 0
           end
         end
@@ -658,6 +709,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   end
   inherited PnlComentario: TPanel [5]
     Width = 922
+    ExplicitTop = 76
     ExplicitWidth = 922
     inherited lbComentario: TLabel
       Width = 912
@@ -665,14 +717,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     end
   end
   inherited EditorActionList: TActionList [9]
-    inherited actPrevisualizar: TAction
-      Enabled = False
-      Visible = False
-    end
-    inherited actImprimir: TAction
-      Enabled = False
-      Visible = False
-    end
     inherited actDuplicar: TAction
       Enabled = False
       Visible = False
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
index 5a70be3a..17c559fd 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm	
@@ -19,7 +19,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       934
       594)
     inline frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-      Left = 435
+      Left = 577
       Top = 28
       Width = 357
       Height = 215
@@ -29,9 +29,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 12
+      TabOrder = 14
       ReadOnly = False
-      ExplicitLeft = 435
+      ExplicitLeft = 577
       ExplicitTop = 28
       ExplicitWidth = 357
       ExplicitHeight = 215
@@ -82,18 +82,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 283
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 396
+          Left = 254
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 396
+          ExplicitLeft = 254
           ExplicitWidth = 71
           Width = 71
         end
         inherited Button3: TBitBtn
-          Left = 269
-          ExplicitLeft = 269
+          Left = 127
+          ExplicitLeft = 127
         end
       end
     end
@@ -125,7 +125,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     object edtFechaConfirmacion: TcxDBDateEdit
       Left = 158
-      Top = 276
+      Top = 399
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_CONFIRMACION'
       DataBinding.DataSource = DADataSource
@@ -146,12 +146,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 12
       Width = 158
     end
     object edtFechaEntrega: TcxDBDateEdit
       Left = 158
-      Top = 109
+      Top = 205
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENTREGA'
       DataBinding.DataSource = DADataSource
@@ -169,7 +169,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 3
+      TabOrder = 4
       Width = 158
     end
     object eReferencia: TcxDBTextEdit
@@ -200,7 +200,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
       Left = 22
-      Top = 354
+      Top = 456
       Width = 273
       Height = 166
       Font.Charset = DEFAULT_CHARSET
@@ -209,10 +209,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 13
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 354
+      ExplicitTop = 456
       ExplicitWidth = 273
       ExplicitHeight = 166
       inherited dxLayoutControl1: TdxLayoutControl
@@ -233,10 +233,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 425
         end
         inherited bModificar: TBitBtn
-          Left = 245
-          Top = 183
-          ExplicitLeft = 245
-          ExplicitTop = 183
+          Left = 370
+          Top = 109
+          ExplicitLeft = 370
+          ExplicitTop = 109
         end
       end
       inherited ActionList1: TActionList
@@ -250,7 +250,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 158
-      Top = 163
+      Top = 259
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Enabled = False
@@ -280,22 +280,22 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 5
+      TabOrder = 6
       Width = 20
     end
     object bFormasPago: TButton
-      Left = 273
-      Top = 163
+      Left = 415
+      Top = 259
       Width = 132
       Height = 21
       Caption = 'Ver las formas de pago...'
       Enabled = False
-      TabOrder = 6
+      TabOrder = 7
       OnClick = bFormasPagoClick
     end
     object edtFechaEnvio: TcxDBDateEdit
       Left = 158
-      Top = 249
+      Top = 372
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENVIO'
       DataBinding.DataSource = DADataSource
@@ -316,12 +316,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 11
       Width = 158
     end
     object eReferenciaContratoCli: TcxTextEdit
       Left = 158
-      Top = 190
+      Top = 286
       Anchors = [akLeft, akTop, akRight]
       Properties.ReadOnly = False
       Properties.ValidateOnEnter = True
@@ -342,19 +342,19 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 8
       Width = 20
     end
     object Button1: TButton
-      Left = 273
-      Top = 190
+      Left = 415
+      Top = 286
       Width = 132
       Height = 23
       Action = actVerContratoCli
-      TabOrder = 8
+      TabOrder = 9
     end
     inline frViewTienda1: TfrViewTienda
-      Left = 435
+      Left = 577
       Top = 279
       Width = 357
       Height = 46
@@ -366,9 +366,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 13
+      TabOrder = 15
       ReadOnly = False
-      ExplicitLeft = 435
+      ExplicitLeft = 577
       ExplicitTop = 279
       ExplicitWidth = 357
       ExplicitHeight = 46
@@ -384,28 +384,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       end
     end
     inline frViewObservaciones1: TfrViewObservaciones
-      Left = 435
-      Top = 361
-      Width = 521
-      Height = 150
+      Left = 158
+      Top = 109
+      Width = 422
+      Height = 90
+      Align = alClient
+      AutoSize = True
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 14
+      TabOrder = 3
       ReadOnly = False
-      ExplicitLeft = 435
-      ExplicitTop = 361
+      ExplicitLeft = 158
+      ExplicitTop = 109
+      ExplicitWidth = 422
+      ExplicitHeight = 90
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
         DataBinding.DataSource = DADataSource
+        ExplicitWidth = 422
+        ExplicitHeight = 90
+        Height = 90
+        Width = 422
       end
     end
     object edtlDescripcion: TcxDBTextEdit
       Left = 158
-      Top = 136
+      Top = 232
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
       DataBinding.DataField = 'DESCRIPCION_GENERAL'
@@ -425,7 +433,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 4
+      TabOrder = 5
       Height = 21
       Width = 283
     end
@@ -455,6 +463,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       TabOrder = 2
       Width = 257
     end
+    object cbVendedor: TcxDBLookupComboBox
+      Left = 158
+      Top = 315
+      DataBinding.DataField = 'ID_VENDEDOR'
+      DataBinding.DataSource = DADataSource
+      Properties.KeyFieldNames = 'ID'
+      Properties.ListColumns = <
+        item
+          FieldName = 'NOMBRE'
+        end>
+      Properties.ListOptions.GridLines = glNone
+      Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
+      Properties.ListSource = dsVendedor
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 10
+      Width = 250
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -485,6 +523,14 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             Control = edtFechaEnvio2
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item6: TdxLayoutItem
+            AutoAligns = []
+            AlignHorz = ahClient
+            Caption = 'Obervaciones:'
+            Control = frViewObservaciones1
+            ControlOptions.AutoColor = True
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Item5: TdxLayoutItem
             Caption = 'Fecha de recepci'#243'n:'
             Control = edtFechaEntrega
@@ -524,20 +570,30 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             object dxLayoutControl1Group10: TdxLayoutGroup
               ShowCaption = False
               Hidden = True
-              LayoutDirection = ldHorizontal
               ShowBorder = False
-              object dxLayoutControl1Item11: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahClient
-                Caption = 'Ref. contrato cliente:'
-                Control = eReferenciaContratoCli
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item12: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahRight
+              object dxLayoutControl1Group7: TdxLayoutGroup
                 ShowCaption = False
-                Control = Button1
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControl1Item11: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Ref. contrato cliente:'
+                  Control = eReferenciaContratoCli
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControl1Item12: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahRight
+                  ShowCaption = False
+                  Control = Button1
+                  ControlOptions.ShowBorder = False
+                end
+              end
+              object dxLayoutControl1Item16: TdxLayoutItem
+                Caption = 'Vendedor:'
+                Control = cbVendedor
                 ControlOptions.ShowBorder = False
               end
             end
@@ -604,21 +660,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             ControlOptions.ShowBorder = False
           end
         end
-        object dxLayoutControl1Group7: TdxLayoutGroup
-          AutoAligns = [aaHorizontal]
-          AlignVert = avClient
-          Caption = 'Observaciones'
-          object dxLayoutControl1Item6: TdxLayoutItem
-            AutoAligns = []
-            AlignHorz = ahClient
-            AlignVert = avClient
-            Caption = 'New Item'
-            ShowCaption = False
-            Control = frViewObservaciones1
-            ControlOptions.AutoColor = True
-            ControlOptions.ShowBorder = False
-          end
-        end
       end
     end
   end
@@ -639,4 +680,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       OnUpdate = actVerContratoCliUpdate
     end
   end
+  object dsVendedor: TDADataSource
+    Left = 88
+    Top = 312
+  end
 end
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas
index def99263..362e4fe4 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas	
@@ -13,7 +13,7 @@ uses
   uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit,
   uBizContratosCliente, uContratosClienteController,
   cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago,
-  uViewTienda, uPedidosProveedorController;
+  uViewTienda, uPedidosProveedorController, uBizContactos, uVendedoresController;
 
 type
   IViewPedidoProveedor = interface(IViewBase)
@@ -49,7 +49,6 @@ type
     eReferencia: TcxDBTextEdit;
     dxLayoutControl1Group5: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
-    dxLayoutControl1Group7: TdxLayoutGroup;
     dxLayoutControl1Group8: TdxLayoutGroup;
     dxLayoutControl1Group3: TdxLayoutGroup;
     dxLayoutControl1Item8: TdxLayoutItem;
@@ -79,6 +78,10 @@ type
     edtlDescripcion: TcxDBTextEdit;
     dxLayoutControl1Item15: TdxLayoutItem;
     edtFechaEnvio2: TcxDBDateEdit;
+    dxLayoutControl1Item16: TdxLayoutItem;
+    cbVendedor: TcxDBLookupComboBox;
+    dxLayoutControl1Group7: TdxLayoutGroup;
+    dsVendedor: TDADataSource;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure bFormasPagoClick(Sender: TObject);
@@ -91,7 +94,9 @@ type
     FController : IPedidosProveedorController;
     FViewProveedorPedido : TfrViewDatosYSeleccionProveedor;
     FFormasPago : IBizFormaPago;
+    FVendedor : IBizVendedor;
     FFormasPagoController : IFormasPagoController;
+    FVendedoresController : IVendedoresController;
     FContratoCliAsociado : IBizContratoCliente;
     FContratoCliController : IContratosClienteController;
 
@@ -140,7 +145,9 @@ procedure TfrViewPedidoProveedor.CustomViewCreate(Sender: TObject);
 begin
   inherited;
   FFormasPago := Nil;
+  FVendedor := Nil;
   FFormasPagoController := TFormasPagoController.Create;
+  FVendedoresController := TVendedoresController.Create;
   FViewProveedorPedido := frViewProveedorPedido;
   FViewProveedorPedido.MsgElegirProveedor := 'Elija el proveedor al que se le realizará el pedido.';
   eReferencia.Enabled := False;
@@ -154,6 +161,8 @@ begin
   FViewProveedorPedido := Nil;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
+  FVendedor := Nil;
+  FVendedoresController := NIL;
   inherited;
 end;
 
@@ -214,6 +223,10 @@ begin
     dsFormaPago.DataTable := FFormasPago.DataTable;
     dsFormaPago.DataTable.Active := True;
 
+    FVendedor := (FVendedoresController.BuscarTodos as IBizVendedor);
+    dsVendedor.DataTable := FVendedor.DataTable;
+    dsVendedor.DataTable.Active := True;
+
     FContratoCliAsociado := NIL;
     if (FPedido.ID_CONTRATO_CLIENTE > 0) then
     begin
@@ -232,6 +245,7 @@ begin
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
+    dsVendedor.DataTable := NIL;    
     FContratoCliAsociado := NIL;
   end;
 
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index aeb63df5..1184c394 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -135,10 +135,10 @@ uses
   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',
-  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_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};
+  uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
+  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
+  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index d546d70f..78a519b1 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,7 +28,7 @@
 		<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">6</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 09 de septiembre de 2015 11:08</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de octubre de 2015 13:21</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>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 9a59c399..bd6628ca 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,6,6,0
-PRODUCTVERSION 2,6,6,0
+FILEVERSION 2,6,7,0
+PRODUCTVERSION 2,6,7,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.6.0\0"
+              VALUE "FileVersion", "2.6.7.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.6.0\0"
-              VALUE "CompileDate", "jueves, 10 de septiembre de 2015 18:31\0"
+              VALUE "ProductVersion", "2.6.7.0\0"
+              VALUE "CompileDate", "miércoles, 14 de octubre de 2015 16:04\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 5976d21bc3520018274bdfb9a8c3f25914397a73..cd7b3e66bac91b1187571ed4a6f83716972a4ffa 100644
GIT binary patch
delta 93
zcmdn9jd9O5#tlZ1oa_v23``6R4D6GwBTq7#PiBp(29k|Y>YBL>nG7!(iWrg^@)>d%
sQW=UFbQlyE3>i#-WD1b402EJVC}Aj_d@)Lz-HgGC!GOVJ^5-Z|076q1WdHyG

delta 93
zcmdn9jd9O5#tlZ1oNNqi3``6R3~ZCFBTq7#O=gX%29k|Y>Y7;$r3|SIWk6iapu?cR
pV8~zqBvXKV1)xYOLjgkxLne^UoqRD$n%#oIiouw{aPsFUPXHen73Kf{