diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index ff68620..8c27dd2 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index d569e16..8b6fa17 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -2101,7 +2101,18 @@ ON (RECIBOS_CLIENTE.ID_FACTURA = FACTURAS_CLIENTE.ID)
 GROUP BY FACTURAS_CLIENTE.ID
 ;
 
-
+CREATE VIEW V_REC_CLI_PAGOS(
+    ID_REC,
+    ID_PAG)
+AS
+SELECT RECIBOS_CLIENTE.ID,
+CASE WHEN RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO IS NULL THEN PAGOS_CLIENTE.ID_RECIBO
+     ELSE PAGOS_COMPENSADOS.ID_RECIBO
+END
+FROM RECIBOS_CLIENTE
+LEFT JOIN PAGOS_CLIENTE ON (PAGOS_CLIENTE.ID_RECIBO = RECIBOS_CLIENTE.ID)
+LEFT JOIN PAGOS_CLIENTE PAGOS_COMPENSADOS ON (PAGOS_COMPENSADOS.ID_RECIBO = RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO)
+;
 
 /* View: V_REC_CLI_SITUACION */
 CREATE VIEW V_REC_CLI_SITUACION(
@@ -2109,16 +2120,16 @@ CREATE VIEW V_REC_CLI_SITUACION(
     SITUACION)
 AS
 SELECT RECIBOS_CLIENTE.ID,
-CASE WHEN (COUNT(PAGOS_CLIENTE.ID_RECIBO)=0) THEN 'PENDIENTE'
-     WHEN (MOD(COUNT(PAGOS_CLIENTE.ID_RECIBO), 2)=0) THEN 'DEVUELTO'
-     ELSE 'COBRADO'
-END
-FROM RECIBOS_CLIENTE
-LEFT JOIN PAGOS_CLIENTE
-ON (PAGOS_CLIENTE.ID_RECIBO = RECIBOS_CLIENTE.ID)
-GROUP BY RECIBOS_CLIENTE.ID
-;
 
+     CASE WHEN (COUNT(V_REC_CLI_PAGOS.ID_PAG)=0) THEN 'PENDIENTE'
+          WHEN (MOD(COUNT(V_REC_CLI_PAGOS.ID_PAG), 2)=0) THEN 'DEVUELTO'
+          ELSE 'COBRADO'
+     END
+
+FROM RECIBOS_CLIENTE
+LEFT JOIN V_REC_CLI_PAGOS
+ON (V_REC_CLI_PAGOS.ID_REC = RECIBOS_CLIENTE.ID)
+GROUP BY RECIBOS_CLIENTE.ID;
 
 
 /* View: V_REC_FAC_CLI_COBRADOS */
@@ -2172,7 +2183,18 @@ ON (RECIBOS_PROVEEDOR.ID_FACTURA = FACTURAS_PROVEEDOR.ID)
 GROUP BY FACTURAS_PROVEEDOR.ID
 ;
 
-
+CREATE VIEW V_REC_CLI_PAGOS(
+    ID_REC,
+    ID_PAG)
+AS
+SELECT RECIBOS_CLIENTE.ID,
+CASE WHEN RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO IS NULL THEN PAGOS_CLIENTE.ID_RECIBO
+     ELSE PAGOS_COMPENSADOS.ID_RECIBO
+END
+FROM RECIBOS_CLIENTE
+LEFT JOIN PAGOS_CLIENTE ON (PAGOS_CLIENTE.ID_RECIBO = RECIBOS_CLIENTE.ID)
+LEFT JOIN PAGOS_CLIENTE PAGOS_COMPENSADOS ON (PAGOS_COMPENSADOS.ID_RECIBO = RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO)
+;
 
 /* View: V_REC_PRO_SITUACION */
 CREATE VIEW V_REC_PRO_SITUACION(
@@ -2180,18 +2202,17 @@ CREATE VIEW V_REC_PRO_SITUACION(
     SITUACION)
 AS
 SELECT RECIBOS_PROVEEDOR.ID,
-CASE WHEN (COUNT(PAGOS_PROVEEDOR.ID_RECIBO)=0) THEN 'PENDIENTE'
-     WHEN (MOD(COUNT(PAGOS_PROVEEDOR.ID_RECIBO), 2)=0) THEN 'DEVUELTO'
+CASE WHEN (COUNT(V_REC_PRO_PAGOS.ID_PAG)=0) THEN 'PENDIENTE'
+     WHEN (MOD(COUNT(V_REC_PRO_PAGOS.ID_PAG), 2)=0) THEN 'DEVUELTO'
      ELSE 'PAGADO'
 END
 FROM RECIBOS_PROVEEDOR
-LEFT JOIN PAGOS_PROVEEDOR
-ON (PAGOS_PROVEEDOR.ID_RECIBO = RECIBOS_PROVEEDOR.ID)
+LEFT JOIN V_REC_PRO_PAGOS
+ON (V_REC_PRO_PAGOS.ID_REC = RECIBOS_PROVEEDOR.ID)
 GROUP BY RECIBOS_PROVEEDOR.ID
 ;
 
 
-
 /* View: V_REC_FAC_PRO_PAGADOS */
 CREATE VIEW V_REC_FAC_PRO_PAGADOS(
     ID_FACTURA,
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 7ff2682..61c7ea2 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 883ce40..a8947cc 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 4,1,4,0
-PRODUCTVERSION 4,1,4,0
+FILEVERSION 4,1,5,0
+PRODUCTVERSION 4,1,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "4.1.4.0\0"
+              VALUE "FileVersion", "4.1.5.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "4.1.4.0\0"
+              VALUE "ProductVersion", "4.1.5.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index b23af4e..25f2a90 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc b/Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc
index 7ecd743..2ac2f98 100644
--- a/Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc	
+++ b/Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.res */
-/* c:\temp\dtf7E.tmp */
+/* c:\temp\dtf80.tmp */
diff --git a/Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc b/Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc
index dc70d7b..e731f69 100644
--- a/Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc	
+++ b/Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.res */
-/* c:\temp\dtf7C.tmp */
+/* c:\temp\dtf7E.tmp */
diff --git a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc
index 219659c..9955bc1 100644
--- a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc	
+++ b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc	
@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uViewInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uEditorInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.res */
-/* c:\temp\dtf82.tmp */
+/* c:\temp\dtf84.tmp */
diff --git a/Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc b/Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc
index f03cbd6..ab223ee 100644
--- a/Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc	
+++ b/Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.res */
-/* c:\temp\dtf74.tmp */
+/* c:\temp\dtf76.tmp */
diff --git a/Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc b/Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc
index 6ac90b7..bb49570 100644
--- a/Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc	
+++ b/Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.res */
-/* c:\temp\dtf72.tmp */
+/* c:\temp\dtf74.tmp */
diff --git a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc
index 9e2f7fd..b010782 100644
--- a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc	
+++ b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc	
@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uViewInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uEditorInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.res */
-/* c:\temp\dtf78.tmp */
+/* c:\temp\dtf7A.tmp */
diff --git a/Source/Modulos/Informes base/Controller/InformesBase_controller.drc b/Source/Modulos/Informes base/Controller/InformesBase_controller.drc
index 189e537..2c4937b 100644
--- a/Source/Modulos/Informes base/Controller/InformesBase_controller.drc	
+++ b/Source/Modulos/Informes base/Controller/InformesBase_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.res */
-/* c:\temp\dtf68.tmp */
+/* c:\temp\dtf6A.tmp */
diff --git a/Source/Modulos/Informes base/Data/Informes_data.drc b/Source/Modulos/Informes base/Data/Informes_data.drc
index fb93909..65788ba 100644
--- a/Source/Modulos/Informes base/Data/Informes_data.drc	
+++ b/Source/Modulos/Informes base/Data/Informes_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.res */
-/* c:\temp\dtf64.tmp */
+/* c:\temp\dtf66.tmp */
diff --git a/Source/Modulos/Informes base/Model/Informes_model.drc b/Source/Modulos/Informes base/Model/Informes_model.drc
index f1cce38..23b04b4 100644
--- a/Source/Modulos/Informes base/Model/Informes_model.drc	
+++ b/Source/Modulos/Informes base/Model/Informes_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.res */
-/* c:\temp\dtf62.tmp */
+/* c:\temp\dtf64.tmp */
diff --git a/Source/Modulos/Informes base/Views/Informes_view.drc b/Source/Modulos/Informes base/Views/Informes_view.drc
index d17601b..a500ff4 100644
--- a/Source/Modulos/Informes base/Views/Informes_view.drc	
+++ b/Source/Modulos/Informes base/Views/Informes_view.drc	
@@ -15,4 +15,4 @@ END
 /* C:\Codigo\Source\Modulos\Informes base\Views\uViewInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\uEditorInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.res */
-/* c:\temp\dtf6C.tmp */
+/* c:\temp\dtf6E.tmp */
diff --git a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
index 02ac305..04f4703 100644
--- a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
+++ b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
@@ -3,7 +3,7 @@ unit schInventarioClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -241,7 +241,7 @@ type
   end;
 
   { TInventarioDataTableRules }
-  TInventarioDataTableRules = class(TDADataTableRules, IInventario)
+  TInventarioDataTableRules = class(TIntfObjectDADataTableRules, IInventario)
   private
   protected
     { Property getters and setters }
@@ -486,7 +486,7 @@ type
   end;
 
   { TDetalleReservasDataTableRules }
-  TDetalleReservasDataTableRules = class(TDADataTableRules, IDetalleReservas)
+  TDetalleReservasDataTableRules = class(TIntfObjectDADataTableRules, IDetalleReservas)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
index 8ec6da0..3a6e935 100644
--- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc	
+++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
-/* c:\temp\dtfB6.tmp */
+/* c:\temp\dtfB8.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
index 3b3cf0c..4b5ccb9 100644
--- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc	
+++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
-/* c:\temp\dtfB4.tmp */
+/* c:\temp\dtfB6.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
index 6d87eea..91f918b 100644
--- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc	
+++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
-/* c:\temp\dtfB2.tmp */
+/* c:\temp\dtfB4.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
index f9f021d..d0bbb3b 100644
--- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc	
+++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
-/* c:\temp\dtf11A.tmp */
+/* c:\temp\dtf11C.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
index 34e2a57..7ba475a 100644
--- a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc	
+++ b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc	
@@ -26,4 +26,4 @@ END
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
-/* c:\temp\dtf118.tmp */
+/* c:\temp\dtf11A.tmp */
diff --git a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc
index 7a635ee..0c93191 100644
--- a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc	
+++ b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
 /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
-/* c:\temp\dtfCC.tmp */
+/* c:\temp\dtfCE.tmp */
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 44e86bd..ab482d7 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 3c8508b..4afe976 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
-    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</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">4.1.4.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">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 01 de marzo de 2011 18:10</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvUsuarios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-      <Form>RptAlbaranesCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-      <Form>RptWordAlbaranCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-      <Form>srvAlbaranesCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
-      <Form>RptAlbaranesProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
-      <Form>RptWordAlbaranProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <Form>srvArticulos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-      <Form>RptComisiones</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-      <Form>srvComisiones</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizAgentesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-      <Form>RptFichasEmpleado</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-      <Form>srvFabricantes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <Form>RptFacturasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-      <Form>RptWordFacturaCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-      <Form>srvFacturasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <Form>RptFacturasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-      <Form>srvFamilias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-      <Form>srvFormasPago</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-      <Form>srvGestorDocumentos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-      <Form>srvGestorInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Impresiones\Servidor\srvImpresiones_Impl.pas">
-      <Form>srvImpresiones</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas">
-      <Form>srvInfMargenArticulo</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas">
-      <Form>srvInfVentasArticulo</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Informes base\Model\schInformesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Informes base\Model\schInformesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Informes base\Servidor\srvInformes_Impl.pas">
-      <Form>srvInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
-    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-      <Form>srvObras</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-      <Form>RptPedidosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-      <Form>RptWordPedidoProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-      <Form>srvPedidosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
-      <Form>RptPedidosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
-      <Form>srvPedidosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-      <Form>RptWordCertificadoTrabajo</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-      <Form>RptWordPresupuestoCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-      <Form>srvPresupuestosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>RptRecibosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-      <Form>srvRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas">
-      <Form>srvRegistroCorreos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
-      <Form>RptRemesasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas">
-      <Form>RptRemesasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscAddressBookServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscCustomerServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscManufacturerServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscOrderServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscProductServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizTiendaWebServer.pas" />
-    <DCCReference Include="..\Modulos\Tienda web\Servidor\srvTiendaWeb_Impl.pas">
-      <Form>srvTiendaWeb</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-      <Form>srvTiposIVA</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionOSC.pas">
-      <Form>frConexionOSC</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\AHWord97.pas" />
-    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-    <DCCReference Include="Utiles\uTiendaWebUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>FactuGES_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_Define>DEBUG;</DCC_Define>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.ProjectType/>
+		<BorlandProject>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">5</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">4.1.5.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">4.1.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 08 de marzo de 2011 18:50</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones_Impl</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+			<Form>srvUsuarios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+			<Form>RptAlbaranesCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+			<Form>RptWordAlbaranCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+			<Form>srvAlbaranesCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
+			<Form>RptAlbaranesProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
+			<Form>RptWordAlbaranProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+			<Form>srvArticulos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+			<Form>RptComisiones</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+			<Form>srvComisiones</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizAgentesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+			<Form>RptFichasEmpleado</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+			<Form>srvFabricantes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<Form>RptFacturasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+			<Form>RptWordFacturaCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+			<Form>srvFacturasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<Form>RptFacturasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+			<Form>srvFamilias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+			<Form>srvFormasPago</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<Form>srvGestorDocumentos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+			<Form>srvGestorInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Impresiones\Servidor\srvImpresiones_Impl.pas">
+			<Form>srvImpresiones</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas">
+			<Form>srvInfMargenArticulo</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas">
+			<Form>srvInfVentasArticulo</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Informes base\Model\schInformesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Informes base\Model\schInformesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Informes base\Servidor\srvInformes_Impl.pas">
+			<Form>srvInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+			<Form>srvObras</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+			<Form>RptPedidosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+			<Form>RptWordPedidoProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+			<Form>srvPedidosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
+			<Form>RptPedidosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
+			<Form>srvPedidosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+			<Form>RptWordCertificadoTrabajo</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+			<Form>RptWordPresupuestoCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+			<Form>srvPresupuestosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<Form>RptRecibosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+			<Form>srvRecibosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<Form>RptRecibosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas">
+			<Form>srvRegistroCorreos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
+			<Form>RptRemesasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas">
+			<Form>RptRemesasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscAddressBookServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscCustomerServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscManufacturerServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscOrderServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscProductServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizTiendaWebServer.pas"/>
+		<DCCReference Include="..\Modulos\Tienda web\Servidor\srvTiendaWeb_Impl.pas">
+			<Form>srvTiendaWeb</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+			<Form>srvTiposIVA</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionOSC.pas">
+			<Form>frConexionOSC</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\AHWord97.pas"/>
+		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+		<DCCReference Include="Utiles\uTiendaWebUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index db36513..3c7bd4e 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 4,1,4,0
-PRODUCTVERSION 4,1,4,0
+FILEVERSION 4,1,5,0
+PRODUCTVERSION 4,1,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "4.1.4.0\0"
-              VALUE "ProductVersion", "4.1.4.0\0"
-              VALUE "CompileDate", "martes, 08 de marzo de 2011 18:50\0"
+              VALUE "FileVersion", "4.1.5.0\0"
+              VALUE "ProductVersion", "4.1.5.0\0"
+              VALUE "CompileDate", "jueves, 31 de marzo de 2011 19:23\0"
          END
     END
     BLOCK "VarFileInfo"