Se añade el incorporar una imagen en los articulos

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@551 f4e31baf-9722-1c47-927c-6f952f962d4b
2012-04-13 11:33:18 +00:00 · 2012-04-13 11:33:18 +00:00 · 2b38fa1aa6
commit 2b38fa1aa6
parent e550ffed61
59 changed files with 1351 additions and 610 deletions
--- a/Build/Build.fbpInf
+++ b/Build/Build.fbpInf
@ -14,8 +14,8 @@
    <Notes>
      <![CDATA[]]>
    </Notes>
-    <LastBuildRun>00:00:00</LastBuildRun>
+    <LastBuildRun>00:03:10</LastBuildRun>
-    <LastBuildStart>30/12/1899</LastBuildStart>
+    <LastBuildStart>11/04/2012 12:05:34</LastBuildStart>
    <LastBuildState>True</LastBuildState>
  </properties>
 </project>
--- a/Build/Build.fbz6
+++ b/Build/Build.fbz6
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@ -570,6 +570,7 @@ CREATE TABLE ARTICULOS (
    DESCUENTO           TIPO_PORCENTAJE,
    PRECIO_NETO         TIPO_IMPORTE,
    PRECIO_PORTE        TIPO_IMPORTE,
    PRECIO_PVP          TIPO_IMPORTE,
    FECHA_ALTA          TIMESTAMP,
    FECHA_MODIFICACION  TIMESTAMP,
    USUARIO             TIPO_USUARIO,
@ -1824,6 +1825,7 @@ CREATE VIEW V_ARTICULOS(
    PRECIO_PORTE,
    DESCUENTO,
    PRECIO_NETO,
    PRECIO_PVP,
    INVENTARIABLE,
    ID_PROVEEDOR,
    NOMBRE_PROVEEDOR,
@ -1837,6 +1839,7 @@ SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCR
       ARTICULOS.PRECIO_PORTE,
       ARTICULOS.DESCUENTO,
       ARTICULOS.PRECIO_NETO,
       ARTICULOS.PRECIO_PVP,
       ARTICULOS.INVENTARIABLE,
       ARTICULOS.ID_PROVEEDOR,
       CONTACTOS.NOMBRE AS NOMBRE_PROVEEDOR,
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@ -58,55 +58,55 @@
    <DelphiCompile Include="Base.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
    <DCCReference Include="..\Modulos\Articulos\adortl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxDataD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxEditorsD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxExtEditorsD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxGridD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxLibraryD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\cxPageControlD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\DataAbstract_Core_D11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dbrtl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dclIndyCore.dcp" />
    <DCCReference Include="..\Modulos\Articulos\designide.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dsnap.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dxGDIPlusD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dxPSCoreD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\dxThemeD11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\GUISDK_D11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\IndyCore.dcp" />
    <DCCReference Include="..\Modulos\Articulos\IndyProtocols.dcp" />
    <DCCReference Include="..\Modulos\Articulos\IndySystem.dcp" />
    <DCCReference Include="..\Modulos\Articulos\Jcl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JclVcl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JSDialog100.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvCmpD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvCoreD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvCtrlsD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvDlgsD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvMMD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvNetD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvPageCompsD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvStdCtrlsD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\JvSystemD11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\pckMD5.dcp" />
    <DCCReference Include="..\Modulos\Articulos\pckUCDataConnector.dcp" />
    <DCCReference Include="..\Modulos\Articulos\pckUserControl_RT.dcp" />
    <DCCReference Include="..\Modulos\Articulos\PluginSDK_D11R.dcp" />
    <DCCReference Include="..\Modulos\Articulos\PngComponentsD10.dcp" />
    <DCCReference Include="..\Modulos\Articulos\PNG_D10.dcp" />
    <DCCReference Include="..\Modulos\Articulos\RemObjects_Core_D11.dcp" />
    <DCCReference Include="..\Modulos\Articulos\rtl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\TB2k_D10.dcp" />
    <DCCReference Include="..\Modulos\Articulos\tbx_d10.dcp" />
    <DCCReference Include="..\Modulos\Articulos\vcl.dcp" />
    <DCCReference Include="..\Modulos\Articulos\vclactnband.dcp" />
    <DCCReference Include="..\Modulos\Articulos\vcldb.dcp" />
    <DCCReference Include="..\Modulos\Articulos\vcljpg.dcp" />
    <DCCReference Include="..\Modulos\Articulos\VclSmp.dcp" />
    <DCCReference Include="..\Modulos\Articulos\vclx.dcp" />
    <DCCReference Include="..\Modulos\Articulos\xmlrtl.dcp" />
    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
    <DCCReference Include="Conexion\uConfigurarConexion.pas">
      <Form>fConfigurarConexion</Form>
      <DesignClass>TForm</DesignClass>
--- a/Source/Base/Base.res
+++ b/Source/Base/Base.res
--- a/Source/FactuGES.inc
+++ b/Source/FactuGES.inc
@ -1,4 +1,4 @@
 {$DEFINE MULTIEMPRESA}
-{DEFINE ALMACEN}
+{$DEFINE ALMACEN}
 {DEFINE PEDIDOSPROVEEDOR}
 {$DEFINE CONTABILIDAD}
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@ -58,34 +58,34 @@
    <DelphiCompile Include="GUIBase.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\ccpackD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\frx11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\frxe11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\fs11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tb2k_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
    <DCCReference Include="uDialogBase.pas">
      <Form>fDialogBase</Form>
    </DCCReference>
--- a/cliente/AlbaranesCliente_Group.groupproj
+++ b/cliente/AlbaranesCliente_Group.groupproj
@ -12,6 +12,7 @@
    <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
    <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
    <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
    <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
    <Projects Include="Controller\AlbaranesCliente_controller.dproj" />
    <Projects Include="Data\AlbaranesCliente_data.dproj" />
    <Projects Include="Model\AlbaranesCliente_model.dproj" />
@ -141,14 +142,23 @@
  <Target Name="FacturasCliente_view:Make">
    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
  </Target>
  <Target Name="PresupuestosCliente_view">
    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
  </Target>
  <Target Name="PresupuestosCliente_view:Clean">
    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Clean" />
  </Target>
  <Target Name="PresupuestosCliente_view:Make">
    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
  </Target>
  <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;PresupuestosCliente_view" />
  </Target>
  <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;PresupuestosCliente_view:Clean" />
  </Target>
  <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;PresupuestosCliente_view:Make" />
  </Target>
  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
--- a/cliente/Controller/uDetallesAlbaranClienteController.pas
+++ b/cliente/Controller/uDetallesAlbaranClienteController.pas
@ -149,8 +149,9 @@ end;
 procedure TDetallesAlbaranClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
 begin
 //Para acana el importa a cargar en la lista será siempre el precio PVP
  if Assigned(AArticulos) then
-    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE
+    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
  else
    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
--- a/cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm
+++ b/cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm
@ -1,26 +1,28 @@
 inherited frViewElegirArticulosAlbaranesCliente: TfrViewElegirArticulosAlbaranesCliente
  inherited cxGrid: TcxGrid
    inherited cxGridView: TcxGridDBTableView
      inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
        Visible = False
      end
      inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn
        Visible = False
      end
    end
  end
  inherited frViewFiltroBase1: TfrViewFiltroBase
    inherited TBXDockablePanel1: TTBXDockablePanel
      inherited dxLayoutControl1: TdxLayoutControl
        inherited txtFiltroTodo: TcxTextEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
          ExplicitWidth = 273
          Width = 273
        end
        inherited edtFechaIniFiltro: TcxDateEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
          ExplicitWidth = 121
          Width = 121
        end
        inherited edtFechaFinFiltro: TcxDateEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
          ExplicitWidth = 121
          Width = 121
        end
--- a/cliente/Views/uViewElegirArticulosAlbaranesCliente.pas
+++ b/cliente/Views/uViewElegirArticulosAlbaranesCliente.pas
--- a/Source/Modulos/Articulos/Articulos_Group.groupproj
+++ b/Source/Modulos/Articulos/Articulos_Group.groupproj
@ -9,6 +9,7 @@
    <Projects Include="..\..\Cliente\FactuGES.dproj" />
    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
    <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
    <Projects Include="Controller\Articulos_controller.dproj" />
    <Projects Include="Data\Articulos_data.dproj" />
    <Projects Include="Model\Articulos_model.dproj" />
@ -48,6 +49,15 @@
  <Target Name="ApplicationBase:Make">
    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
  </Target>
  <Target Name="Contactos_view">
    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
  </Target>
  <Target Name="Contactos_view:Clean">
    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Clean" />
  </Target>
  <Target Name="Contactos_view:Make">
    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
  </Target>
  <Target Name="Articulos_model">
    <MSBuild Projects="Model\Articulos_model.dproj" Targets="" />
  </Target>
@ -112,13 +122,13 @@
    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
  </Target>
  <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES;FactuGES_Server" />
  </Target>
  <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
  </Target>
  <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
  </Target>
  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@ -4,7 +4,7 @@ interface
 uses
-  Classes, SysUtils, uDADataTable, uControllerBase, uEditorDBItem,
+  Classes, uDADataTable, uControllerBase, uEditorDBItem,
  uIDataModuleArticulos, uBizArticulos, uProveedoresController,
  uBizContactos;
@ -41,6 +41,10 @@ type
    function GetProveedoresController: IProveedoresController;
    property ProveedoresController: IProveedoresController read GetProveedoresController;
    procedure QuitarImagen(AArticulo : IBizArticulo);
    procedure PonerImagen(AArticulo : IBizArticulo; const AFileName: String);
    function SalvarImagen(AArticulo : IBizArticulo): Boolean;
  end;
  TArticulosController = class(TControllerBase, IArticulosController)
@ -92,15 +96,19 @@ type
    procedure ElegirProveedor(AArticulo : IBizArticulo);
    procedure AnadirProveedor(AArticulo : IBizArticulo);
    procedure VerProveedor(AArticulo : IBizArticulo);
    procedure QuitarImagen(AArticulo : IBizArticulo);
    procedure PonerImagen(AArticulo : IBizArticulo; const AFileName: String);
    function SalvarImagen(AArticulo : IBizArticulo): Boolean;
  end;
 implementation
 uses
-  cxControls, DB, uEditorRegistryUtils, schArticulosClient_Intf, uFactuGES_App,
+  SysUtils, cxControls, uDataTableUtils, DB, uEditorRegistryUtils, schArticulosClient_Intf, uFactuGES_App,
-  uIEditorArticulos, uIEditorArticulo, uIEditorElegirArticulos,
+  uIEditorArticulos, uIEditorArticulo, uIEditorElegirArticulos, uSistemaFunc,
  uDataModuleArticulos, uDataModuleUsuarios, uDAInterfaces,
-  uDataTableUtils, uDateUtils, uROTypes, DateUtils, Controls, Windows;
+  uDateUtils, uROTypes, DateUtils, Controls, Windows;
 { TArticulosController }
@ -537,6 +545,21 @@ begin
  //
 end;
 function TArticulosController.SalvarImagen(AArticulo: IBizArticulo): Boolean;
 var
  aAux : String;
 begin
  if not AArticulo.HayImagen then
     Result := FDataModule.EliminarImagen(AArticulo.ID)
  else
  begin
    aAux := DarFicheroJPGTemporal;
    AArticulo.DataTable.FieldByName(fld_ArticulosIMAGEN).SaveToFile(aAux);
    if FDataModule.AnadirImagen(AArticulo.ID, aAux) then
       SysUtils.DeleteFile(aAux);
  end;
 end;
 function TArticulosController.Existe(const ID: Integer): Boolean;
 var
  AArticulo : IBizArticulo;
@ -594,7 +617,7 @@ begin
    ShowHourglassCursor;
    try
      AArticulo.DataTable.ApplyUpdates;
-      
+      SalvarImagen(AArticulo);
      Result := True;      
    finally
      HideHourglassCursor;
@ -613,6 +636,19 @@ begin
  Result := AArticulo;
 end;
 procedure TArticulosController.PonerImagen(AArticulo: IBizArticulo; const AFileName: String);
 begin
  if FileExists(AFileName) then
  begin
    DesconectarTabla(AArticulo.DataTable);
    if not AArticulo.DataTable.Editing then
       AArticulo.Edit;
    AArticulo.DataTable.FieldByName(fld_ArticulosIMAGEN).LoadFromFile(AFileName);
    AArticulo.Post;
    ConectarTabla(AArticulo.DataTable);
  end;
 end;
 procedure TArticulosController.Preview(AArticulo: IBizArticulo);
 //var
 //  AReportController : IArticulosReportController;
@ -639,4 +675,14 @@ begin
 }
 end;
 procedure TArticulosController.QuitarImagen(AArticulo : IBizArticulo);
 begin
  DesconectarTabla(AArticulo.DataTable);
  if not AArticulo.DataTable.Editing then
     AArticulo.Edit;
  AArticulo.IMAGENIsNull := True;
  AArticulo.Post;
  ConectarTabla(AArticulo.DataTable);
 end;
 end.
--- a/Source/Modulos/Articulos/Data/Articulos_data.dproj
+++ b/Source/Modulos/Articulos/Data/Articulos_data.dproj
@ -54,7 +54,7 @@
    <DelphiCompile Include="Articulos_data.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_model.dcp" />
+    <DCCReference Include="..\Articulos_model.dcp" />
    <DCCReference Include="uDataModuleArticulos.pas">
      <Form>DataModuleArticulos</Form>
    </DCCReference>
--- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
+++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
@ -14,12 +14,12 @@ inherited DataModuleArticulos: TDataModuleArticulos
    Top = 84
  end
  object rda_Articulos: TDARemoteDataAdapter
    DataStreamer = Bin2DataStreamer
    GetSchemaCall.RemoteService = RORemoteService
    GetDataCall.RemoteService = RORemoteService
    UpdateDataCall.RemoteService = RORemoteService
    GetScriptsCall.RemoteService = RORemoteService
    RemoteService = RORemoteService
    DataStreamer = Bin2DataStreamer
    Left = 51
    Top = 151
  end
@ -64,8 +64,8 @@ inherited DataModuleArticulos: TDataModuleArticulos
      item
        Name = 'IMAGEN'
        DataType = datBlob
        BlobType = dabtGraphic
        DisplayLabel = 'Foto'
        DictionaryEntry = 'Articulos_IMAGEN'
      end
      item
        Name = 'COMISIONABLE'
@ -119,6 +119,10 @@ inherited DataModuleArticulos: TDataModuleArticulos
        DataType = datCurrency
        DictionaryEntry = 'Articulos_PRECIO_NETO'
      end
      item
        Name = 'PRECIO_PVP'
        DataType = datCurrency
      end
      item
        Name = 'INVENTARIABLE'
        DataType = datSmallInt
@ -143,8 +147,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
    Params = <>
    StreamingOptions = [soDisableEventsWhileStreaming]
    RemoteDataAdapter = rda_Articulos
    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
    LogicalName = 'Articulos'
    IndexDefs = <>
    Left = 232
@ -225,6 +227,10 @@ inherited DataModuleArticulos: TDataModuleArticulos
        Name = 'PRECIO_NETO'
        DataType = datCurrency
      end
      item
        Name = 'PRECIO_PVP'
        DataType = datCurrency
      end
      item
        Name = 'INVENTARIABLE'
        DataType = datSmallInt
@ -251,8 +257,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
      end>
    StreamingOptions = [soDisableEventsWhileStreaming]
    RemoteDataAdapter = rda_Articulos
    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
    LogicalName = 'ArticulosParaCliente'
    IndexDefs = <>
    Left = 400
--- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas
+++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas
@ -29,6 +29,8 @@ type
    function GetItems (IDCliente: Integer) : IBizArticulo; overload;
    function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo;
    function NewItem : IBizArticulo;
    function EliminarImagen(const ID: Integer): Boolean;
    function AnadirImagen(const ID: Integer; const AFileName: String): Boolean;
  end;
 implementation
@ -41,6 +43,11 @@ uses
 { TdmArticulos }
 function TDataModuleArticulos.AnadirImagen(const ID: Integer; const AFileName: String): Boolean;
 begin
  Result := (RORemoteService as IsrvArticulos).AnadirImagen(ID, AFileName);
 end;
 procedure TDataModuleArticulos.AsignarClaseNegocio(AArticulo: TDADataTable);
 begin
  AArticulo.BusinessRulesID := BIZ_CLIENT_ARTICULO;
@ -52,6 +59,11 @@ begin
  RORemoteService.Message := dmConexion.Message;
 end;
 function TDataModuleArticulos.EliminarImagen(const ID: Integer): Boolean;
 begin
  Result := (RORemoteService as IsrvArticulos).EliminarImagen(ID);
 end;
 function TDataModuleArticulos.NewItem: IBizArticulo;
 begin
  Result := GetItem(ID_NULO)
--- a/Source/Modulos/Articulos/Model/Articulos_model.RES
+++ b/Source/Modulos/Articulos/Model/Articulos_model.RES
--- a/Source/Modulos/Articulos/Model/Articulos_model.dproj
+++ b/Source/Modulos/Articulos/Model/Articulos_model.dproj
@ -54,8 +54,8 @@
    <DelphiCompile Include="Articulos_model.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="ApplicationBase.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\ApplicationBase.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\Base.dcp" />
    <DCCReference Include="Data\uIDataModuleArticulos.pas" />
    <DCCReference Include="schArticulosClient_Intf.pas" />
    <DCCReference Include="schArticulosServer_Intf.pas" />
--- a/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas
+++ b/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas
@ -12,6 +12,8 @@ type
    function GetItems (IDCliente: Integer) : IBizArticulo; overload;
    function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo;
    function NewItem : IBizArticulo;
    function EliminarImagen(const ID: Integer): Boolean;
    function AnadirImagen(const ID: Integer; const AFileName: String): Boolean;      
  end;
 implementation
--- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
@ -3,14 +3,14 @@ unit schArticulosClient_Intf;
 interface
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 const
  { Data table rules ids
       Feel free to change them to something more human readable
       but make sure they are unique in the context of your application }
-  RID_Articulos = '{9F6189A0-1B2F-4ED3-8DCC-540C38366485}';
+  RID_Articulos = '{F53C14ED-C343-42D8-8A25-6BB3A141FD22}';
-  RID_ArticulosParaCliente = '{84BC0DB1-97F7-438D-B161-7564778ED6D8}';
+  RID_ArticulosParaCliente = '{B1D54489-E268-483E-AF01-6E441FBF6DC0}';
  { Data table names }
  nme_Articulos = 'Articulos';
@ -32,6 +32,7 @@ const
  fld_ArticulosPRECIO_PORTE = 'PRECIO_PORTE';
  fld_ArticulosDESCUENTO = 'DESCUENTO';
  fld_ArticulosPRECIO_NETO = 'PRECIO_NETO';
  fld_ArticulosPRECIO_PVP = 'PRECIO_PVP';
  fld_ArticulosINVENTARIABLE = 'INVENTARIABLE';
  fld_ArticulosID_PROVEEDOR = 'ID_PROVEEDOR';
  fld_ArticulosNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR';
@ -53,10 +54,11 @@ const
  idx_ArticulosPRECIO_PORTE = 12;
  idx_ArticulosDESCUENTO = 13;
  idx_ArticulosPRECIO_NETO = 14;
-  idx_ArticulosINVENTARIABLE = 15;
+  idx_ArticulosPRECIO_PVP = 15;
-  idx_ArticulosID_PROVEEDOR = 16;
+  idx_ArticulosINVENTARIABLE = 16;
-  idx_ArticulosNOMBRE_PROVEEDOR = 17;
+  idx_ArticulosID_PROVEEDOR = 17;
-  idx_ArticulosELIMINADO = 18;
+  idx_ArticulosNOMBRE_PROVEEDOR = 18;
  idx_ArticulosELIMINADO = 19;
  { ArticulosParaCliente fields }
  fld_ArticulosParaClienteID = 'ID';
@ -74,6 +76,7 @@ const
  fld_ArticulosParaClientePRECIO_PORTE = 'PRECIO_PORTE';
  fld_ArticulosParaClienteDESCUENTO = 'DESCUENTO';
  fld_ArticulosParaClientePRECIO_NETO = 'PRECIO_NETO';
  fld_ArticulosParaClientePRECIO_PVP = 'PRECIO_PVP';
  fld_ArticulosParaClienteINVENTARIABLE = 'INVENTARIABLE';
  fld_ArticulosParaClienteID_PROVEEDOR = 'ID_PROVEEDOR';
  fld_ArticulosParaClienteNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR';
@ -95,15 +98,16 @@ const
  idx_ArticulosParaClientePRECIO_PORTE = 12;
  idx_ArticulosParaClienteDESCUENTO = 13;
  idx_ArticulosParaClientePRECIO_NETO = 14;
-  idx_ArticulosParaClienteINVENTARIABLE = 15;
+  idx_ArticulosParaClientePRECIO_PVP = 15;
-  idx_ArticulosParaClienteID_PROVEEDOR = 16;
+  idx_ArticulosParaClienteINVENTARIABLE = 16;
-  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 17;
+  idx_ArticulosParaClienteID_PROVEEDOR = 17;
-  idx_ArticulosParaClienteELIMINADO = 18;
+  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 18;
  idx_ArticulosParaClienteELIMINADO = 19;
 type
  { IArticulos }
  IArticulos = interface(IDAStronglyTypedDataTable)
-  ['{55AA5752-BC15-4FD7-A39A-97867A837A69}']
+  ['{7AB1F398-443E-4F30-BBD4-AA8BD49A1C0B}']
    { Property getters and setters }
    function GetIDValue: Integer;
    procedure SetIDValue(const aValue: Integer);
@ -164,6 +168,10 @@ type
    procedure SetPRECIO_NETOValue(const aValue: Currency);
    function GetPRECIO_NETOIsNull: Boolean;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean);
    function GetPRECIO_PVPValue: Currency;
    procedure SetPRECIO_PVPValue(const aValue: Currency);
    function GetPRECIO_PVPIsNull: Boolean;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean);
    function GetINVENTARIABLEValue: SmallInt;
    procedure SetINVENTARIABLEValue(const aValue: SmallInt);
    function GetINVENTARIABLEIsNull: Boolean;
@ -213,6 +221,8 @@ type
    property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
    property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
    property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property INVENTARIABLE: SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull: Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
@ -224,7 +234,7 @@ type
  end;
  { TArticulosDataTableRules }
-  TArticulosDataTableRules = class(TIntfObjectDADataTableRules, IArticulos)
+  TArticulosDataTableRules = class(TDADataTableRules, IArticulos)
  private
    f_IMAGEN: IROStream;
    procedure IMAGEN_OnChange(Sender: TObject);
@ -289,6 +299,10 @@ type
    procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
    function GetPRECIO_NETOIsNull: Boolean; virtual;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
    function GetPRECIO_PVPValue: Currency; virtual;
    procedure SetPRECIO_PVPValue(const aValue: Currency); virtual;
    function GetPRECIO_PVPIsNull: Boolean; virtual;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual;
    function GetINVENTARIABLEValue: SmallInt; virtual;
    procedure SetINVENTARIABLEValue(const aValue: SmallInt); virtual;
    function GetINVENTARIABLEIsNull: Boolean; virtual;
@ -337,6 +351,8 @@ type
    property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
    property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
    property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property INVENTARIABLE: SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull: Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
@ -354,7 +370,7 @@ type
  { IArticulosParaCliente }
  IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
-  ['{F46994FF-67BE-4892-BE35-890D5A779CB9}']
+  ['{358932C8-FF5E-41C2-B0C9-A4C7423A57B8}']
    { Property getters and setters }
    function GetIDValue: Integer;
    procedure SetIDValue(const aValue: Integer);
@ -415,6 +431,10 @@ type
    procedure SetPRECIO_NETOValue(const aValue: Currency);
    function GetPRECIO_NETOIsNull: Boolean;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean);
    function GetPRECIO_PVPValue: Currency;
    procedure SetPRECIO_PVPValue(const aValue: Currency);
    function GetPRECIO_PVPIsNull: Boolean;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean);
    function GetINVENTARIABLEValue: SmallInt;
    procedure SetINVENTARIABLEValue(const aValue: SmallInt);
    function GetINVENTARIABLEIsNull: Boolean;
@ -464,6 +484,8 @@ type
    property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
    property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
    property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property INVENTARIABLE: SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull: Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
@ -475,7 +497,7 @@ type
  end;
  { TArticulosParaClienteDataTableRules }
-  TArticulosParaClienteDataTableRules = class(TIntfObjectDADataTableRules, IArticulosParaCliente)
+  TArticulosParaClienteDataTableRules = class(TDADataTableRules, IArticulosParaCliente)
  private
    f_IMAGEN: IROStream;
    procedure IMAGEN_OnChange(Sender: TObject);
@ -540,6 +562,10 @@ type
    procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
    function GetPRECIO_NETOIsNull: Boolean; virtual;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
    function GetPRECIO_PVPValue: Currency; virtual;
    procedure SetPRECIO_PVPValue(const aValue: Currency); virtual;
    function GetPRECIO_PVPIsNull: Boolean; virtual;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual;
    function GetINVENTARIABLEValue: SmallInt; virtual;
    procedure SetINVENTARIABLEValue(const aValue: SmallInt); virtual;
    function GetINVENTARIABLEIsNull: Boolean; virtual;
@ -588,6 +614,8 @@ type
    property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
    property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
    property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property INVENTARIABLE: SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull: Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
@ -944,6 +972,27 @@ begin
    DataTable.Fields[idx_ArticulosPRECIO_NETO].AsVariant := Null;
 end;
 function TArticulosDataTableRules.GetPRECIO_PVPValue: Currency;
 begin
  result := DataTable.Fields[idx_ArticulosPRECIO_PVP].AsCurrency;
 end;
 procedure TArticulosDataTableRules.SetPRECIO_PVPValue(const aValue: Currency);
 begin
  DataTable.Fields[idx_ArticulosPRECIO_PVP].AsCurrency := aValue;
 end;
 function TArticulosDataTableRules.GetPRECIO_PVPIsNull: boolean;
 begin
  result := DataTable.Fields[idx_ArticulosPRECIO_PVP].IsNull;
 end;
 procedure TArticulosDataTableRules.SetPRECIO_PVPIsNull(const aValue: Boolean);
 begin
  if aValue then
    DataTable.Fields[idx_ArticulosPRECIO_PVP].AsVariant := Null;
 end;
 function TArticulosDataTableRules.GetINVENTARIABLEValue: SmallInt;
 begin
  result := DataTable.Fields[idx_ArticulosINVENTARIABLE].AsSmallInt;
@ -1366,6 +1415,27 @@ begin
    DataTable.Fields[idx_ArticulosParaClientePRECIO_NETO].AsVariant := Null;
 end;
 function TArticulosParaClienteDataTableRules.GetPRECIO_PVPValue: Currency;
 begin
  result := DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsCurrency;
 end;
 procedure TArticulosParaClienteDataTableRules.SetPRECIO_PVPValue(const aValue: Currency);
 begin
  DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsCurrency := aValue;
 end;
 function TArticulosParaClienteDataTableRules.GetPRECIO_PVPIsNull: boolean;
 begin
  result := DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].IsNull;
 end;
 procedure TArticulosParaClienteDataTableRules.SetPRECIO_PVPIsNull(const aValue: Boolean);
 begin
  if aValue then
    DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsVariant := Null;
 end;
 function TArticulosParaClienteDataTableRules.GetINVENTARIABLEValue: SmallInt;
 begin
  result := DataTable.Fields[idx_ArticulosParaClienteINVENTARIABLE].AsSmallInt;
--- a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
@ -9,13 +9,13 @@ const
  { Delta rules ids 
       Feel free to change them to something more human readable
       but make sure they are unique in the context of your application }
-  RID_ArticulosDelta = '{82298E75-82C9-4852-A33B-491F6C1C22B6}';
+  RID_ArticulosDelta = '{EF3BCE84-BF72-4D25-B5C4-02DC99E2C0B2}';
-  RID_ArticulosParaClienteDelta = '{CD4567F1-5B6C-4215-BED9-48EC27CE653D}';
+  RID_ArticulosParaClienteDelta = '{E180507C-4070-490C-A07F-A5047BD0F477}';
 type
  { IArticulosDelta }
  IArticulosDelta = interface(IArticulos)
-  ['{82298E75-82C9-4852-A33B-491F6C1C22B6}']
+  ['{EF3BCE84-BF72-4D25-B5C4-02DC99E2C0B2}']
    { Property getters and setters }
    function GetOldIDValue : Integer;
    function GetOldID_EMPRESAValue : Integer;
@ -32,6 +32,7 @@ type
    function GetOldPRECIO_PORTEValue : Currency;
    function GetOldDESCUENTOValue : Float;
    function GetOldPRECIO_NETOValue : Currency;
    function GetOldPRECIO_PVPValue : Currency;
    function GetOldINVENTARIABLEValue : SmallInt;
    function GetOldID_PROVEEDORValue : Integer;
    function GetOldNOMBRE_PROVEEDORValue : String;
@ -53,6 +54,7 @@ type
    property OldPRECIO_PORTE : Currency read GetOldPRECIO_PORTEValue;
    property OldDESCUENTO : Float read GetOldDESCUENTOValue;
    property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
    property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue;
    property OldINVENTARIABLE : SmallInt read GetOldINVENTARIABLEValue;
    property OldID_PROVEEDOR : Integer read GetOldID_PROVEEDORValue;
    property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
@ -155,6 +157,12 @@ type
    function GetOldPRECIO_NETOIsNull: Boolean; virtual;
    procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
    function GetPRECIO_PVPValue: Currency; virtual;
    function GetPRECIO_PVPIsNull: Boolean; virtual;
    function GetOldPRECIO_PVPValue: Currency; virtual;
    function GetOldPRECIO_PVPIsNull: Boolean; virtual;
    procedure SetPRECIO_PVPValue(const aValue: Currency); virtual;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual;
    function GetINVENTARIABLEValue: SmallInt; virtual;
    function GetINVENTARIABLEIsNull: Boolean; virtual;
    function GetOldINVENTARIABLEValue: SmallInt; virtual;
@ -241,6 +249,10 @@ type
    property PRECIO_NETOIsNull : Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
    property OldPRECIO_NETOIsNull : Boolean read GetOldPRECIO_NETOIsNull;
    property PRECIO_PVP : Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull : Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue;
    property OldPRECIO_PVPIsNull : Boolean read GetOldPRECIO_PVPIsNull;
    property INVENTARIABLE : SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull : Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property OldINVENTARIABLE : SmallInt read GetOldINVENTARIABLEValue;
@ -266,7 +278,7 @@ type
  { IArticulosParaClienteDelta }
  IArticulosParaClienteDelta = interface(IArticulosParaCliente)
-  ['{CD4567F1-5B6C-4215-BED9-48EC27CE653D}']
+  ['{E180507C-4070-490C-A07F-A5047BD0F477}']
    { Property getters and setters }
    function GetOldIDValue : Integer;
    function GetOldID_EMPRESAValue : Integer;
@ -283,6 +295,7 @@ type
    function GetOldPRECIO_PORTEValue : Currency;
    function GetOldDESCUENTOValue : Float;
    function GetOldPRECIO_NETOValue : Currency;
    function GetOldPRECIO_PVPValue : Currency;
    function GetOldINVENTARIABLEValue : SmallInt;
    function GetOldID_PROVEEDORValue : Integer;
    function GetOldNOMBRE_PROVEEDORValue : String;
@ -304,6 +317,7 @@ type
    property OldPRECIO_PORTE : Currency read GetOldPRECIO_PORTEValue;
    property OldDESCUENTO : Float read GetOldDESCUENTOValue;
    property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
    property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue;
    property OldINVENTARIABLE : SmallInt read GetOldINVENTARIABLEValue;
    property OldID_PROVEEDOR : Integer read GetOldID_PROVEEDORValue;
    property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
@ -406,6 +420,12 @@ type
    function GetOldPRECIO_NETOIsNull: Boolean; virtual;
    procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
    procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
    function GetPRECIO_PVPValue: Currency; virtual;
    function GetPRECIO_PVPIsNull: Boolean; virtual;
    function GetOldPRECIO_PVPValue: Currency; virtual;
    function GetOldPRECIO_PVPIsNull: Boolean; virtual;
    procedure SetPRECIO_PVPValue(const aValue: Currency); virtual;
    procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual;
    function GetINVENTARIABLEValue: SmallInt; virtual;
    function GetINVENTARIABLEIsNull: Boolean; virtual;
    function GetOldINVENTARIABLEValue: SmallInt; virtual;
@ -492,6 +512,10 @@ type
    property PRECIO_NETOIsNull : Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
    property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
    property OldPRECIO_NETOIsNull : Boolean read GetOldPRECIO_NETOIsNull;
    property PRECIO_PVP : Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue;
    property PRECIO_PVPIsNull : Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull;
    property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue;
    property OldPRECIO_PVPIsNull : Boolean read GetOldPRECIO_PVPIsNull;
    property INVENTARIABLE : SmallInt read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
    property INVENTARIABLEIsNull : Boolean read GetINVENTARIABLEIsNull write SetINVENTARIABLEIsNull;
    property OldINVENTARIABLE : SmallInt read GetOldINVENTARIABLEValue;
@ -539,7 +563,7 @@ end;
 procedure TArticulosBusinessProcessorRules.IMAGEN_OnChange(Sender: TObject);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosIMAGEN] := VariantBinaryFromBinary((TROStream(Sender) as IROStream).Stream);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosIMAGEN] := BinaryToBlobVariant((TROStream(Sender) as IROStream).Stream);
 end;
 function TArticulosBusinessProcessorRules.GetIDValue: Integer;
@ -702,7 +726,7 @@ begin
  result := f_IMAGEN;
  result.Position := 0;
  if not Result.InUpdateMode then begin
-    WriteVariantBinaryToBinary(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosIMAGEN], result.Stream);
+    BlobVariantToBinary(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosIMAGEN], result.Stream);
    result.Position := 0;
  end;
 end;
@ -715,7 +739,7 @@ end;
 function TArticulosBusinessProcessorRules.GetOldIMAGENValue: IROStream;
 begin
  result := NewROStream();
-  WriteVariantBinaryToBinary(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosIMAGEN], result.Stream);
+  BlobVariantToBinary(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosIMAGEN], result.Stream);
 end;
 function TArticulosBusinessProcessorRules.GetOldIMAGENIsNull: Boolean;
@ -1008,6 +1032,37 @@ begin
    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_NETO] := Null;
 end;
 function TArticulosBusinessProcessorRules.GetPRECIO_PVPValue: Currency;
 begin
  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP];
 end;
 function TArticulosBusinessProcessorRules.GetPRECIO_PVPIsNull: Boolean;
 begin
  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP]);
 end;
 function TArticulosBusinessProcessorRules.GetOldPRECIO_PVPValue: Currency;
 begin
  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPRECIO_PVP];
 end;
 function TArticulosBusinessProcessorRules.GetOldPRECIO_PVPIsNull: Boolean;
 begin
  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPRECIO_PVP]);
 end;
 procedure TArticulosBusinessProcessorRules.SetPRECIO_PVPValue(const aValue: Currency);
 begin
  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP] := aValue;
 end;
 procedure TArticulosBusinessProcessorRules.SetPRECIO_PVPIsNull(const aValue: Boolean);
 begin
  if aValue then
    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP] := Null;
 end;
 function TArticulosBusinessProcessorRules.GetINVENTARIABLEValue: SmallInt;
 begin
  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosINVENTARIABLE];
@ -1152,7 +1207,7 @@ end;
 procedure TArticulosParaClienteBusinessProcessorRules.IMAGEN_OnChange(Sender: TObject);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteIMAGEN] := VariantBinaryFromBinary((TROStream(Sender) as IROStream).Stream);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteIMAGEN] := BinaryToBlobVariant((TROStream(Sender) as IROStream).Stream);
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetIDValue: Integer;
@ -1315,7 +1370,7 @@ begin
  result := f_IMAGEN;
  result.Position := 0;
  if not Result.InUpdateMode then begin
-    WriteVariantBinaryToBinary(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteIMAGEN], result.Stream);
+    BlobVariantToBinary(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteIMAGEN], result.Stream);
    result.Position := 0;
  end;
 end;
@ -1328,7 +1383,7 @@ end;
 function TArticulosParaClienteBusinessProcessorRules.GetOldIMAGENValue: IROStream;
 begin
  result := NewROStream();
-  WriteVariantBinaryToBinary(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteIMAGEN], result.Stream);
+  BlobVariantToBinary(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteIMAGEN], result.Stream);
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetOldIMAGENIsNull: Boolean;
@ -1621,6 +1676,37 @@ begin
    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_NETO] := Null;
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetPRECIO_PVPValue: Currency;
 begin
  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP];
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetPRECIO_PVPIsNull: Boolean;
 begin
  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP]);
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetOldPRECIO_PVPValue: Currency;
 begin
  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePRECIO_PVP];
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetOldPRECIO_PVPIsNull: Boolean;
 begin
  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePRECIO_PVP]);
 end;
 procedure TArticulosParaClienteBusinessProcessorRules.SetPRECIO_PVPValue(const aValue: Currency);
 begin
  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP] := aValue;
 end;
 procedure TArticulosParaClienteBusinessProcessorRules.SetPRECIO_PVPIsNull(const aValue: Boolean);
 begin
  if aValue then
    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP] := Null;
 end;
 function TArticulosParaClienteBusinessProcessorRules.GetINVENTARIABLEValue: SmallInt;
 begin
  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteINVENTARIABLE];
--- a/Source/Modulos/Articulos/Model/uBizArticulos.pas
+++ b/Source/Modulos/Articulos/Model/uBizArticulos.pas
@ -15,7 +15,7 @@ type
    function HayImagen: Boolean;
    procedure SalvarImagen(const AFileName: String);
    procedure CargarImagen(const AFileName: String);
-    procedure QuitarImagen;
+//    procedure QuitarImagen;
  end;
  TBizArticulo = class(TArticulosDataTableRules, IBizArticulo, ISeleccionable)
@ -27,7 +27,7 @@ type
    function HayImagen: Boolean;
    procedure SalvarImagen(const AFileName: String);
    procedure CargarImagen(const AFileName: String);
-    procedure QuitarImagen;
+//    procedure QuitarImagen;
    function EsNuevo : Boolean;
    constructor Create(aDataTable: TDADataTable); override;
    destructor Destroy; override;
@ -44,10 +44,10 @@ uses
 procedure TBizArticulo.CargarImagen(const AFileName: String);
 begin
-{  inherited;
+  inherited;
  DataTable.Edit;
  DataTable.FieldByName(fld_ArticulosIMAGEN).LoadFromFile(AFileName);
-  DataTable.Post;}
+  DataTable.Post;
 end;
 constructor TBizArticulo.Create(aDataTable: TDADataTable);
@ -68,11 +68,11 @@ begin
 end;
 function TBizArticulo.HayImagen: Boolean;
-{var
+var
  AStream : TMemoryStream;
-  AROStream : IROStream;}
+  AROStream : IROStream;
 begin
-{  AStream := TMemoryStream.Create;
+  AStream := TMemoryStream.Create;
  AROStream := TROStream.Create(AStream, False);
  try
    DataTable.FieldByName(fld_ArticulosIMAGEN).SaveToStream(AROStream);
@ -80,7 +80,7 @@ begin
  finally
    AROStream := NIL;
    FreeAndNIL(AStream);
-  end;}
+  end;
 end;
 procedure TBizArticulo.IniciarValoresArticuloNuevo;
@ -103,16 +103,16 @@ begin
  IniciarValoresArticuloNuevo;
 end;
-procedure TBizArticulo.QuitarImagen;
+{procedure TBizArticulo.QuitarImagen;
 begin
-{  DataTable.Edit;
+//  DataTable.Edit;
-  DataTable.Fields[idx_ArticulosIMAGEN].Clear;
+//  DataTable.Fields[idx_ArticulosIMAGEN].Clear;
-  DataTable.Post;}
+//  DataTable.Post;
-end;
+end;}
 procedure TBizArticulo.SalvarImagen(const AFileName: String);
 begin
-//  DataTable.FieldByName(fld_ArticulosIMAGEN).SaveToFile(AFileName);
+  DataTable.FieldByName(fld_ArticulosIMAGEN).SaveToFile(AFileName);
 end;
 initialization
--- a/Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm
+++ b/Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm
@ -53,9 +53,9 @@ object PluginArticulos: TPluginArticulos
    Left = 40
    Top = 16
    object N1: TMenuItem
-      Caption = 'Log'#237'stica'
+      Caption = 'Datos'
      object Articulos1: TMenuItem
-        Tag = 101
+        Tag = 1000
        Action = actArticulos
      end
    end
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
@ -120,6 +120,33 @@ object srvArticulos: TsrvArticulos
    DataDictionary = DataDictionary
    Diagrams = Diagrams
    Datasets = <
      item
        Params = <
          item
            Name = 'id'
            Value = ''
          end>
        Statements = <
          item
            Connection = 'IBX'
            ConnectionType = 'Interbase'
            Default = True
            Name = 'IBX'
            SQL = 'select id'#10'from articulos'#10'where id = :id'#10
            StatementType = stSQL
            ColumnMappings = <
              item
                DatasetField = 'ID'
                TableField = 'ID'
              end>
          end>
        Name = 'ExisteImagen'
        Fields = <
          item
            Name = 'ID'
            DataType = datInteger
          end>
      end
      item
        Params = <>
        Statements = <
@ -203,6 +230,10 @@ object srvArticulos: TsrvArticulos
              item
                DatasetField = 'ELIMINADO'
                TableField = 'ELIMINADO'
              end
              item
                DatasetField = 'PRECIO_PVP'
                TableField = 'PRECIO_PVP'
              end>
          end>
        Name = 'Articulos'
@ -241,7 +272,8 @@ object srvArticulos: TsrvArticulos
          item
            Name = 'IMAGEN'
            DataType = datBlob
-            DictionaryEntry = 'Articulos_IMAGEN'
+            BlobType = dabtGraphic
            DisplayLabel = 'Foto'
          end
          item
            Name = 'COMISIONABLE'
@ -290,6 +322,10 @@ object srvArticulos: TsrvArticulos
            DataType = datCurrency
            DictionaryEntry = 'Articulos_PRECIO_NETO'
          end
          item
            Name = 'PRECIO_PVP'
            DataType = datCurrency
          end
          item
            Name = 'INVENTARIABLE'
            DataType = datSmallInt
@ -330,11 +366,12 @@ object srvArticulos: TsrvArticulos
              '     V_ARTICULOS.REFERENCIA_PROV,'#10'       V_ARTICULOS.PRECIO_COST' +
              'E,'#10'       V_ARTICULOS.PRECIO_PORTE,'#10'       CLIENTES_DTOS_PROVEED' +
              'ORES.DESCUENTO,'#10'       V_ARTICULOS.PRECIO_NETO,'#10'       V_ARTICUL' +
-              'OS.INVENTARIABLE,'#10'       V_ARTICULOS.ID_PROVEEDOR,'#10'       V_ARTI' +
+              'OS.PRECIO_PVP,'#10'       V_ARTICULOS.INVENTARIABLE,'#10'       V_ARTICU' +
-              'CULOS.NOMBRE_PROVEEDOR,'#10'       V_ARTICULOS.ELIMINADO'#10'FROM V_ARTI' +
+              'LOS.ID_PROVEEDOR,'#10'       V_ARTICULOS.NOMBRE_PROVEEDOR,'#10'       V_' +
-              'CULOS'#10'LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DT' +
+              'ARTICULOS.ELIMINADO'#10'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIENTES_DT' +
-              'OS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLI' +
+              'OS_PROVEEDORES'#10'ON ((CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR = V_A' +
-              'ENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'#10'where {where}'#10
+              'RTICULOS.ID_PROVEEDOR)'#10'AND (CLIENTES_DTOS_PROVEEDORES.ID_CLIENTE' +
              ' = :ID_CLIENTE))'#10'where {where}'#10
            StatementType = stSQL
            ColumnMappings = <
              item
@ -413,6 +450,10 @@ object srvArticulos: TsrvArticulos
              item
                DatasetField = 'ELIMINADO'
                TableField = 'ELIMINADO'
              end
              item
                DatasetField = 'PRECIO_PVP'
                TableField = 'PRECIO_PVP'
              end>
          end>
        Name = 'ArticulosParaCliente'
@ -483,6 +524,10 @@ object srvArticulos: TsrvArticulos
            Name = 'PRECIO_NETO'
            DataType = datCurrency
          end
          item
            Name = 'PRECIO_PVP'
            DataType = datCurrency
          end
          item
            Name = 'INVENTARIABLE'
            DataType = datSmallInt
@ -515,70 +560,92 @@ object srvArticulos: TsrvArticulos
          end
          item
            Name = 'ID_EMPRESA'
            DataType = datInteger
            Value = ''
          end
          item
            Name = 'REFERENCIA'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'DESCRIPCION'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'FAMILIA'
-            Value = ''
+            DataType = datString
-          end
+            Size = 255
          item
            Name = 'IMAGEN'
            Value = ''
          end
          item
            Name = 'COMISIONABLE'
            DataType = datSmallInt
            Value = ''
          end
          item
            Name = 'FECHA_ALTA'
            DataType = datDateTime
            Value = ''
          end
          item
            Name = 'FECHA_MODIFICACION'
            DataType = datDateTime
            Value = ''
          end
          item
            Name = 'USUARIO'
            DataType = datString
            Size = 30
            Value = ''
          end
          item
            Name = 'PRECIO_COSTE'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'PRECIO_PORTE'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'DESCUENTO'
            DataType = datFloat
            Value = ''
          end
          item
            Name = 'ID_PROVEEDOR'
            DataType = datInteger
            Value = ''
          end
          item
            Name = 'PRECIO_NETO'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'PRECIO_PVP'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'REFERENCIA_PROV'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'INVENTARIABLE'
            DataType = datSmallInt
            Value = ''
          end
          item
            Name = 'ELIMINADO'
            DataType = datSmallInt
            Value = ''
          end>
        Statements = <
@ -587,19 +654,60 @@ object srvArticulos: TsrvArticulos
            TargetTable = 'ARTICULOS'
            SQL = 
              'INSERT'#10'  INTO ARTICULOS'#10'    (ID, ID_EMPRESA, REFERENCIA, DESCRIP' +
-              'CION, FAMILIA, IMAGEN, '#10'     COMISIONABLE, FECHA_ALTA, FECHA_MOD' +
+              'CION, FAMILIA,'#10'     COMISIONABLE, FECHA_ALTA, FECHA_MODIFICACION' +
-              'IFICACION, USUARIO, '#10'     PRECIO_COSTE, PRECIO_PORTE, DESCUENTO,' +
+              ', USUARIO, '#10'     PRECIO_COSTE, PRECIO_PORTE, DESCUENTO, ID_PROVE' +
-              ' ID_PROVEEDOR, '#10'     PRECIO_NETO, REFERENCIA_PROV, INVENTARIABLE' +
+              'EDOR, '#10'     PRECIO_NETO, PRECIO_PVP, REFERENCIA_PROV, INVENTARIA' +
-              ', ELIMINADO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, :DESCR' +
+              'BLE, ELIMINADO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, :DE' +
-              'IPCION, :FAMILIA, '#10'     :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FE' +
+              'SCRIPCION, :FAMILIA, '#10'     :COMISIONABLE, :FECHA_ALTA, :FECHA_MO' +
-              'CHA_MODIFICACION, '#10'     :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, ' +
+              'DIFICACION,'#10'     :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :DESCUE' +
-              ':DESCUENTO, '#10'     :ID_PROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,' +
+              'NTO, '#10'     :ID_PROVEEDOR, :PRECIO_NETO, :PRECIO_PVP, :REFERENCIA' +
-              #10'     :INVENTARIABLE, :ELIMINADO)'
+              '_PROV,'#10'     :INVENTARIABLE, :ELIMINADO)'#10
            StatementType = stSQL
            ColumnMappings = <>
          end>
        Name = 'Insert_Articulos'
      end
      item
        Params = <
          item
            Name = 'IMAGEN'
            DataType = datBlob
            Value = ''
          end
          item
            Name = 'ID'
            Value = ''
          end>
        Statements = <
          item
            Connection = 'IBX'
            ConnectionType = 'Interbase'
            Default = True
            Name = 'IBX'
            SQL = 'update articulos'#10'set IMAGEN = :IMAGEN'#10'where ID = :ID'#10
            StatementType = stSQL
            ColumnMappings = <>
          end>
        Name = 'ModificarImagen'
      end
      item
        Params = <
          item
            Name = 'id'
            Value = ''
          end>
        Statements = <
          item
            Connection = 'IBX'
            ConnectionType = 'Interbase'
            Default = True
            Name = 'IBX'
            SQL = 'update articulos'#10'set imagen = null'#10'where id = :id'#10
            StatementType = stSQL
            ColumnMappings = <>
          end>
        Name = 'EliminarImagen'
      end
      item
        Params = <
          item
@ -622,70 +730,92 @@ object srvArticulos: TsrvArticulos
        Params = <
          item
            Name = 'ID_EMPRESA'
            DataType = datInteger
            Value = ''
          end
          item
            Name = 'REFERENCIA'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'DESCRIPCION'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'FAMILIA'
-            Value = ''
+            DataType = datString
-          end
+            Size = 255
          item
            Name = 'IMAGEN'
            Value = ''
          end
          item
            Name = 'COMISIONABLE'
            DataType = datSmallInt
            Value = ''
          end
          item
            Name = 'FECHA_ALTA'
            DataType = datDateTime
            Value = ''
          end
          item
            Name = 'FECHA_MODIFICACION'
            DataType = datDateTime
            Value = ''
          end
          item
            Name = 'USUARIO'
            DataType = datString
            Size = 30
            Value = ''
          end
          item
            Name = 'PRECIO_COSTE'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'PRECIO_PORTE'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'DESCUENTO'
            DataType = datFloat
            Value = ''
          end
          item
            Name = 'ID_PROVEEDOR'
            DataType = datInteger
            Value = ''
          end
          item
            Name = 'PRECIO_NETO'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'PRECIO_PVP'
            DataType = datCurrency
            Value = ''
          end
          item
            Name = 'INVENTARIABLE'
            DataType = datSmallInt
            Value = ''
          end
          item
            Name = 'REFERENCIA_PROV'
            DataType = datString
            Size = 255
            Value = ''
          end
          item
            Name = 'ELIMINADO'
            DataType = datSmallInt
            Value = ''
          end
          item
@ -699,14 +829,14 @@ object srvArticulos: TsrvArticulos
            SQL = 
              'UPDATE ARTICULOS'#10'  SET '#10'    ID_EMPRESA = :ID_EMPRESA,'#10'    REFERE' +
              'NCIA = :REFERENCIA, '#10'    DESCRIPCION = :DESCRIPCION, '#10'    FAMILI' +
-              'A = :FAMILIA, '#10'    IMAGEN = :IMAGEN, '#10'    COMISIONABLE = :COMISI' +
+              'A = :FAMILIA, '#10'    COMISIONABLE = :COMISIONABLE,'#10'    FECHA_ALTA ' +
-              'ONABLE, '#10'    FECHA_ALTA = :FECHA_ALTA, '#10'    FECHA_MODIFICACION =' +
+              '= :FECHA_ALTA, '#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION, '#10' ' +
-              ' :FECHA_MODIFICACION, '#10'    USUARIO = :USUARIO, '#10'    PRECIO_COSTE' +
+              '   USUARIO = :USUARIO, '#10'    PRECIO_COSTE = :PRECIO_COSTE, '#10'    P' +
-              ' = :PRECIO_COSTE, '#10'    PRECIO_PORTE = :PRECIO_PORTE, '#10'    DESCUE' +
+              'RECIO_PORTE = :PRECIO_PORTE, '#10'    DESCUENTO = :DESCUENTO, '#10'    I' +
-              'NTO = :DESCUENTO, '#10'    ID_PROVEEDOR = :ID_PROVEEDOR, '#10'    PRECIO' +
+              'D_PROVEEDOR = :ID_PROVEEDOR, '#10'    PRECIO_NETO = :PRECIO_NETO,'#10'  ' +
-              '_NETO = :PRECIO_NETO,'#10'    INVENTARIABLE = :INVENTARIABLE,'#10'    RE' +
+              '  PRECIO_PVP = :PRECIO_PVP,'#10'    INVENTARIABLE = :INVENTARIABLE,'#10 +
-              'FERENCIA_PROV = :REFERENCIA_PROV,'#10'    ELIMINADO = :ELIMINADO'#10'  W' +
+              '    REFERENCIA_PROV = :REFERENCIA_PROV,'#10'    ELIMINADO = :ELIMINA' +
-              'HERE'#10'    (ID = :OLD_ID)'#10
+              'DO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
            StatementType = stSQL
            ColumnMappings = <>
          end>
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
@ -31,13 +31,15 @@ type
    procedure DARemoteServiceCreate(Sender: TObject);
    procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
      var aConnectionName: string);
    function EliminarImagen(const ID_ARTICULO: Integer): Boolean;
    function AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean;
  end;
 implementation
 {$R *.dfm}
 uses
-  {Generated:} FactuGES_Invk, uDataModuleServer, 
+  {Generated:} FactuGES_Invk, uDataModuleServer, uROClasses,
  uDatabaseUtils, schArticulosClient_Intf, uRestriccionesUsuarioUtils;
 procedure Create_srvArticulos(out anInstance : IUnknown);
@ -46,6 +48,50 @@ begin
 end;
 { srvArticulos }
 function TsrvArticulos.AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean;
 var
  AConn : IDAConnection;
  dsData: IDADataset;
  dsCommand: IDASQLCommand;
 begin
  Result := False;
  AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);
  try
    try
      dsData := schArticulos.NewDataset(AConn, 'ExisteImagen', ['ID'], [ID_ARTICULO]);
      dsData.Active := True;
      Result := (dsData.FieldValues[0] > 0);
      AConn.CommitTransaction;
    except
      RaiseError('Error al buscar articulo con imagen');
      AConn.RollbackTransaction;
    end;
  finally
    dsData := NIL;
  end;
  if Result then
  begin
    try
      try
        dsCommand := schArticulos.NewCommand(AConn, 'ModificarImagen');
        dsCommand.ParamByName('ID').AsInteger := ID_ARTICULO;
        dsCommand.ParamByName('IMAGEN').LoadFromFile(AFileName);
        dsCommand.Execute;
        AConn.CommitTransaction;
        Result := True;
      except
        RaiseError('Error al modificar la imagen');
        AConn.RollbackTransaction;
      end;
    finally
      dsCommand := NIL;
    end;
  end;
 end;
 procedure TsrvArticulos.DARemoteServiceBeforeGetDatasetData(
  const Dataset: IDADataset; const IncludeSchema: Boolean;
  const MaxRecords: Integer);
@ -70,6 +116,32 @@ begin
  ConnectionName := dmServer.ConnectionName;
 end;
 function TsrvArticulos.EliminarImagen(const ID_ARTICULO: Integer): Boolean;
 var
  AConn : IDAConnection;
  dsCommand: IDASQLCommand;
 begin
  Result := False;
  AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);
  try
    try
      dsCommand := schArticulos.NewCommand(AConn, 'EliminarImagen');
      with dsCommand do
           ParamByName('ID').AsInteger := ID_ARTICULO;
      dsCommand.Execute;
      AConn.CommitTransaction;
      Result := True;
    except
      RaiseError('Error al eliminar la imagen');
      AConn.RollbackTransaction;
    end;
  finally
    dsCommand := NIL;
  end;
 end;
 initialization
  TROClassFactory.Create('srvArticulos', Create_srvArticulos, TsrvArticulos_Invoker);
--- a/Source/Modulos/Articulos/Views/Articulos_view.RES
+++ b/Source/Modulos/Articulos/Views/Articulos_view.RES
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@ -54,11 +54,11 @@
    <DelphiCompile Include="Articulos_view.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="..\..\Presupuestos de cliente\Views\Articulos_controller.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Views\Articulos_model.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\Articulos_model.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Views\Contactos_view.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\Contactos_view.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Views\Familias_controller.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\Familias_controller.dcp" />
-    <DCCReference Include="..\..\Presupuestos de cliente\Views\GUIBase.dcp" />
+    <DCCReference Include="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Samples\Dynamic Where\GUIBase.dcp" />
    <DCCReference Include="uArticulosViewRegister.pas" />
    <DCCReference Include="uEditorArticulo.pas">
      <Form>fEditorArticulo</Form>
--- a/Source/Modulos/Articulos/Views/uEditorArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorArticulo.dfm
@ -39,7 +39,7 @@ inherited fEditorArticulo: TfEditorArticulo
    Width = 624
    ExplicitWidth = 624
    inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 394
+      ExplicitWidth = 400
      inherited TBXItem2: TTBXItem
        Visible = False
      end
@ -95,18 +95,6 @@ inherited fEditorArticulo: TfEditorArticulo
      end
    end
  end
  inherited pgPaginas: TPageControl
    Width = 624
    Height = 385
    ExplicitWidth = 624
    ExplicitHeight = 385
    inherited pagGeneral: TTabSheet
      ExplicitLeft = 4
      ExplicitTop = 24
      ExplicitWidth = 616
      ExplicitHeight = 357
    end
  end
  inherited StatusBar: TJvStatusBar
    Top = 461
    Width = 624
@ -117,6 +105,25 @@ inherited fEditorArticulo: TfEditorArticulo
    ExplicitTop = 461
    ExplicitWidth = 624
  end
  inherited pgPaginas: TPageControl
    Width = 618
    Height = 349
    ExplicitWidth = 618
    ExplicitHeight = 349
    inherited pagGeneral: TTabSheet
      ExplicitLeft = 4
      ExplicitTop = 24
      ExplicitWidth = 610
      ExplicitHeight = 321
    end
  end
  inherited PnlComentario: TPanel
    Width = 624
    inherited lbComentario: TLabel
      Width = 614
      Height = 25
    end
  end
  inherited EditorActionList: TActionList
    Top = 128
    object actFamilias: TAction
@ -127,7 +134,18 @@ inherited fEditorArticulo: TfEditorArticulo
      OnExecute = actFamiliasExecute
    end
  end
-  inherited SmallImages: TPngImageList
+  inherited dsDataTable: TDADataSource [6]
    Left = 168
    Top = 120
  end
  inherited LargeImages: TPngImageList
    Top = 112
  end
  inherited JvFormStorage: TJvFormStorage
    Left = 400
    Top = 152
  end
  inherited SmallImages: TPngImageList [9]
    PngImages = <
      item
        PngImage.Data = {
@ -633,17 +651,6 @@ inherited fEditorArticulo: TfEditorArticulo
    Top = 112
    Bitmap = {}
  end
  inherited dsDataTable: TDADataSource [6]
    Left = 168
    Top = 120
  end
  inherited LargeImages: TPngImageList [7]
    Top = 112
  end
  inherited JvFormStorage: TJvFormStorage [8]
    Left = 400
    Top = 152
  end
  inherited JvAppRegistryStorage: TJvAppRegistryStorage
    Left = 432
    Top = 152
--- a/Source/Modulos/Articulos/Views/uEditorArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uEditorArticulo.pas
@ -13,7 +13,7 @@ uses
  JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
  uViewArticulos, uIEditorArticulo, uArticulosController, JvExComCtrls,
-  JvStatusBar, dxLayoutLookAndFeels;
+  JvStatusBar, dxLayoutLookAndFeels, uDAInterfaces;
 type
  TfEditorArticulo = class(TfEditorDBItem, IEditorArticulo)
@ -46,6 +46,7 @@ type
    //sobreescribir este metodo
    procedure AsignarVista; virtual;
    procedure PonerTitulos(const ATitulo: string = ''); override;
    function GetModified: Boolean; override;    
  public
    property Articulo: IBizArticulo read GetArticulo write SetArticulo;
@ -74,6 +75,14 @@ begin
  Result := FController;
 end;
 function TfEditorArticulo.GetModified: Boolean;
 begin
  Result := inherited GetModified;
  //COMPROBAMOS SI EN LA VISTA HA HABIDO CAMBIOS EN LA IMAGEN
  if not Result then
     Result := Result or ViewArticulo.Modified;
 end;
 function TfEditorArticulo.GetViewArticulo: IViewArticulo;
 begin
  Result := FViewArticulo;
@ -83,6 +92,7 @@ procedure TfEditorArticulo.GuardarInterno;
 begin
  inherited;
  FController.Guardar(FArticulo);
  ViewArticulo.Modified := False;
  Modified := False;
 end;
--- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
@ -10,6 +10,7 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
    Width = 656
    Caption = 'Lista de art'#237'culos'
    Visible = False
    ExplicitTop = 64
    ExplicitWidth = 656
    inherited Image1: TImage
      Left = 629
@ -20,6 +21,7 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
    Top = 91
    Width = 656
    Height = 49
    ExplicitTop = 91
    ExplicitWidth = 656
    ExplicitHeight = 49
    inherited tbxMain: TTBXToolbar
@ -130,7 +132,7 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
      AlignWithMargins = True
      Left = 25
      Top = 8
-      Width = 606
+      Width = 131
      Height = 13
      Margins.Left = 0
      Margins.Top = 0
@ -144,20 +146,17 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
      Font.Name = 'Tahoma'
      Font.Style = [fsBold]
      ParentFont = False
      ExplicitWidth = 131
    end
    object lblComments: TLabel
      AlignWithMargins = True
      Left = 50
      Top = 29
-      Width = 581
+      Width = 3
-      Height = 27
+      Height = 13
      Margins.Left = 25
      Margins.Top = 0
      Margins.Right = 0
      Align = alClient
      ExplicitLeft = 34
      ExplicitTop = -6
    end
  end
  inherited EditorActionList: TActionList [5]
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@ -177,7 +177,7 @@ inherited frViewArticulo: TfrViewArticulo
      Font.Name = 'Tahoma'
      Font.Style = []
      ParentFont = False
-      TabOrder = 11
+      TabOrder = 12
      ReadOnly = False
      ExplicitLeft = 219
      ExplicitTop = 166
@ -329,6 +329,26 @@ inherited frViewArticulo: TfrViewArticulo
      TabOrder = 4
      Width = 144
    end
    object ePrecioPVP: TcxDBCurrencyEdit
      Left = 103
      Top = 301
      DataBinding.DataField = 'PRECIO_PVP'
      DataBinding.DataSource = dsViewArticulo
      Properties.Alignment.Horz = taRightJustify
      Style.BorderColor = clWindowFrame
      Style.BorderStyle = ebs3D
      Style.HotTrack = False
      Style.LookAndFeel.Kind = lfStandard
      Style.LookAndFeel.NativeStyle = True
      StyleDisabled.LookAndFeel.Kind = lfStandard
      StyleDisabled.LookAndFeel.NativeStyle = True
      StyleFocused.LookAndFeel.Kind = lfStandard
      StyleFocused.LookAndFeel.NativeStyle = True
      StyleHot.LookAndFeel.Kind = lfStandard
      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 11
      Width = 400
    end
    object dxLayoutControlArticuloGroup_Root: TdxLayoutGroup
      ShowCaption = False
      Hidden = True
@ -381,6 +401,7 @@ inherited frViewArticulo: TfrViewArticulo
                  AutoAligns = [aaVertical]
                  AlignHorz = ahClient
                  Caption = ' '
                  Visible = False
                  Control = eNoComisionable
                  ControlOptions.ShowBorder = False
                end
@ -389,6 +410,7 @@ inherited frViewArticulo: TfrViewArticulo
                  AlignHorz = ahClient
                  Caption = ' '
                  ShowCaption = False
                  Visible = False
                  Control = cbNoInventariable
                  ControlOptions.ShowBorder = False
                end
@ -401,7 +423,6 @@ inherited frViewArticulo: TfrViewArticulo
          AlignHorz = ahClient
          AlignVert = avClient
          Caption = 'Imagen'
          Visible = False
          LayoutDirection = ldHorizontal
          object dxLayoutControlArticuloItem6: TdxLayoutItem
            AutoAligns = []
@ -440,34 +461,44 @@ inherited frViewArticulo: TfrViewArticulo
          Caption = 'Datos del proveedor para el art'#237'culo'
          object dxLayoutControlArticuloItem15: TdxLayoutItem
            Caption = 'Ref. del prov:'
            Visible = False
            Control = eReferenciaProv
            ControlOptions.ShowBorder = False
          end
          object dxLayoutControlArticuloItem16: TdxLayoutItem
-            Caption = 'Precio:'
+            Caption = 'Precio coste:'
            Control = ePrecioCoste
            ControlOptions.ShowBorder = False
          end
          object dxLayoutControlArticuloItem17: TdxLayoutItem
            Caption = 'Dto (%):'
            Visible = False
            Control = eDescuento
            ControlOptions.ShowBorder = False
          end
          object dxLayoutControlArticuloItem18: TdxLayoutItem
            Caption = 'Precio neto:'
            Visible = False
            Control = ePrecioNeto
            ControlOptions.ShowBorder = False
          end
          object dxLayoutControlArticuloItem19: TdxLayoutItem
            Caption = 'Coste de envio:'
            Visible = False
            Control = ePrecioPorte
            ControlOptions.ShowBorder = False
          end
          object dxLayoutControlArticuloItem9: TdxLayoutItem
            Caption = 'Precio PVP:'
            Control = ePrecioPVP
            ControlOptions.ShowBorder = False
          end
        end
        object dxLayoutControlArticuloGroup12: TdxLayoutGroup
          AutoAligns = [aaVertical]
          AlignHorz = ahRight
          Caption = 'Proveedor para el art'#237'culo'
          Visible = False
          object dxLayoutControlArticuloItem14: TdxLayoutItem
            Control = frViewDatosYSeleccionProveedor1
            ControlOptions.AutoColor = True
--- a/Source/Modulos/Articulos/Views/uViewArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.pas
@ -71,6 +71,8 @@ type
    dxLayoutControlArticuloItem7: TdxLayoutItem;
    cbNoInventariable: TcxDBCheckBox;
    dxLayoutControlArticuloGroup8: TdxLayoutGroup;
    dxLayoutControlArticuloItem9: TdxLayoutItem;
    ePrecioPVP: TcxDBCurrencyEdit;
    procedure actEliminarExecute(Sender: TObject);
    procedure actAnadirExecute(Sender: TObject);
    procedure cbFamiliaPropertiesInitPopup(Sender: TObject);
@ -82,24 +84,28 @@ type
    procedure PrecioNetoChanged(Sender: TObject);
  private
    procedure CargarImagen;
-    procedure SalvarImagen;
+
  protected
    FFamiliasController: IFamiliasController;
    FController: IArticulosController;
    FArticulo: IBizArticulo;
    FImagenModificada: Boolean;
    function GetArticulo: IBizArticulo;
    procedure SetArticulo(const Value: IBizArticulo); virtual;
    function GetController : IArticulosController;
    procedure SetController (const Value : IArticulosController);
    procedure OnProveedorChanged(Sender: TObject);
  public
    function GetModified: Boolean; override;
    procedure SetModified(const Value: Boolean); override;
    property Articulo: IBizArticulo read GetArticulo write SetArticulo;
    property Controller : IArticulosController read GetController write SetController;
  end;
 implementation
-uses uDataModuleArticulos, uSistemaFunc, uBizFamilias, uBizContactos;
+uses uDataModuleArticulos, uSistemaFunc, schArticulosClient_Intf, uBizFamilias, uBizContactos;
 {$R *.dfm}
@ -111,40 +117,54 @@ uses uDataModuleArticulos, uSistemaFunc, uBizFamilias, uBizContactos;
 }
 procedure TfrViewArticulo.actAnadirExecute(Sender: TObject);
 var
  aAux : String;
 begin
-{  eImagen.LoadFromFile;
+  eImagen.LoadFromFile;
  if Assigned(eImagen.Picture) then
    SalvarImagen;}
 end;
 procedure TfrViewArticulo.actEliminarExecute(Sender: TObject);
 begin
 {  inherited;
  eImagen.Clear;
  FArticulo.QuitarImagen;}
 end;
 procedure TfrViewArticulo.CargarImagen;
 {var
  aAux : String;}
 begin
 {  if FArticulo.HayImagen then
  begin
    ShowHourglassCursor;
    try
      aAux := DarFicheroJPGTemporal;
-      FArticulo.SalvarImagen(aAux);
+      eImagen.Picture.SaveToFile(aAux);
      FController.PonerImagen(Articulo, aAux);
      FImagenModificada := True;
    finally
      DeleteFile(aAux);
      HideHourglassCursor;
    end;
  end;
 end;
 procedure TfrViewArticulo.actEliminarExecute(Sender: TObject);
 begin
  inherited;
  eImagen.Clear;
  FController.QuitarImagen(Articulo);
  FImagenModificada := True;  
 end;
 procedure TfrViewArticulo.CargarImagen;
 var
  aAux : String;
 begin
  if FArticulo.HayImagen then
  begin
    ShowHourglassCursor;
    try
      aAux := DarFicheroJPGTemporal;
      Articulo.DataTable.FieldByName(fld_ArticulosIMAGEN).SaveToFile(aAux);
      try
        eImagen.Picture.LoadFromFile(aAux);
      except
        on EInvalidGraphic do
-          ShowMessage('error');
+          ShowMessage('error de imagen en el articulo');
      end;
    finally
      DeleteFile(aAux);
      HideHourglassCursor;
    end;
-  end;}
+  end;
 end;
 procedure TfrViewArticulo.cbFamiliaPropertiesInitPopup(Sender: TObject);
@ -192,6 +212,7 @@ end;
 procedure TfrViewArticulo.CustomViewCreate(Sender: TObject);
 begin
  inherited;
  FImagenModificada := False;
  FFamiliasController := TFamiliasController.Create;
 end;
@ -220,6 +241,14 @@ begin
  Result := FController;
 end;
 function TfrViewArticulo.GetModified: Boolean;
 begin
  Result := inherited GetModified;
  //COMPROBAMOS SI EN LA VISTA HA HABIDO CAMBIOS EN LA IMAGEN
  if not Result then
     Result := Result or FImagenModificada;
 end;
 procedure TfrViewArticulo.OnProveedorChanged(Sender: TObject);
 begin
  if Assigned(FArticulo) then
@ -236,22 +265,6 @@ begin
     FController.CalcularPrecioNeto(FArticulo);
 end;
 procedure TfrViewArticulo.SalvarImagen;
 {var
  aAux : String;}
 begin
 {  ShowHourglassCursor;
  try
    aAux := DarFicheroJPGTemporal;
    eImagen.Picture.SaveToFile(aAux);
    FArticulo.CargarImagen(aAux);
    Self.Modified := True;
  finally
    DeleteFile(aAux);
    HideHourglassCursor;
  end;}
 end;
 procedure TfrViewArticulo.SetArticulo(const Value: IBizArticulo);
 begin
  FArticulo := Value;
@ -264,7 +277,7 @@ begin
    frViewDatosYSeleccionProveedor1.Proveedor := (FController.ProveedoresController.Buscar(FArticulo.ID_PROVEEDOR) as IBizProveedor);
    frViewDatosYSeleccionProveedor1.OnProveedorChanged := OnProveedorChanged;
-//    CargarImagen;
+    CargarImagen;
  end
  else begin
    dsViewArticulo.DataTable := NIL;
@ -278,5 +291,12 @@ begin
  FController := Value;
 end;
 procedure TfrViewArticulo.SetModified(const Value: Boolean);
 begin
  inherited;
  if not Value then
     FImagenModificada := False;
 end;
 end.
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@ -31,9 +31,11 @@ inherited frViewArticulos: TfrViewArticulos
            Tag = 1
            Value = 1
          end>
        Visible = False
        BestFitMaxWidth = 22
        MinWidth = 22
        Options.HorzSizing = False
        VisibleForCustomization = False
        Width = 22
      end
      object cxGridViewCOMISIONABLE: TcxGridDBColumn
@ -63,9 +65,11 @@ inherited frViewArticulos: TfrViewArticulos
          end>
        Properties.PostPopupValueOnTab = True
        Properties.ShowDescriptions = False
        Visible = False
        BestFitMaxWidth = 22
        MinWidth = 22
        Options.HorzSizing = False
        VisibleForCustomization = False
        Width = 22
      end
      object cxGridViewREFERENCIA: TcxGridDBColumn
@ -89,13 +93,17 @@ inherited frViewArticulos: TfrViewArticulos
      object cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn
        Caption = 'Proveedor'
        DataBinding.FieldName = 'NOMBRE_PROVEEDOR'
        Visible = False
        BestFitMaxWidth = 120
        VisibleForCustomization = False
        Width = 120
      end
      object cxGridViewREFERENCIA_PROV: TcxGridDBColumn
        Caption = 'Ref. proveedor'
        DataBinding.FieldName = 'REFERENCIA_PROV'
        Visible = False
        BestFitMaxWidth = 60
        VisibleForCustomization = False
        Width = 60
      end
      object cxGridViewPRECIO_COSTE: TcxGridDBColumn
@ -112,24 +120,39 @@ inherited frViewArticulos: TfrViewArticulos
        PropertiesClassName = 'TcxSpinEditProperties'
        Properties.Alignment.Horz = taRightJustify
        Properties.DisplayFormat = ',0.00 %;-,0.00 %'
        Visible = False
        FooterAlignmentHorz = taRightJustify
        HeaderAlignmentHorz = taRightJustify
        VisibleForCustomization = False
      end
      object cxGridViewPRECIO_NETO: TcxGridDBColumn
        Caption = 'Precio neto'
        DataBinding.FieldName = 'PRECIO_NETO'
        PropertiesClassName = 'TcxCurrencyEditProperties'
        Properties.Alignment.Horz = taRightJustify
        Visible = False
        FooterAlignmentHorz = taRightJustify
        HeaderAlignmentHorz = taRightJustify
        VisibleForCustomization = False
      end
      object cxGridViewPRECIO_PORTE: TcxGridDBColumn
        Caption = 'Precio porte'
        DataBinding.FieldName = 'PRECIO_PORTE'
        PropertiesClassName = 'TcxCurrencyEditProperties'
        Properties.Alignment.Horz = taRightJustify
        Visible = False
        FooterAlignmentHorz = taRightJustify
        HeaderAlignmentHorz = taRightJustify
        VisibleForCustomization = False
      end
      object cxGridViewPRECIO_PVP: TcxGridDBColumn
        Caption = 'Precio PVP'
        DataBinding.FieldName = 'PRECIO_PVP'
        PropertiesClassName = 'TcxCurrencyEditProperties'
        Properties.Alignment.Horz = taRightJustify
        FooterAlignmentHorz = taRightJustify
        GroupSummaryAlignment = taRightJustify
        HeaderAlignmentHorz = taRightJustify
      end
    end
  end
@ -159,7 +182,6 @@ inherited frViewArticulos: TfrViewArticulos
  end
  inherited pnlAgrupaciones: TTBXDockablePanel
    Visible = True
    ExplicitWidth = 128
    inherited TBXAlignmentPanel1: TTBXAlignmentPanel
      inherited TBXToolbar1: TTBXToolbar
        object TBXSeparatorItem1: TTBXSeparatorItem
--- a/Source/Modulos/Articulos/Views/uViewArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas
@ -37,6 +37,7 @@ type
    TBXSeparatorItem1: TTBXSeparatorItem;
    TBXSeparatorItem2: TTBXSeparatorItem;
    cxGridViewINVENTARIABLE: TcxGridDBColumn;
    cxGridViewPRECIO_PVP: TcxGridDBColumn;
    procedure cxGridViewIDCustomDrawCell(
      Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
      AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@ -117,6 +117,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
  end
  inherited TBXDock1: TTBXDock
    inherited TBXToolbar1: TTBXToolbar
      ExplicitWidth = 451
      object TBXItem12: TTBXItem [0]
        Action = actAnadirArticulos
        DisplayMode = nbdmImageAndText
@ -127,9 +128,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
    object actAnadirArticulos: TAction
      Category = 'Operaciones'
      Caption = 'A'#241'adir art'#237'culos'
      Enabled = False
      ImageIndex = 12
      Visible = False
      OnExecute = actAnadirArticulosExecute
      OnUpdate = actAnadirArticulosUpdate
    end
--- a/cliente/Controller/uContratosClienteController.pas
+++ b/cliente/Controller/uContratosClienteController.pas
@ -741,7 +741,7 @@ begin
        AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA));
        AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA));
        AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA));
-        (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_C_VACIO, 'MUEBLES DE COCINA ', False, AContrato.Detalles);
+        (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_C, 'MUEBLES DE COCINA ', False, AContrato.Detalles);
        (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'IMPORTES ', True, AContrato.Detalles);
        (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'AUMENTO POR ', False, AContrato.Detalles);
      end;
--- a/cliente/Controller/uDetallesContratoClienteController.pas
+++ b/cliente/Controller/uDetallesContratoClienteController.pas
@ -224,11 +224,10 @@ end;
 procedure TDetallesContratoClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
 begin
-//Como en tecsitel no hay descuento por linea de detalle, solo recuperamos nuevamente el valor del articulo cuando el detalle no tenga niguno
+//Para acana el importa a cargar en la lista será siempre el precio PVP
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
  if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
     if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
     else
       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
--- a/cliente/Controller/uDetallesFacturaClienteController.pas
+++ b/cliente/Controller/uDetallesFacturaClienteController.pas
@ -158,8 +158,9 @@ end;
 procedure TDetallesFacturaClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
 begin
 //Para acana el importa a cargar en la lista será siempre el precio PVP
  if Assigned(AArticulos) then
-    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE
+    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
  else
    ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
--- a/Source/Modulos/Familias/Plugin/uPluginFamilias.dfm
+++ b/Source/Modulos/Familias/Plugin/uPluginFamilias.dfm
@ -35,7 +35,7 @@ object PluginFamilias: TPluginFamilias
    object Ventas1: TMenuItem
      Caption = 'Datos'
      object Familias1: TMenuItem
-        Tag = 19000
+        Tag = 900
        Action = actFamilias
      end
    end
--- a/Source/Modulos/Inventario/Controller/Inventario_controller.rc
+++ b/Source/Modulos/Inventario/Controller/Inventario_controller.rc
@ -0,0 +1,22 @@
 1 VERSIONINFO
 FILEVERSION 1,0,0,0
 PRODUCTVERSION 1,0,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
         BLOCK "0C0A04E4"
         BEGIN
              VALUE "FileVersion", "1.0.0.0\0"
              VALUE "ProductVersion", "1.0.0.0\0"
         END
    END
    BLOCK "VarFileInfo"
    BEGIN
         VALUE "Translation", 0x0C0A, 1252
    END
 END
--- a/Source/Modulos/Inventario/Controller/uInventarioController.pas
+++ b/Source/Modulos/Inventario/Controller/uInventarioController.pas
@ -680,11 +680,11 @@ begin
     exit;
  try
-    APresupuesto := FPresupuestosClienteController.BuscarPendientes;
+//    APresupuesto := FPresupuestosClienteController.BuscarPendientes;
-    APresupuesto := FPresupuestosClienteController.ElegirPresupuestos(APresupuesto, '', False);
+//    APresupuesto := FPresupuestosClienteController.ElegirPresupuestos(APresupuesto, '', False);
-    if Assigned(APresupuesto) then
+//    if Assigned(APresupuesto) then
-       Reservar(AInventario, False, APresupuesto);
+//       Reservar(AInventario, False, APresupuesto);
  finally
    APresupuesto := Nil;
--- a/Source/Modulos/Inventario/Data/Inventario_data.rc
+++ b/Source/Modulos/Inventario/Data/Inventario_data.rc
@ -0,0 +1,22 @@
 1 VERSIONINFO
 FILEVERSION 1,0,0,0
 PRODUCTVERSION 1,0,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
         BLOCK "0C0A04E4"
         BEGIN
              VALUE "FileVersion", "1.0.0.0\0"
              VALUE "ProductVersion", "1.0.0.0\0"
         END
    END
    BLOCK "VarFileInfo"
    BEGIN
         VALUE "Translation", 0x0C0A, 1252
    END
 END
--- a/Source/Modulos/Inventario/Model/Inventario_model.rc
+++ b/Source/Modulos/Inventario/Model/Inventario_model.rc
@ -0,0 +1,22 @@
 1 VERSIONINFO
 FILEVERSION 1,0,0,0
 PRODUCTVERSION 1,0,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
         BLOCK "0C0A04E4"
         BEGIN
              VALUE "FileVersion", "1.0.0.0\0"
              VALUE "ProductVersion", "1.0.0.0\0"
         END
    END
    BLOCK "VarFileInfo"
    BEGIN
         VALUE "Translation", 0x0C0A, 1252
    END
 END
--- a/Source/Modulos/Inventario/Plugin/Inventario_plugin.dproj
+++ b/Source/Modulos/Inventario/Plugin/Inventario_plugin.dproj
@ -41,20 +41,19 @@
    <Borland.Personality>Delphi.Personality</Borland.Personality>
    <Borland.ProjectType>Package</Borland.ProjectType>
    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Inventario_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Inventario_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
  </ProjectExtensions>
  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
  <ItemGroup>
    <DelphiCompile Include="Inventario_plugin.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Inventario_controller.dcp" />
+    <DCCReference Include="..\Inventario_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Inventario_model.dcp" />
+    <DCCReference Include="..\Inventario_model.dcp" />
-    <DCCReference Include="..\..\Lib\Inventario_view.dcp" />
+    <DCCReference Include="..\Inventario_view.dcp" />
    <DCCReference Include="uPluginInventario.pas" />
  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
--- a/Source/Modulos/Inventario/Views/Inventario_view.dproj
+++ b/Source/Modulos/Inventario/Views/Inventario_view.dproj
@ -39,17 +39,17 @@
    <Borland.Personality>Delphi.Personality</Borland.Personality>
    <Borland.ProjectType>Package</Borland.ProjectType>
    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Inventario_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Inventario_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
  </ProjectExtensions>
  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
  <ItemGroup>
    <DelphiCompile Include="Inventario_view.dpk">
      <MainSource>MainSource</MainSource>
    </DelphiCompile>
-    <DCCReference Include="..\..\..\GUIBase\Articulos_view.dcp" />
+    <DCCReference Include="..\Articulos_view.dcp" />
-    <DCCReference Include="..\..\..\GUIBase\GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\GUIBase\Inventario_controller.dcp" />
+    <DCCReference Include="..\Inventario_controller.dcp" />
-    <DCCReference Include="..\..\..\GUIBase\Inventario_model.dcp" />
+    <DCCReference Include="..\Inventario_model.dcp" />
    <DCCReference Include="uEditorDetalleReservas.pas">
      <Form>fEditorDetalleReservas</Form>
      <DesignClass>TfEditorDetalleReservas</DesignClass>
--- a/cliente/Controller/uDetallesPresupuestoClienteController.pas
+++ b/cliente/Controller/uDetallesPresupuestoClienteController.pas
@ -335,11 +335,10 @@ end;
 procedure TDetallesPresupuestoClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
 begin
-//Como en tecsitel no hay descuento por linea de detalle, solo recuperamos nuevamente el valor del articulo cuando el detalle no tenga niguno
+//Para acana el importa a cargar en la lista será siempre el precio PVP
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
  if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
     if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
     else
       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
--- a/cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm
+++ b/cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm
@ -1,6 +1,14 @@
 inherited fEditorElegirArticulosPresupuestoCliente: TfEditorElegirArticulosPresupuestoCliente
  Caption = 'fEditorElegirArticulosPresupuestoCliente'
  ExplicitHeight = 478
  PixelsPerInch = 96
  TextHeight = 13
  inherited pnlHeader: TPanel
    inherited lblTitle: TLabel
      Width = 606
    end
    inherited lblComments: TLabel
      Width = 581
      Height = 27
    end
  end
 end
--- a/cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas
+++ b/cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas
@ -10,12 +10,12 @@ uses
  JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
  TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
  JvgWizardHeader, uIEditorElegirArticulosPresupuestosCliente, uDAInterfaces,
-  uViewGridBase, uViewGrid, uViewArticulos;
+  uViewGridBase, uViewGrid, uViewArticulos, StdCtrls;
 type
  TfEditorElegirArticulosPresupuestoCliente = class(TfEditorElegirArticulos, IEditorElegirArticulosPresupuestosCliente)
-  public
+  protected
-    constructor Create(AOwner: TComponent); override;
+    procedure AsignarVista; override;
  end;
@ -26,10 +26,10 @@ uses uViewElegirArticulosPresupuestosCliente;
 { TfEditorElegirArticulosPedidoCliente }
-constructor TfEditorElegirArticulosPresupuestoCliente.Create(AOwner: TComponent);
+procedure TfEditorElegirArticulosPresupuestoCliente.AsignarVista;
 begin
  inherited;
  ViewGrid := CreateView(TfrViewElegirArticulosPresupuestosCliente) as IViewElegirArticulosPresupuestosCliente;
 end;
 end.
--- a/cliente/Views/uEditorPresupuestoCliente.dfm
+++ b/cliente/Views/uEditorPresupuestoCliente.dfm
@ -5,7 +5,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
  ClientHeight = 676
  ClientWidth = 848
  OnClose = CustomEditorClose
  ExplicitTop = -147
  ExplicitWidth = 856
  ExplicitHeight = 710
  PixelsPerInch = 96
@ -178,6 +177,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
  inherited pgPaginas: TPageControl
    Width = 842
    Height = 317
    ActivePage = pagContenido
    TabOrder = 1
    OnChanging = pgPaginasChanging
    ExplicitWidth = 842
@ -232,57 +232,57 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
            ExplicitWidth = 58
          end
          inherited UpDown1: TUpDown
-            Left = 587
+            Left = 571
            Top = 0
-            ExplicitLeft = 587
+            ExplicitLeft = 571
            ExplicitTop = 0
          end
          inherited ToolButton13: TToolButton
-            Left = 604
+            Left = 588
            Top = 0
-            ExplicitLeft = 604
+            ExplicitLeft = 588
            ExplicitTop = 0
          end
          inherited ToolButton6: TToolButton
-            Left = 612
+            Left = 596
            Top = 0
-            ExplicitLeft = 612
+            ExplicitLeft = 596
            ExplicitTop = 0
          end
          inherited ToolButton7: TToolButton
-            Left = 646
+            Left = 630
            Top = 0
-            ExplicitLeft = 646
+            ExplicitLeft = 630
            ExplicitTop = 0
          end
          inherited ToolButton8: TToolButton
-            Left = 680
+            Left = 664
            Top = 0
-            ExplicitLeft = 680
+            ExplicitLeft = 664
            ExplicitTop = 0
          end
          inherited ToolButton12: TToolButton
-            Left = 714
+            Left = 698
            Top = 0
-            ExplicitLeft = 714
+            ExplicitLeft = 698
            ExplicitTop = 0
          end
          inherited ToolButton9: TToolButton
-            Left = 722
+            Left = 706
            Top = 0
-            ExplicitLeft = 722
+            ExplicitLeft = 706
            ExplicitTop = 0
          end
          inherited ToolButton10: TToolButton
-            Left = 756
+            Left = 740
            Top = 0
-            ExplicitLeft = 756
+            ExplicitLeft = 740
            ExplicitTop = 0
          end
          inherited ToolButton11: TToolButton
-            Left = 790
+            Left = 774
            Top = 0
-            ExplicitLeft = 790
+            ExplicitLeft = 774
            ExplicitTop = 0
          end
        end
@ -300,7 +300,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
          ExplicitTop = 24
          ExplicitWidth = 834
          inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 564
+            ExplicitWidth = 665
          end
        end
        inherited cxLookupComboBox1: TcxLookupComboBox
--- a/cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm
+++ b/cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm
@ -1,4 +1,28 @@
 inherited frViewElegirArticulosPresupuestosCliente: TfrViewElegirArticulosPresupuestosCliente
  inherited frViewFiltroBase1: TfrViewFiltroBase
    inherited TBXDockablePanel1: TTBXDockablePanel
      inherited dxLayoutControl1: TdxLayoutControl
        inherited txtFiltroTodo: TcxTextEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
        end
        inherited edtFechaIniFiltro: TcxDateEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
        end
        inherited edtFechaFinFiltro: TcxDateEdit
          Style.LookAndFeel.SkinName = ''
          StyleDisabled.LookAndFeel.SkinName = ''
          StyleFocused.LookAndFeel.SkinName = ''
          StyleHot.LookAndFeel.SkinName = ''
        end
      end
    end
  end
  inherited dxComponentPrinter: TdxComponentPrinter
    inherited dxComponentPrinterLink: TdxGridReportLink
      ReportDocument.CreationDate = 39297.755936412040000000
--- a/cliente/Views/uViewElegirArticulosPresupuestosCliente.pas
+++ b/cliente/Views/uViewElegirArticulosPresupuestosCliente.pas
@ -12,7 +12,7 @@ uses
  uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView,
  cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg,
  ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase,
-  uDAInterfaces;
+  uDAInterfaces, uCustomView, uViewBase;
 type
  IViewElegirArticulosPresupuestosCliente = interface(IViewArticulos)
--- a/Source/Servicios/FactuGES.RODL
+++ b/Source/Servicios/FactuGES.RODL
@ -198,6 +198,24 @@
 <Interfaces>
 <Interface Name="Default" UID="{CFBE5841-DF0F-48AD-853E-A35FDA989E6E}">
 <Operations>
 <Operation Name="EliminarImagen" UID="{401CEB37-3FE2-4F97-BF0B-DD332905EF1A}">
 <Parameters>
 <Parameter Name="Result" DataType="Boolean" Flag="Result">
 </Parameter>
 <Parameter Name="ID_ARTICULO" DataType="Integer" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>
 <Operation Name="AnadirImagen" UID="{7348AF1D-3064-4CD9-86CA-2DFAA325A846}">
 <Parameters>
 <Parameter Name="Result" DataType="Boolean" Flag="Result">
 </Parameter>
 <Parameter Name="ID_ARTICULO" DataType="Integer" Flag="In" >
 </Parameter>
 <Parameter Name="AFileName" DataType="AnsiString" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>
 </Operations>
 </Interface>
 </Interfaces>
--- a/Source/Servicios/FactuGES_Intf.pas
+++ b/Source/Servicios/FactuGES_Intf.pas
@ -417,6 +417,8 @@ type
  { IsrvArticulos }
  IsrvArticulos = interface(IDataAbstractService)
    ['{CFBE5841-DF0F-48AD-853E-A35FDA989E6E}']
    function EliminarImagen(const ID_ARTICULO: Integer): Boolean;
    function AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean;
  end;
  { CosrvArticulos }
@ -429,6 +431,8 @@ type
  protected
    function __GetInterfaceName:string; override;
    function EliminarImagen(const ID_ARTICULO: Integer): Boolean;
    function AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean;
  end;
  { IsrvRecibosCliente }
@ -1612,11 +1616,46 @@ begin
  result := TsrvArticulos_Proxy.Create(aMessage, aTransportChannel);
 end;
 { TsrvArticulos_Proxy }
 function TsrvArticulos_Proxy.__GetInterfaceName:string;
 begin
  result := 'srvArticulos';
 end;
 function TsrvArticulos_Proxy.EliminarImagen(const ID_ARTICULO: Integer): Boolean;
 begin
  try
    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'EliminarImagen');
    __Message.Write('ID_ARTICULO', TypeInfo(Integer), ID_ARTICULO, []);
    __Message.Finalize;
    __TransportChannel.Dispatch(__Message);
    __Message.Read('Result', TypeInfo(Boolean), result, []);
  finally
    __Message.UnsetAttributes(__TransportChannel);
    __Message.FreeStream;
  end
 end;
 function TsrvArticulos_Proxy.AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean;
 begin
  try
    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'AnadirImagen');
    __Message.Write('ID_ARTICULO', TypeInfo(Integer), ID_ARTICULO, []);
    __Message.Write('AFileName', TypeInfo(AnsiString), AFileName, []);
    __Message.Finalize;
    __TransportChannel.Dispatch(__Message);
    __Message.Read('Result', TypeInfo(Boolean), result, []);
  finally
    __Message.UnsetAttributes(__TransportChannel);
    __Message.FreeStream;
  end
 end;
 { CosrvRecibosCliente }
 class function CosrvRecibosCliente.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvRecibosCliente;
--- a/Source/Servicios/FactuGES_Invk.pas
+++ b/Source/Servicios/FactuGES_Invk.pas
@ -126,6 +126,8 @@ type
  public
    constructor Create; override;
  published
    procedure Invoke_EliminarImagen(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
    procedure Invoke_AnadirImagen(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
  end;
  TsrvRecibosCliente_Invoker = class(TDataAbstractService_Invoker)
@ -694,6 +696,48 @@ begin
  FAbstract := False;
 end;
 procedure TsrvArticulos_Invoker.Invoke_EliminarImagen(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function EliminarImagen(const ID_ARTICULO: Integer): Boolean; }
 var
  ID_ARTICULO: Integer;
  lResult: Boolean;
 begin
  try
    __Message.Read('ID_ARTICULO', TypeInfo(Integer), ID_ARTICULO, []);
    lResult := (__Instance as IsrvArticulos).EliminarImagen(ID_ARTICULO);
    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvArticulos', 'EliminarImagenResponse');
    __Message.Write('Result', TypeInfo(Boolean), lResult, []);
    __Message.Finalize;
    __Message.UnsetAttributes(__Transport);
  finally
  end;
 end;
 procedure TsrvArticulos_Invoker.Invoke_AnadirImagen(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function AnadirImagen(const ID_ARTICULO: Integer; const AFileName: AnsiString): Boolean; }
 var
  ID_ARTICULO: Integer;
  AFileName: AnsiString;
  lResult: Boolean;
 begin
  try
    __Message.Read('ID_ARTICULO', TypeInfo(Integer), ID_ARTICULO, []);
    __Message.Read('AFileName', TypeInfo(AnsiString), AFileName, []);
    lResult := (__Instance as IsrvArticulos).AnadirImagen(ID_ARTICULO, AFileName);
    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvArticulos', 'AnadirImagenResponse');
    __Message.Write('Result', TypeInfo(Boolean), lResult, []);
    __Message.Finalize;
    __Message.UnsetAttributes(__Transport);
  finally
  end;
 end;
 { TsrvRecibosCliente_Invoker }
 constructor TsrvRecibosCliente_Invoker.Create;
--- a/Source/Servicios/RODLFile.res
+++ b/Source/Servicios/RODLFile.res
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@ -58,8 +58,6 @@ uses
  uBizPedidosProveedorServer in '..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas',
  uBizAlbaranProveedorServer in '..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS',
  uBizFacturasProveedorServer in '..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas',
  schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
  schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
  srvRemesasCliente_Impl in '..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas' {srvRemesasCliente: TDataAbstractService},
  srvRemesasProveedor_Impl in '..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas' {srvRemesasProveedor: TDataAbstractService},
  srvInventario_Impl in '..\Modulos\Inventario\Servidor\srvInventario_Impl.pas' {srvInventario: TDataAbstractService},
@ -136,7 +134,9 @@ uses
  schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
  schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
-  schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas';
+  schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
  schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
  schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas';
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@ -1,294 +1,301 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
+  <PropertyGroup>
-		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-		<MainSource>FactuGES_Server.dpr</MainSource>
+    <MainSource>FactuGES_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_Define>RELEASE</DCC_Define>
+    <DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;</DCC_Define>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-	</PropertyGroup>
+  </PropertyGroup>
-	<ProjectExtensions>
+  <ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
+    <Borland.ProjectType />
-		<BorlandProject>
+    <BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</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">2.4.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 11 de octubre de 2010 10:56</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</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">2.4.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 11 de octubre de 2010 10:56</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
+      
-					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+      
-	</ProjectExtensions>
+      
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+      
-	<ItemGroup>
+      
-		<DelphiCompile Include="FactuGES_Server.dpr">
+      
-			<MainSource>MainSource</MainSource>
+      
-		</DelphiCompile>
+      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
-		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas"/>
+    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas"/>
+  </ProjectExtensions>
-		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas"/>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-		<DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
+  <ItemGroup>
-			<Form>srvEjercicios</Form>
+    <DelphiCompile Include="FactuGES_Server.dpr">
-			<DesignClass>TDataAbstractService</DesignClass>
+      <MainSource>MainSource</MainSource>
-		</DCCReference>
+    </DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas" />
-			<Form>srvEmpresas</Form>
+    <DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
+      <Form>srvEjercicios</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+    </DCCReference>
-			<Form>srvProvinciasPoblaciones</Form>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-			<DesignClass>TRORemoteDataModule</DesignClass>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+      <Form>srvEmpresas</Form>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+      <Form>srvProvinciasPoblaciones</Form>
-		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+      <DesignClass>TRORemoteDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
-			<Form>srvAlbaranesCliente</Form>
+    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-			<Form>srvAlbaranesProveedor</Form>
+      <Form>srvAlbaranesCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-			<Form>srvAlmacenes</Form>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
+      <Form>srvAlbaranesProveedor</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
+      <Form>srvAlmacenes</Form>
-		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+    </DCCReference>
-			<Form>RptComisiones</Form>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
-		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
-			<Form>srvComisiones</Form>
+    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas"/>
+      <Form>RptComisiones</Form>
-		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
+    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-			<Form>srvContabilidad</Form>
+      <Form>srvComisiones</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+    <DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+      <Form>srvContabilidad</Form>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+    </DCCReference>
-			<Form>RptEtiquetasContacto</Form>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-			<Form>srvContactos</Form>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-			<DesignClass>TDARemoteService</DesignClass>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-		<DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas"/>
+      <Form>RptEtiquetasContacto</Form>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-			<Form>RptContratosCliente</Form>
+      <Form>srvContactos</Form>
-		</DCCReference>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
+    </DCCReference>
-			<Form>srvContratosCliente</Form>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+      <Form>RptContratosCliente</Form>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas">
-			<Form>RptFacturasCliente</Form>
+      <Form>srvContratosCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-			<Form>srvFacturasCliente</Form>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+      <Form>RptFacturasCliente</Form>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-			<Form>RptFacturasProveedor</Form>
+      <Form>srvFacturasCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-			<Form>srvFacturasProveedor</Form>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+      <Form>RptFacturasProveedor</Form>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+      <Form>srvFacturasProveedor</Form>
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+    </DCCReference>
-			<Form>srvGestorDocumentos</Form>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
-		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-			<Form>srvGestorInformes</Form>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+      <Form>srvGestorDocumentos</Form>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+    </DCCReference>
-			<Form>srvHistoricoMovimientos</Form>
+    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
+      <Form>srvGestorInformes</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-			<Form>srvInventario</Form>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
+      <Form>srvHistoricoMovimientos</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-			<Form>srvPedidosProveedor</Form>
+      <Form>srvInventario</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-			<Form>RptPresupuestosCliente</Form>
+      <Form>srvPedidosProveedor</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+    </DCCReference>
-			<Form>srvPresupuestosCliente</Form>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+      <Form>RptPresupuestosCliente</Form>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+      <Form>srvPresupuestosCliente</Form>
-			<Form>RptRecibosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-			<Form>srvRecibosCliente</Form>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+      <Form>RptRecibosCliente</Form>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+      <Form>srvRecibosCliente</Form>
-			<Form>RptRecibosProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-			<Form>srvRecibosProveedor</Form>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+      <Form>RptRecibosProveedor</Form>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+    </DCCReference>
-			<Form>srvReferencias</Form>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
+      <Form>srvRecibosProveedor</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-			<Form>srvRemesasCliente</Form>
+      <Form>srvReferencias</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-			<Form>srvRemesasProveedor</Form>
+      <Form>srvRemesasCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+      <Form>srvRemesasProveedor</Form>
-		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+      <DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvUnidadesMedida</Form>
+    </DCCReference>
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-			<Form>srvConfiguracion</Form>
+    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
+      <Form>srvUnidadesMedida</Form>
-		</DCCReference>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
+    </DCCReference>
-			<Form>frConexionBD</Form>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-			<DesignClass>TFrame</DesignClass>
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-		</DCCReference>
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>srvConfiguracion</Form>
-			<Form>frConfGeneral</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TFrame</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConexionBD.pas">
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>frConexionBD</Form>
-			<Form>fConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
-			<DesignClass>TForm</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>frConfGeneral</Form>
-			<Form>FrameConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
-			<DesignClass>TFrame</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
-		<DCCReference Include="srvLogin_Impl.pas">
+      <Form>fConfiguracion</Form>
-			<Form>srvLogin</Form>
+      <DesignClass>TForm</DesignClass>
-			<DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-		<DCCReference Include="uAcercaDe.pas">
+      <Form>FrameConfiguracion</Form>
-			<Form>fAcercaDe</Form>
+      <DesignClass>TFrame</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
+    <DCCReference Include="srvLogin_Impl.pas">
-			<Form>dmServer</Form>
+      <Form>srvLogin</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uServerMainForm.pas">
+    <DCCReference Include="uAcercaDe.pas">
-			<Form>fServerForm</Form>
+      <Form>fAcercaDe</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
+    <DCCReference Include="uDataModuleServer.pas">
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+      <Form>dmServer</Form>
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+    </DCCReference>
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+    <DCCReference Include="uServerMainForm.pas">
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+      <Form>fServerForm</Form>
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+    </DCCReference>
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+    <DCCReference Include="Utiles\RegExpr.pas" />
-	</ItemGroup>
+    <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]
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@ -16,7 +16,7 @@ BEGIN
              VALUE "FileVersion", "2.4.5.0\0"
              VALUE "ProductName", "FactuGES (Servidor)\0"
              VALUE "ProductVersion", "2.4.5.0\0"
-              VALUE "CompileDate", "miércoles, 13 de octubre de 2010 16:56\0"
+              VALUE "CompileDate", "jueves, 12 de abril de 2012 11:18\0"
         END
    END
    BLOCK "VarFileInfo"
--- a/Source/Servidor/FactuGES_Server.res
+++ b/Source/Servidor/FactuGES_Server.res