From e6c68aeffaeb7b4b1b4505b5592cac9ff0e7458f Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Thu, 12 Jun 2008 17:24:02 +0000
Subject: [PATCH] Se incluye en las cuentas de la empresa los campos IBAN y
 SWIFT, para que en la lista de cuentas a elegir nos salgan con y sin IBAN
 para que el usuario elija el que quiere poner en la factura, se incluye la
 firma en los presupuesos exportados a word

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@455 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/ApplicationBase/ApplicationBase.res    | Bin 4748 -> 384 bytes
 .../Controller/uEmpresasController.pas        |  40 +-
 .../Empresas/Model/schEmpresasClient_Intf.pas |   6 +-
 Source/Informes/Presupuesto.rdx               | Bin 181248 -> 193024 bytes
 .../FacturasCliente_Group.groupproj           |  46 +-
 .../Views/uViewFacturaCliente.dfm             |   2 +-
 .../Views/uViewFacturaCliente.pas             |   6 +
 .../Views/uEditorRemesaCliente.dfm            | 152 ++---
 .../Views/uEditorRemesaProveedor.dfm          | 159 ++---
 Source/Servidor/FactuGES_Server.RES           | Bin 23208 -> 23200 bytes
 Source/Servidor/FactuGES_Server.dproj         | 552 +++++++++---------
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 12 files changed, 447 insertions(+), 518 deletions(-)

diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;pCc

literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
index ca41267f..327e4e33 100644
--- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
+++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
@@ -23,6 +23,7 @@ type
     function Existe(const ID: Integer) : Boolean;
     function ToStringList(AEmpresa : IBizEmpresa) : TStringList;
     function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
+    function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList;
   end;
 
   TEmpresasController = class(TControllerBase, IEmpresasController)
@@ -34,8 +35,8 @@ type
     destructor Destroy; override;
 
     function Eliminar(const ID : Integer): Boolean; overload;
-    function Eliminar(AEmpresa : IBizEmpresa): Boolean; overload; 
-    function Guardar(AEmpresa : IBizEmpresa): Boolean; 
+    function Eliminar(AEmpresa : IBizEmpresa): Boolean; overload;
+    function Guardar(AEmpresa : IBizEmpresa): Boolean;
     procedure DescartarCambios(AEmpresa : IBizEmpresa); virtual;
     function Existe(const ID: Integer) : Boolean; virtual;
     procedure Anadir(AEmpresa : IBizEmpresa); virtual;
@@ -47,6 +48,7 @@ type
     procedure VerTodos(AEmpresas: IBizEmpresa); virtual;
     function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual;
     function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
+    function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList;
   end;
 
 implementation
@@ -90,7 +92,7 @@ begin
   ADatosBancarios.DataTable.Active := True;
 
   Result := TStringList.Create;
-  ShowHourglassCursor;  
+  ShowHourglassCursor;
   try
     with Result do
     begin
@@ -105,7 +107,37 @@ begin
     end;
   finally
     ADatosBancarios := NIL;
-    HideHourglassCursor;    
+    HideHourglassCursor;
+  end;
+end;
+
+function TEmpresasController.DarListaCuentasBancariasIBAN(AEmpresa: IBizEmpresa): TStringList;
+var
+  ADatosBancarios: IBizEmpresasDatosBancarios;
+  Aux : String;
+begin
+  if not Assigned(AEmpresa) then
+    raise Exception.Create ('Empresa no asignada (DarListaCuentasBancariasIBAN)');
+
+  ADatosBancarios := AEmpresa.DatosBancarios;
+  ADatosBancarios.DataTable.Active := True;
+
+  Result := TStringList.Create;
+  ShowHourglassCursor;
+  try
+    with Result do
+    begin
+      ADatosBancarios.DataTable.First;
+      while not ADatosBancarios.DataTable.EOF do
+      begin
+        Aux := Format('%s - %s', [ADatosBancarios.IBAN, ADatosBancarios.SWIFT]);
+        Add(Format('%s=%d', [Aux, ADatosBancarios.ID]));
+        ADatosBancarios.DataTable.Next;
+      end;
+    end;
+  finally
+    ADatosBancarios := NIL;
+    HideHourglassCursor;
   end;
 end;
 
diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
index 32290ac8..ef67b9b9 100644
--- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
+++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
@@ -3,7 +3,7 @@ unit schEmpresasClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -239,7 +239,7 @@ type
   end;
 
   { TEmpresasDataTableRules }
-  TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas)
+  TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas)
   private
     f_NOTAS: IROStrings;
     f_LOGOTIPO: IROStream;
@@ -468,7 +468,7 @@ type
   end;
 
   { TEmpresasDatosBancoDataTableRules }
-  TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco)
+  TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Informes/Presupuesto.rdx b/Source/Informes/Presupuesto.rdx
index c0541080785f7cc6e6d306c6a62efa731a7bf448..70d2bc572f229e9e737928b21972c3cacd27ee47 100644
GIT binary patch
delta 19852
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
bc!*`jU$=(Vl@~sM;}@)<g9|PxO{M-HYfAfQ

delta 9302
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
J1VvmF{|AQ!sx|-s

diff --git a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj
index 380a3278..ca82446e 100644
--- a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj	
+++ b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj	
@@ -11,8 +11,12 @@
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
     <Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
+    <Projects Include="..\Articulos\Data\Articulos_data.dproj" />
+    <Projects Include="..\Articulos\Model\Articulos_model.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
+    <Projects Include="..\Contactos\Data\Contactos_data.dproj" />
+    <Projects Include="..\Contactos\Model\Contactos_model.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
     <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
     <Projects Include="Controller\FacturasCliente_controller.dproj" />
@@ -54,6 +58,24 @@
   <Target Name="ApplicationBase:Make">
     <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
   </Target>
+  <Target Name="Contactos_model">
+    <MSBuild Projects="..\Contactos\Model\Contactos_model.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_model:Clean">
+    <MSBuild Projects="..\Contactos\Model\Contactos_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_model:Make">
+    <MSBuild Projects="..\Contactos\Model\Contactos_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_data">
+    <MSBuild Projects="..\Contactos\Data\Contactos_data.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_data:Clean">
+    <MSBuild Projects="..\Contactos\Data\Contactos_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_data:Make">
+    <MSBuild Projects="..\Contactos\Data\Contactos_data.dproj" Targets="Make" />
+  </Target>
   <Target Name="Contactos_controller">
     <MSBuild Projects="..\Contactos\Controller\Contactos_controller.dproj" Targets="" />
   </Target>
@@ -72,6 +94,24 @@
   <Target Name="Contactos_view:Make">
     <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="Articulos_model">
+    <MSBuild Projects="..\Articulos\Model\Articulos_model.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_model:Clean">
+    <MSBuild Projects="..\Articulos\Model\Articulos_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_model:Make">
+    <MSBuild Projects="..\Articulos\Model\Articulos_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_data">
+    <MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_data:Clean">
+    <MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_data:Make">
+    <MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="Make" />
+  </Target>
   <Target Name="Articulos_controller">
     <MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="" />
   </Target>
@@ -172,13 +212,13 @@
     <MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;AlbCli_FacCli_relation;AlbaranesCliente_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;AlbCli_FacCli_relation;AlbaranesCliente_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view: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/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index f770f63a..bf6a288e 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
@@ -100,7 +100,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 112
         Height = 215
-        ExplicitWidth = 270
+        ExplicitWidth = 112
         ExplicitHeight = 215
         inherited edtlNombre: TcxDBTextEdit
           DataBinding.DataSource = DADataSource
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
index 52e52dc6..8b3f56bb 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
@@ -107,11 +107,13 @@ procedure TfrViewFacturaCliente.RellenarCuentasBancarias;
 var
   AController : IEmpresasController;
   ALista : TStringList;
+  AListaIBAN : TStringList;
   i : integer;
 begin
   AController := TEmpresasController.Create;
   try
     ALista := AController.DarListaCuentasBancarias(AppFactuGES.EmpresaActiva);
+    AListaIBAN := AController.DarListaCuentasBancariasIBAN(AppFactuGES.EmpresaActiva);
     try
       with cbCuentaBancaria.Properties.Items do
       begin
@@ -120,13 +122,17 @@ begin
           Clear;
           Add('');
           for i := 0 to ALista.Count - 1 do
+          begin
             Add(ALista.Names[i]);
+            Add(AListaIBAN.Names[i]);
+          end;
         finally
           EndUpdate;
         end;
       end;
     finally
       FreeANDNIL(ALista);
+      FreeANDNIL(AListaIBAN);      
     end;
   finally
     AController := NIL;
diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm
index 2370aff1..3a97b9b5 100644
--- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm	
+++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm	
@@ -8,7 +8,6 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
   ClientWidth = 676
   Scaled = False
   OnClose = CustomEditorClose
-  ExplicitLeft = -49
   ExplicitWidth = 684
   ExplicitHeight = 617
   PixelsPerInch = 96
@@ -143,46 +142,26 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
             662
             160)
           inherited eReferencia: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 326
-            Width = 326
+            ExplicitWidth = 292
+            Width = 292
           end
           inherited eDescripcion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 540
-            Width = 540
+            ExplicitWidth = 530
+            Width = 530
           end
           inherited edtFechaRemesa: TcxDBDateEdit
             Left = 491
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 491
-            ExplicitWidth = 170
-            Width = 170
+            ExplicitWidth = 149
+            Width = 149
           end
           inherited cbCuentaBancaria: TcxDBLookupComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 39
-            Width = 39
+            ExplicitWidth = 530
+            Width = 530
           end
           inherited cbTipo: TcxDBImageComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 530
+            Width = 530
           end
         end
         inherited dsDataTable: TDADataSource
@@ -218,14 +197,19 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
           Width = 632
           Height = 223
           ExplicitLeft = 15
-          ExplicitWidth = 638
-          ExplicitHeight = 208
+          ExplicitWidth = 632
+          ExplicitHeight = 223
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.FooterSummaryItems = <
               item
                 Format = ',0.00 '#8364';-,0.00 '#8364
                 Kind = skSum
                 Column = frViewRecibosRemesaCliente1.cxGridViewIMPORTE_TOTAL
+              end
+              item
+                Format = '0 Recibos'
+                Kind = skCount
+                Column = frViewRecibosRemesaCliente1.cxGridViewREFERENCIA
               end>
             DataController.Summary.OnAfterSummary = frViewRecibosRemesaCliente1cxGridViewDataControllerSummaryAfterSummary
             inherited cxGridViewIMPORTE_TOTAL: TcxGridDBColumn
@@ -237,19 +221,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
           Left = 15
           Width = 632
           ExplicitLeft = 15
-          ExplicitWidth = 638
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
+          ExplicitWidth = 632
         end
       end
     end
@@ -261,7 +233,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
       item
         Width = 200
       end>
-    ExplicitTop = 519
+    ExplicitTop = 564
     ExplicitWidth = 676
   end
   inline frViewTotales1: TfrViewTotales [4]
@@ -278,7 +250,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 473
+    ExplicitTop = 518
     ExplicitWidth = 676
     ExplicitHeight = 46
     inherited dxLayoutControl1: TdxLayoutControl
@@ -312,52 +284,36 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
         Left = 163
         Top = 111
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 163
         ExplicitTop = 111
-        ExplicitWidth = 93
-        Width = 93
+        ExplicitWidth = 157
+        Width = 157
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
         Left = 519
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 519
         ExplicitTop = 37
-        ExplicitWidth = 137
-        Width = 137
+        ExplicitWidth = 147
+        Width = 147
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 449
         Top = 111
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 449
         ExplicitTop = 111
-        ExplicitWidth = 137
-        Width = 137
+        ExplicitWidth = 217
+        Width = 217
       end
       inherited edtDescuento: TcxDBSpinEdit
         Left = 92
         Top = 111
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 111
       end
@@ -365,11 +321,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
         Left = 448
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 448
         ExplicitTop = 37
       end
@@ -377,25 +329,17 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
         Left = 448
         Top = 10
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 448
         ExplicitTop = 10
-        ExplicitWidth = 92
-        Width = 92
+        ExplicitWidth = 218
+        Width = 218
       end
       inherited edtRE: TcxDBSpinEdit
         Left = 448
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 448
         ExplicitTop = 64
       end
@@ -403,56 +347,40 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
         Left = 519
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 519
         ExplicitTop = 64
-        ExplicitWidth = 56
-        Width = 56
+        ExplicitWidth = 147
+        Width = 147
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 92
         Top = 10
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 10
-        ExplicitWidth = 147
-        Width = 147
+        ExplicitWidth = 228
+        Width = 228
       end
       inherited ePorte: TcxDBCurrencyEdit
         Left = 92
         Top = 138
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 138
-        ExplicitWidth = 147
-        Width = 147
+        ExplicitWidth = 228
+        Width = 228
       end
       inherited eIVA: TcxDBLookupComboBox
         Left = 92
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 37
-        ExplicitWidth = 81
-        Width = 81
+        ExplicitWidth = 90
+        Width = 90
       end
       inherited bTiposIVA: TButton
         Left = 188
@@ -464,14 +392,10 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente
         Left = 92
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 64
-        ExplicitWidth = 219
-        Width = 219
+        ExplicitWidth = 228
+        Width = 228
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm
index fbdb33cd..086f47e2 100644
--- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm	
+++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm	
@@ -15,7 +15,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 690
     Caption = 'Remesa de pago'
-    ExplicitWidth = 676
+    ExplicitWidth = 690
     inherited Image1: TImage
       Left = 663
       Picture.Data = {
@@ -47,7 +47,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
   end
   inherited TBXDock: TTBXDock
     Width = 690
-    ExplicitWidth = 676
+    ExplicitWidth = 690
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 488
       inherited TBXItem2: TTBXItem
@@ -136,33 +136,26 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         inherited cxGrid: TcxGrid
           Width = 676
           Height = 249
-          ExplicitWidth = 668
-          ExplicitHeight = 199
+          ExplicitWidth = 676
+          ExplicitHeight = 249
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.FooterSummaryItems = <
               item
                 Format = ',0.00 '#8364';-,0.00 '#8364
                 Kind = skSum
                 Column = frViewRecibosRemesaProveedor1.cxGridViewIMPORTE_TOTAL
+              end
+              item
+                Format = '0 Recibos'
+                Kind = skCount
+                Column = frViewRecibosRemesaProveedor1.cxGridViewREFERENCIA
               end>
             DataController.Summary.OnAfterSummary = frViewRecibosRemesaProveedor1cxGridViewDataControllerSummaryAfterSummary
           end
         end
         inherited ToolBar1: TToolBar
           Width = 676
-          ExplicitWidth = 668
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
+          ExplicitWidth = 676
         end
       end
       inline frViewRemesaProveedor1: TfrViewRemesaProveedor
@@ -187,44 +180,26 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
           ExplicitWidth = 676
           ExplicitHeight = 155
           inherited eReferencia: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 164
-            Width = 164
+            ExplicitWidth = 224
+            Width = 224
           end
           inherited eDescripcion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 108
-            Width = 108
+            ExplicitWidth = 544
+            Width = 544
           end
           inherited edtFechaRemesa: TcxDBDateEdit
             Left = 423
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 423
-            ExplicitWidth = 170
-            Width = 170
+            ExplicitWidth = 231
+            Width = 231
           end
           inherited cbCuentaBancaria: TcxDBLookupComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 39
-            Width = 39
+            ExplicitWidth = 544
+            Width = 544
           end
           inherited cbTipo: TcxDBImageComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 544
+            Width = 544
           end
         end
       end
@@ -237,8 +212,8 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
       item
         Width = 200
       end>
-    ExplicitTop = 519
-    ExplicitWidth = 676
+    ExplicitTop = 585
+    ExplicitWidth = 690
   end
   inline frViewTotales1: TfrViewTotales [4]
     Left = 0
@@ -254,12 +229,12 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 473
-    ExplicitWidth = 676
+    ExplicitTop = 539
+    ExplicitWidth = 690
     ExplicitHeight = 46
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 690
-      ExplicitWidth = 676
+      ExplicitWidth = 690
       inherited Bevel1: TBevel
         Left = 92
         Top = 91
@@ -288,52 +263,36 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         Left = 163
         Top = 111
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 163
         ExplicitTop = 111
-        ExplicitWidth = 93
-        Width = 93
+        ExplicitWidth = 164
+        Width = 164
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
         Left = 526
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 526
         ExplicitTop = 37
-        ExplicitWidth = 137
-        Width = 137
+        ExplicitWidth = 154
+        Width = 154
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 456
         Top = 111
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 456
         ExplicitTop = 111
-        ExplicitWidth = 137
-        Width = 137
+        ExplicitWidth = 224
+        Width = 224
       end
       inherited edtDescuento: TcxDBSpinEdit
         Left = 92
         Top = 111
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 111
       end
@@ -341,11 +300,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         Left = 455
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 455
         ExplicitTop = 37
       end
@@ -353,25 +308,17 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         Left = 455
         Top = 10
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 455
         ExplicitTop = 10
-        ExplicitWidth = 92
-        Width = 92
+        ExplicitWidth = 225
+        Width = 225
       end
       inherited edtRE: TcxDBSpinEdit
         Left = 455
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 455
         ExplicitTop = 64
       end
@@ -379,56 +326,40 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         Left = 526
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 526
         ExplicitTop = 64
-        ExplicitWidth = 56
-        Width = 56
+        ExplicitWidth = 154
+        Width = 154
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 92
         Top = 10
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 10
-        ExplicitWidth = 147
-        Width = 147
+        ExplicitWidth = 235
+        Width = 235
       end
       inherited ePorte: TcxDBCurrencyEdit
         Left = 92
         Top = 138
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 138
-        ExplicitWidth = 147
-        Width = 147
+        ExplicitWidth = 235
+        Width = 235
       end
       inherited eIVA: TcxDBLookupComboBox
         Left = 92
         Top = 37
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 37
-        ExplicitWidth = 81
-        Width = 81
+        ExplicitWidth = 97
+        Width = 97
       end
       inherited bTiposIVA: TButton
         Left = 195
@@ -440,14 +371,10 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         Left = 92
         Top = 64
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 92
         ExplicitTop = 64
-        ExplicitWidth = 219
-        Width = 219
+        ExplicitWidth = 235
+        Width = 235
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 677710a4d545560c2e276b4b07f8b1645d56e65f..c19b48b8e75db5cda957dc1107ef0cbd73ec636a 100644
GIT binary patch
delta 77
zcmZ3nm2tsV#tnBO7?(`G8zB!Q|3*YJvP_PQRAziIxi+$zIfX%K^6yAl;VgzyhE#?!
eATDOmVNhT&WH6d+7^Ti`$zTO!n@&!Qat8oX{TJE*

delta 85
zcmZ3mm2t&Z#tnBO7}rd`8zB!Q|3*YJa!rnmRAziOxi+$zIg3Gc^6yAl$y|m^hL;RQ
n49N`n3^@#`48;sO3<?Z}42F}nqtrPq7_5M7QwD~~kx}jdGq@S7

diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index c04561bf..b67b4065 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,280 +1,280 @@
-<?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_D11;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>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>$(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">1</VersionInfo><VersionInfo Name="MinorVer">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.7.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.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 05 de junio de 2008 20:23</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-      <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\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\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\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvUnidadesMedida_Impl.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\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" />
-    <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\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\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\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\AHWord97.pas" />
-    <DCCReference Include="Utiles\RegExpr.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>FactuGES_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<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_D11;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>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_IncludePath>$(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">1</VersionInfo><VersionInfo Name="MinorVer">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.7.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.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 05 de junio de 2008 20:23</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+			<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\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\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\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvUnidadesMedida_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\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"/>
+		<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\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\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\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\AHWord97.pas"/>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index a32eab56..4aeebc53 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.7.0\0"
               VALUE "ProductVersion", "1.0.7.0\0"
-              VALUE "CompileDate", "miércoles, 11 de junio de 2008 18:15\0"
+              VALUE "CompileDate", "jueves, 12 de junio de 2008 19:15\0"
          END
     END
     BLOCK "VarFileInfo"