diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 570327e..5f8ccd8 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 6e71fed..b24066d 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -2894,6 +2894,9 @@ CREATE VIEW V_INVENTARIO(
     DESCRIPCION,
     REFERENCIA_FAB,
     UNIDAD_MEDIDA,
+    CAMPOTECNICO,
+    CODIGOTECNICO,
+    DISENOTECNICO,
     STOCK,
     UNIDADES_ALMACEN,
     RESERVA,
@@ -2909,6 +2912,10 @@ SELECT ID_ALMACEN,
        ARTICULOS.DESCRIPCION,
        ARTICULOS.REFERENCIA_FABR,
        ARTICULOS.UNIDAD_MEDIDA,
+       ARTICULOS.CAMPOTECNICO,
+       ARTICULOS.CODIGOTECNICO,
+       ARTICULOS.DISENOTECNICO,
+
 /*       COALESCE(ARTICULOS.PRECIO_NETO,0) as PRECIO_NETO,*/
        (SUM(STOCK) - SUM(RESERVA)) as STOCK,
        SUM(STOCK) as UNIDADES_ALMACEN,
@@ -2940,7 +2947,11 @@ GROUP BY ID_ALMACEN,
          ARTICULOS.FAMILIA,
          ARTICULOS.DESCRIPCION,
          ARTICULOS.REFERENCIA_FABR,
-         ARTICULOS.UNIDAD_MEDIDA
+         ARTICULOS.UNIDAD_MEDIDA,
+         ARTICULOS.CAMPOTECNICO,
+         ARTICULOS.CODIGOTECNICO,
+         ARTICULOS.DISENOTECNICO
+
 /*         ARTICULOS.PRECIO_NETO*/
 
 /*QUITAMOS AQUELLAS TUPLAS DE LAS QUE NO TENEMOS UNIDADES EN EL ALAMCEN, NO HAY RESERVAS NI PEDIDOS PENDIENTES DE RECIBIR*/
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 990c17d..040f139 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -45,6 +45,10 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\RemObjects_Indy_D11.bpl">RemObjects SDK - Indy Library</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f3..1641339 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index 7a1391b..e443745 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -1,9 +1,7 @@
 program FactuGES;
 
 uses
-//  ExceptionLog,
-//  ExceptionLog,
-//  ExceptionLog,
+  ExceptionLog,
   Forms,
   Windows,
   SysUtils,
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
index 464bad0..b60ed88 100644
--- a/Source/Cliente/uBootStrap.pas
+++ b/Source/Cliente/uBootStrap.pas
@@ -51,7 +51,7 @@ begin
 //    LoadModule('RemesasProveedor_plugin.bpl');
 
     LoadModule('Inventario_plugin.bpl');
-//    LoadModule('HistoricoMovimientos_plugin.bpl');
+    LoadModule('HistoricoMovimientos_plugin.bpl');
 
 //    LoadModule('GestorInformes_plugin.bpl');    
   end;
diff --git a/Source/Modulos/Historico de movimientos/Views/HistoricoMovimientos_view.dproj b/Source/Modulos/Historico de movimientos/Views/HistoricoMovimientos_view.dproj
index 0474f71..e912f48 100644
--- a/Source/Modulos/Historico de movimientos/Views/HistoricoMovimientos_view.dproj	
+++ b/Source/Modulos/Historico de movimientos/Views/HistoricoMovimientos_view.dproj	
@@ -39,15 +39,15 @@
     <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">HistoricoMovimientos_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">HistoricoMovimientos_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="HistoricoMovimientos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\HistoricoMovimientos_controller.dcp" />
-    <DCCReference Include="..\..\Lib\HistoricoMovimientos_model.dcp" />
+    <DCCReference Include="..\HistoricoMovimientos_controller.dcp" />
+    <DCCReference Include="..\HistoricoMovimientos_model.dcp" />
     <DCCReference Include="uEditorHistoricoMovimientos.pas">
       <Form>fEditorHistoricoMovimientos</Form>
       <DesignClass>TfrEditorHistoricoMovimientos</DesignClass>
@@ -59,10 +59,9 @@
     </DCCReference>
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm
index 76d7d7f..4d5eaab 100644
--- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm	
+++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm	
@@ -137,10 +137,10 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     Width = 902
     ExplicitWidth = 902
     inherited tbxMain: TSpTBXToolbar
-      ExplicitWidth = 606
+      ExplicitWidth = 358
     end
     inherited tbxFiltro: TSpTBXToolbar
-      ExplicitWidth = 269
+      ExplicitWidth = 328
       inherited TBXItem37: TSpTBXItem
         Visible = False
       end
@@ -149,9 +149,9 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
       ExplicitWidth = 902
     end
     inherited TBXTMain2: TSpTBXToolbar
-      Left = 275
+      Left = 328
       DockPos = 275
-      ExplicitLeft = 275
+      ExplicitLeft = 328
     end
   end
   inherited StatusBar: TJvStatusBar
@@ -197,12 +197,33 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
             Kind = skCount
             Column = frViewHistoricoMovimientos1.cxGridViewFECHA
           end>
+        inherited cxGridViewFAMILIA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewFABRICANTE: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewREFERENCIA_FABR: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
       Width = 902
       ExplicitWidth = 902
       inherited TBXDockablePanel1: TSpTBXDockablePanel
+        Width = 902
         ExplicitWidth = 902
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 902
@@ -224,29 +245,29 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
             Width = 121
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 225
+            Left = 326
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 225
+            ExplicitLeft = 326
             ExplicitWidth = 121
             Width = 121
           end
           inherited eLista: TcxComboBox
-            Left = 383
+            Left = 551
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 383
+            ExplicitLeft = 551
             ExplicitWidth = 215
             Width = 215
           end
         end
         inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-          Width = 902
-          ExplicitWidth = 902
+          Width = 892
+          ExplicitWidth = 892
           inherited tbxBotones: TSpTBXToolbar
             Width = 892
             ExplicitWidth = 892
@@ -256,14 +277,15 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     end
     inherited pnlAgrupaciones: TSpTBXDockablePanel
       Top = 473
+      Width = 902
       ExplicitTop = 473
       ExplicitWidth = 902
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 902
         ExplicitWidth = 902
         inherited TBXToolbar1: TSpTBXToolbar
-          Width = 892
-          ExplicitWidth = 892
+          Width = 902
+          ExplicitWidth = 902
         end
       end
     end
@@ -273,6 +295,9 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
         BuiltInReportLink = True
       end
     end
+    inherited dxPSEngineController1: TdxPSEngineController
+      Active = True
+    end
     inherited cxViewGridPopupMenu: TcxGridPopupMenu
       PopupMenus = <
         item
@@ -312,6 +337,10 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     inherited actAnchoAuto: TAction
       ImageIndex = 27
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
   end
   inherited SmallImages: TPngImageList [5]
     PngImages = <
diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas
index 22b4d7b..c1259c5 100644
Binary files a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas and b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas differ
diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm
index 9b17bf9..64bd2e7 100644
--- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm	
+++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm	
@@ -155,6 +155,7 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos
     end
   end
   inherited dxPSEngineController1: TdxPSEngineController
+    Active = True
     Left = 328
     Top = 160
   end
diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas
index bfd79e9..a662962 100644
--- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas	
+++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas	
@@ -14,7 +14,10 @@ uses
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizHistoricoMovimientos, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, SpTBXItem,
-  TB2Toolbar, SpTBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces;
+  TB2Toolbar, SpTBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces,
+  cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore, dxPSPDFExport,
+  cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv, dxPScxEditorProducers,
+  dxPScxExtEditorProducers, dxPScxPageControlProducer, uCustomView, uViewBase;
     
 type
   IViewHistoricoMovimientos = interface(IViewGrid)
diff --git a/Source/Modulos/Inventario/Controller/uArticulosInventarioController.pas b/Source/Modulos/Inventario/Controller/uArticulosInventarioController.pas
index c54adbf..b4b4b93 100644
--- a/Source/Modulos/Inventario/Controller/uArticulosInventarioController.pas
+++ b/Source/Modulos/Inventario/Controller/uArticulosInventarioController.pas
@@ -8,18 +8,20 @@ uses
 type
   IArticulosInventarioController = interface(IArticulosController)
   ['{33B26E09-ABE8-45A4-B9B3-E0E48F8EBB3E}']
+    procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
   end;
 
   TArticulosInventarioController = class(TArticulosController, IArticulosInventarioController)
   public
     function ElegirArticulos(AArticulos : IBizArticulo; AMensaje: String; AMultiSelect: Boolean): IBizArticulo; override;
+    procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
   end;
 
 implementation
 
 { TArticulosInventarioController }
 
-uses Controls, cxControls, uIEditorElegirArticulosCatalogo;
+uses Controls, cxControls, uIEditorElegirArticulosCatalogo, uEditorColores;
 
 function TArticulosInventarioController.ElegirArticulos(AArticulos: IBizArticulo; AMensaje: String;
   AMultiSelect: Boolean): IBizArticulo;
@@ -41,4 +43,36 @@ begin
     end;
 end;
 
+procedure TArticulosInventarioController.ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
+var
+  ADetallesAux: IBizInventario;
+begin
+  if Assigned(ADetalles) then
+  begin
+     ADetallesAux := (ADetalles as IBizInventario);
+     with TfEditorColores.Create(NIL) do
+       try
+         dsDataTable.DataTable := ADetallesAux.DetalleColores.DataTable;
+         Referencia := ADetallesAux.REFERENCIA;
+         Descripcion := ADetallesAux.DESCRIPCION;
+
+         if (ShowModal = mrOK) then
+         begin
+            if ADetallesAux.DetalleColores.DataTable.Editing then
+               ADetallesAux.DetalleColores.DataTable.Post;
+
+            if not ADetallesAux.DataTable.Editing then
+               ADetallesAux.DataTable.Edit;
+            ADetallesAux.CANTIDAD := Total;
+            if ADetallesAux.DataTable.Editing then
+               ADetallesAux.DataTable.post;
+         end
+         else
+            ADetallesAux.DetalleColores.DataTable.Cancel;
+       finally
+        Release;
+       end;
+  end;
+end;
+
 end.
diff --git a/Source/Modulos/Inventario/Controller/uInventarioController.pas b/Source/Modulos/Inventario/Controller/uInventarioController.pas
index 99fd589..70d1e0c 100644
--- a/Source/Modulos/Inventario/Controller/uInventarioController.pas
+++ b/Source/Modulos/Inventario/Controller/uInventarioController.pas
@@ -325,7 +325,7 @@ begin
         AArticulos.ID_ARTICULO := FieldByName(fld_ArticulosID).AsInteger;
 //        AArticulos.REFERENCIA_PROVEEDOR := FieldByName(fld_ArticulosREFERENCIA_PROV).AsString;
         AArticulos.DESCRIPCION := FieldByName(fld_INVENTARIODESCRIPCION).AsString;
-        AArticulos.CANTIDAD := 1;
+        AArticulos.CANTIDAD := 0;
       end
       //Casos 2, 3  ADetalles = IBizInventario, IDAStronglyTypedDataTable
       else
@@ -335,7 +335,7 @@ begin
         if Supports(ADetalles, IBizInventario) then
         begin
           AArticulos.DESCRIPCION := FieldByName(fld_INVENTARIODESCRIPCION).AsString;
-          AArticulos.CANTIDAD := 1;
+          AArticulos.CANTIDAD := 0;
         end
         else
         begin
diff --git a/Source/Modulos/Inventario/Data/uDataModuleInventario.dfm b/Source/Modulos/Inventario/Data/uDataModuleInventario.dfm
index e756c0b..6f8c141 100644
--- a/Source/Modulos/Inventario/Data/uDataModuleInventario.dfm
+++ b/Source/Modulos/Inventario/Data/uDataModuleInventario.dfm
@@ -14,12 +14,12 @@ inherited DataModuleInventario: TDataModuleInventario
     Top = 84
   end
   object rda_Inventario: TDARemoteDataAdapter
-    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
+    DataStreamer = Bin2DataStreamer
     Left = 51
     Top = 151
   end
@@ -108,14 +108,14 @@ inherited DataModuleInventario: TDataModuleInventario
     RemoteDataAdapter = rda_Inventario
     LogicalName = 'DetalleReservas'
     IndexDefs = <>
-    Left = 360
-    Top = 128
+    Left = 440
+    Top = 72
   end
   object ds_DetalleReservas: TDADataSource
     DataSet = tbl_DetalleReservas.Dataset
     DataTable = tbl_DetalleReservas
-    Left = 360
-    Top = 72
+    Left = 440
+    Top = 16
   end
   object tbl_Inventario: TDAMemDataTable
     RemoteUpdatesOptions = []
@@ -165,6 +165,21 @@ inherited DataModuleInventario: TDataModuleInventario
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'CAMPOTECNICO'
+        DataType = datString
+        Size = 200
+      end
+      item
+        Name = 'CODIGOTECNICO'
+        DataType = datString
+        Size = 15
+      end
+      item
+        Name = 'DISENOTECNICO'
+        DataType = datString
+        Size = 6
+      end
       item
         Name = 'STOCK'
         DataType = datFloat
@@ -196,7 +211,8 @@ inherited DataModuleInventario: TDataModuleInventario
       end
       item
         Name = 'ID'
-        DataType = datInteger
+        DataType = datAutoInc
+        GeneratorName = 'GEN_MOVIMIENTOS_ID'
         DisplayLabel = 'INVENTARIO_ID'
         DictionaryEntry = 'INVENTARIO_ID'
         InPrimaryKey = True
@@ -245,4 +261,110 @@ inherited DataModuleInventario: TDataModuleInventario
     Left = 184
     Top = 72
   end
+  object tbl_Movimientos_Detalle_Color: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_MOVIMIENTOS_DET_COLOR_ID'
+        DictionaryEntry = 'Movimientos_Detalle_Color_ID'
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_MOVIMIENTO'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_ID_MOVIMIENTO'
+        DictionaryEntry = 'Movimientos_Detalle_Color_ID_MOVIMIENTO'
+      end
+      item
+        Name = 'COLOR1'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR1'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR1'
+      end
+      item
+        Name = 'COLOR2'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR2'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR2'
+      end
+      item
+        Name = 'COLOR3'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR3'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR3'
+      end
+      item
+        Name = 'COLOR4'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR4'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR4'
+      end
+      item
+        Name = 'COLOR5'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR5'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR5'
+      end
+      item
+        Name = 'COLOR6'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR6'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR6'
+      end
+      item
+        Name = 'COLOR7'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR7'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR7'
+      end
+      item
+        Name = 'COLOR8'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR8'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR8'
+      end
+      item
+        Name = 'COLOR9'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR9'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR9'
+      end
+      item
+        Name = 'COLOR10'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR10'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR10'
+      end
+      item
+        Name = 'COLOR11'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR11'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR11'
+      end
+      item
+        Name = 'COLOR12'
+        DataType = datInteger
+        DisplayLabel = 'Movimientos_Detalle_Color_COLOR12'
+        DictionaryEntry = 'Movimientos_Detalle_Color_COLOR12'
+      end>
+    Params = <>
+    MasterMappingMode = mmWhere
+    StreamingOptions = [soDisableEventsWhileStreaming, soDisableFiltering]
+    RemoteDataAdapter = rda_Inventario
+    MasterSource = ds_Inventario
+    MasterFields = 'ID'
+    DetailFields = 'ID_MOVIMIENTO'
+    LogicalName = 'Movimientos_Detalle_Color'
+    IndexDefs = <>
+    Left = 304
+    Top = 128
+  end
+  object ds_Movimientos_Detalle_Color: TDADataSource
+    DataSet = tbl_Movimientos_Detalle_Color.Dataset
+    DataTable = tbl_Movimientos_Detalle_Color
+    Left = 304
+    Top = 72
+  end
 end
diff --git a/Source/Modulos/Inventario/Data/uDataModuleInventario.pas b/Source/Modulos/Inventario/Data/uDataModuleInventario.pas
index ee72bc0..39b8567 100644
--- a/Source/Modulos/Inventario/Data/uDataModuleInventario.pas
+++ b/Source/Modulos/Inventario/Data/uDataModuleInventario.pas
@@ -8,7 +8,7 @@ uses
   uRORemoteService, uROClient, uROBinMessage,
   uDADesigntimeCall, uDataModuleBase,
   uIDataModuleInventario, uBizInventario, uDARemoteDataAdapter, uDADataStreamer,
-  uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable;
+  uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable, uDADataAdapter, uBizMovimientosDetalleColor;
 
 type
   TDataModuleInventario = class(TDataModuleBase, IDataModuleInventario)
@@ -19,7 +19,12 @@ type
     ds_DetalleReservas: TDADataSource;
     tbl_Inventario: TDAMemDataTable;
     ds_Inventario: TDADataSource;
+    tbl_Movimientos_Detalle_Color: TDAMemDataTable;
+    ds_Movimientos_Detalle_Color: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
+  private
+    function _GetDetalleColores : IBizMovimientosDetalleColor;
+
   public
     function GetItems : IBizInventario; overload;
     function GetItems(const ID_ALMACEN : Integer) : IBizInventario; overload;
@@ -100,6 +105,24 @@ begin
   end;
 end;
 
+function TDataModuleInventario._GetDetalleColores: IBizMovimientosDetalleColor;
+var
+  ADetalleColores : TDAMemDataTable;
+begin
+  ShowHourglassCursor;
+  try
+    ADetalleColores := CloneDataTable(tbl_Movimientos_Detalle_Color);
+    with ADetalleColores do
+    begin
+      BusinessRulesID := BIZ_CLIENT_MOVIMIENTOS_DETALLE_COLOR;
+      DetailOptions := DetailOptions - [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
+    end;
+    Result := (ADetalleColores as IBizMovimientosDetalleColor);
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleInventario.GetItems: IBizInventario;
 var
   AInventario : TDAMemDataTable;
@@ -108,6 +131,12 @@ begin
   try
     AInventario := CloneDataTable(tbl_Inventario);
     AInventario.BusinessRulesID := BIZ_CLIENT_INVENTARIO;
+
+    with TBizInventario(AInventario.BusinessEventsObj) do
+    begin
+      DetalleColores := _GetDetalleColores;
+    end;
+
     Result := (AInventario as IBizInventario);
   finally
     HideHourglassCursor;
diff --git a/Source/Modulos/Inventario/Inventario_Group.groupproj b/Source/Modulos/Inventario/Inventario_Group.groupproj
index 58170cd..46833a0 100644
--- a/Source/Modulos/Inventario/Inventario_Group.groupproj
+++ b/Source/Modulos/Inventario/Inventario_Group.groupproj
@@ -9,6 +9,7 @@
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
     <Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
     <Projects Include="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" />
     <Projects Include="..\Almacenes\Controller\Almacenes_controller.dproj" />
@@ -251,14 +252,23 @@
   <Target Name="Almacenes_model:Make">
     <MSBuild Projects="..\Almacenes\Model\Almacenes_model.dproj" Targets="Make" />
   </Target>
+  <Target Name="AlbaranesCliente_view">
+    <MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_view:Clean">
+    <MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_view:Make">
+    <MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;PedProv_AlbProv_relation;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server;Obras_controller;AlbaranesProveedor_controller;PedidosProveedor_view;PedidosProveedor_controller;Articulos_controller;AlbaranesProveedor_data;Almacenes_controller;Almacenes_data;Obras_data;Obras_model;Almacenes_model" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;PedProv_AlbProv_relation;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server;Obras_controller;AlbaranesProveedor_controller;PedidosProveedor_view;PedidosProveedor_controller;Articulos_controller;AlbaranesProveedor_data;Almacenes_controller;Almacenes_data;Obras_data;Obras_model;Almacenes_model;AlbaranesCliente_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;Obras_controller:Clean;AlbaranesProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_controller:Clean;Articulos_controller:Clean;AlbaranesProveedor_data:Clean;Almacenes_controller:Clean;Almacenes_data:Clean;Obras_data:Clean;Obras_model:Clean;Almacenes_model:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;Obras_controller:Clean;AlbaranesProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_controller:Clean;Articulos_controller:Clean;AlbaranesProveedor_data:Clean;Almacenes_controller:Clean;Almacenes_data:Clean;Obras_data:Clean;Obras_model:Clean;Almacenes_model:Clean;AlbaranesCliente_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make;Obras_controller:Make;AlbaranesProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_controller:Make;Articulos_controller:Make;AlbaranesProveedor_data:Make;Almacenes_controller:Make;Almacenes_data:Make;Obras_data:Make;Obras_model:Make;Almacenes_model:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make;Obras_controller:Make;AlbaranesProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_controller:Make;Articulos_controller:Make;AlbaranesProveedor_data:Make;Almacenes_controller:Make;Almacenes_data:Make;Obras_data:Make;Obras_model:Make;Almacenes_model:Make;AlbaranesCliente_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Inventario/Model/Inventario_model.dpk b/Source/Modulos/Inventario/Model/Inventario_model.dpk
index 75ecebf..03c6cae 100644
Binary files a/Source/Modulos/Inventario/Model/Inventario_model.dpk and b/Source/Modulos/Inventario/Model/Inventario_model.dpk differ
diff --git a/Source/Modulos/Inventario/Model/Inventario_model.dproj b/Source/Modulos/Inventario/Model/Inventario_model.dproj
index 9257db2..f4d2700 100644
--- a/Source/Modulos/Inventario/Model/Inventario_model.dproj
+++ b/Source/Modulos/Inventario/Model/Inventario_model.dproj
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{82e91760-acc0-4662-9c28-456e5ea6089c}</ProjectGuid>
     <MainSource>Inventario_model.dpk</MainSource>
@@ -39,65 +40,33 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Source>
-      <Source Name="MainSource">Inventario_model.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_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Inventario_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Articulos_model.dcp" />
-    <DCCReference Include="..\..\Lib\Base.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="Articulos_model.dcp" />
+    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
     <DCCReference Include="Data\uIDataModuleInventario.pas" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="schInventarioClient_Intf.pas" />
     <DCCReference Include="schInventarioServer_Intf.pas" />
     <DCCReference Include="uBizInventario.pas" />
+    <DCCReference Include="uBizMovimientosDetalleColor.pas" />
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Inventario/Model/Inventario_model.res b/Source/Modulos/Inventario/Model/Inventario_model.res
index 36f26e2..86c94e6 100644
Binary files a/Source/Modulos/Inventario/Model/Inventario_model.res and b/Source/Modulos/Inventario/Model/Inventario_model.res differ
diff --git a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
index 7f39ee6..81e2fbc 100644
--- a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
+++ b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
@@ -1,19 +1,22 @@
 unit schInventarioClient_Intf;
 
+{$D-}
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, 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_Inventario = '{B558C6EC-462B-47CD-A0A1-277535DCDCD3}';
-  RID_DetalleReservas = '{B0B5857C-72EA-4C1D-841A-91AA5270F172}';
+  RID_Inventario = '{93499318-D59A-462A-9C13-BB123DCF4B52}';
+  RID_Movimientos_Detalle_Color = '{FCA12CB3-239D-41A7-BFB9-CC56290B001A}';
+  RID_DetalleReservas = '{2EE7CD8A-783F-4E0D-A1D6-92322C593CA2}';
 
   { Data table names }
   nme_Inventario = 'Inventario';
+  nme_Movimientos_Detalle_Color = 'Movimientos_Detalle_Color';
   nme_DetalleReservas = 'DetalleReservas';
 
   { Inventario fields }
@@ -25,6 +28,9 @@ const
   fld_InventarioFAMILIA = 'FAMILIA';
   fld_InventarioDESCRIPCION = 'DESCRIPCION';
   fld_InventarioUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
+  fld_InventarioCAMPOTECNICO = 'CAMPOTECNICO';
+  fld_InventarioCODIGOTECNICO = 'CODIGOTECNICO';
+  fld_InventarioDISENOTECNICO = 'DISENOTECNICO';
   fld_InventarioSTOCK = 'STOCK';
   fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN';
   fld_InventarioRESERVA = 'RESERVA';
@@ -46,17 +52,52 @@ const
   idx_InventarioFAMILIA = 5;
   idx_InventarioDESCRIPCION = 6;
   idx_InventarioUNIDAD_MEDIDA = 7;
-  idx_InventarioSTOCK = 8;
-  idx_InventarioUNIDADES_ALMACEN = 9;
-  idx_InventarioRESERVA = 10;
-  idx_InventarioPENDIENTE_RECEPCION = 11;
-  idx_InventarioTIPO_ALMACEN = 12;
-  idx_InventarioID = 13;
-  idx_InventarioCANTIDAD = 14;
-  idx_InventarioFECHA_MOVIMIENTO = 15;
-  idx_InventarioCAUSA = 16;
-  idx_InventarioTIPO = 17;
-  idx_InventarioID_ALMACEN_RESERVA = 18;
+  idx_InventarioCAMPOTECNICO = 8;
+  idx_InventarioCODIGOTECNICO = 9;
+  idx_InventarioDISENOTECNICO = 10;
+  idx_InventarioSTOCK = 11;
+  idx_InventarioUNIDADES_ALMACEN = 12;
+  idx_InventarioRESERVA = 13;
+  idx_InventarioPENDIENTE_RECEPCION = 14;
+  idx_InventarioTIPO_ALMACEN = 15;
+  idx_InventarioID = 16;
+  idx_InventarioCANTIDAD = 17;
+  idx_InventarioFECHA_MOVIMIENTO = 18;
+  idx_InventarioCAUSA = 19;
+  idx_InventarioTIPO = 20;
+  idx_InventarioID_ALMACEN_RESERVA = 21;
+
+  { Movimientos_Detalle_Color fields }
+  fld_Movimientos_Detalle_ColorID = 'ID';
+  fld_Movimientos_Detalle_ColorID_MOVIMIENTO = 'ID_MOVIMIENTO';
+  fld_Movimientos_Detalle_ColorCOLOR1 = 'COLOR1';
+  fld_Movimientos_Detalle_ColorCOLOR2 = 'COLOR2';
+  fld_Movimientos_Detalle_ColorCOLOR3 = 'COLOR3';
+  fld_Movimientos_Detalle_ColorCOLOR4 = 'COLOR4';
+  fld_Movimientos_Detalle_ColorCOLOR5 = 'COLOR5';
+  fld_Movimientos_Detalle_ColorCOLOR6 = 'COLOR6';
+  fld_Movimientos_Detalle_ColorCOLOR7 = 'COLOR7';
+  fld_Movimientos_Detalle_ColorCOLOR8 = 'COLOR8';
+  fld_Movimientos_Detalle_ColorCOLOR9 = 'COLOR9';
+  fld_Movimientos_Detalle_ColorCOLOR10 = 'COLOR10';
+  fld_Movimientos_Detalle_ColorCOLOR11 = 'COLOR11';
+  fld_Movimientos_Detalle_ColorCOLOR12 = 'COLOR12';
+
+  { Movimientos_Detalle_Color field indexes }
+  idx_Movimientos_Detalle_ColorID = 0;
+  idx_Movimientos_Detalle_ColorID_MOVIMIENTO = 1;
+  idx_Movimientos_Detalle_ColorCOLOR1 = 2;
+  idx_Movimientos_Detalle_ColorCOLOR2 = 3;
+  idx_Movimientos_Detalle_ColorCOLOR3 = 4;
+  idx_Movimientos_Detalle_ColorCOLOR4 = 5;
+  idx_Movimientos_Detalle_ColorCOLOR5 = 6;
+  idx_Movimientos_Detalle_ColorCOLOR6 = 7;
+  idx_Movimientos_Detalle_ColorCOLOR7 = 8;
+  idx_Movimientos_Detalle_ColorCOLOR8 = 9;
+  idx_Movimientos_Detalle_ColorCOLOR9 = 10;
+  idx_Movimientos_Detalle_ColorCOLOR10 = 11;
+  idx_Movimientos_Detalle_ColorCOLOR11 = 12;
+  idx_Movimientos_Detalle_ColorCOLOR12 = 13;
 
   { DetalleReservas fields }
   fld_DetalleReservasID = 'ID';
@@ -99,7 +140,7 @@ const
 type
   { IInventario }
   IInventario = interface(IDAStronglyTypedDataTable)
-  ['{BE22C3F8-FA99-475E-8C10-4F08590A9331}']
+  ['{A7EEDE91-8661-4933-B962-0E95C99F7EEE}']
     { Property getters and setters }
     function GetID_ALMACENValue: Integer;
     procedure SetID_ALMACENValue(const aValue: Integer);
@@ -133,6 +174,18 @@ type
     procedure SetUNIDAD_MEDIDAValue(const aValue: String);
     function GetUNIDAD_MEDIDAIsNull: Boolean;
     procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
+    function GetCAMPOTECNICOValue: String;
+    procedure SetCAMPOTECNICOValue(const aValue: String);
+    function GetCAMPOTECNICOIsNull: Boolean;
+    procedure SetCAMPOTECNICOIsNull(const aValue: Boolean);
+    function GetCODIGOTECNICOValue: String;
+    procedure SetCODIGOTECNICOValue(const aValue: String);
+    function GetCODIGOTECNICOIsNull: Boolean;
+    procedure SetCODIGOTECNICOIsNull(const aValue: Boolean);
+    function GetDISENOTECNICOValue: String;
+    procedure SetDISENOTECNICOValue(const aValue: String);
+    function GetDISENOTECNICOIsNull: Boolean;
+    procedure SetDISENOTECNICOIsNull(const aValue: Boolean);
     function GetSTOCKValue: Float;
     procedure SetSTOCKValue(const aValue: Float);
     function GetSTOCKIsNull: Boolean;
@@ -196,6 +249,12 @@ type
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
     property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
+    property CAMPOTECNICO: String read GetCAMPOTECNICOValue write SetCAMPOTECNICOValue;
+    property CAMPOTECNICOIsNull: Boolean read GetCAMPOTECNICOIsNull write SetCAMPOTECNICOIsNull;
+    property CODIGOTECNICO: String read GetCODIGOTECNICOValue write SetCODIGOTECNICOValue;
+    property CODIGOTECNICOIsNull: Boolean read GetCODIGOTECNICOIsNull write SetCODIGOTECNICOIsNull;
+    property DISENOTECNICO: String read GetDISENOTECNICOValue write SetDISENOTECNICOValue;
+    property DISENOTECNICOIsNull: Boolean read GetDISENOTECNICOIsNull write SetDISENOTECNICOIsNull;
     property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
     property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
     property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
@@ -221,7 +280,7 @@ type
   end;
 
   { TInventarioDataTableRules }
-  TInventarioDataTableRules = class(TIntfObjectDADataTableRules, IInventario)
+  TInventarioDataTableRules = class(TDADataTableRules, IInventario)
   private
   protected
     { Property getters and setters }
@@ -257,6 +316,18 @@ type
     procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
     function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
     procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
+    function GetCAMPOTECNICOValue: String; virtual;
+    procedure SetCAMPOTECNICOValue(const aValue: String); virtual;
+    function GetCAMPOTECNICOIsNull: Boolean; virtual;
+    procedure SetCAMPOTECNICOIsNull(const aValue: Boolean); virtual;
+    function GetCODIGOTECNICOValue: String; virtual;
+    procedure SetCODIGOTECNICOValue(const aValue: String); virtual;
+    function GetCODIGOTECNICOIsNull: Boolean; virtual;
+    procedure SetCODIGOTECNICOIsNull(const aValue: Boolean); virtual;
+    function GetDISENOTECNICOValue: String; virtual;
+    procedure SetDISENOTECNICOValue(const aValue: String); virtual;
+    function GetDISENOTECNICOIsNull: Boolean; virtual;
+    procedure SetDISENOTECNICOIsNull(const aValue: Boolean); virtual;
     function GetSTOCKValue: Float; virtual;
     procedure SetSTOCKValue(const aValue: Float); virtual;
     function GetSTOCKIsNull: Boolean; virtual;
@@ -319,6 +390,12 @@ type
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
     property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
+    property CAMPOTECNICO: String read GetCAMPOTECNICOValue write SetCAMPOTECNICOValue;
+    property CAMPOTECNICOIsNull: Boolean read GetCAMPOTECNICOIsNull write SetCAMPOTECNICOIsNull;
+    property CODIGOTECNICO: String read GetCODIGOTECNICOValue write SetCODIGOTECNICOValue;
+    property CODIGOTECNICOIsNull: Boolean read GetCODIGOTECNICOIsNull write SetCODIGOTECNICOIsNull;
+    property DISENOTECNICO: String read GetDISENOTECNICOValue write SetDISENOTECNICOValue;
+    property DISENOTECNICOIsNull: Boolean read GetDISENOTECNICOIsNull write SetDISENOTECNICOIsNull;
     property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
     property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
     property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
@@ -348,9 +425,200 @@ type
 
   end;
 
+  { IMovimientos_Detalle_Color }
+  IMovimientos_Detalle_Color = interface(IDAStronglyTypedDataTable)
+  ['{70321F06-A1BF-48BE-B73B-BED105679170}']
+    { Property getters and setters }
+    function GetIDValue: Integer;
+    procedure SetIDValue(const aValue: Integer);
+    function GetIDIsNull: Boolean;
+    procedure SetIDIsNull(const aValue: Boolean);
+    function GetID_MOVIMIENTOValue: Integer;
+    procedure SetID_MOVIMIENTOValue(const aValue: Integer);
+    function GetID_MOVIMIENTOIsNull: Boolean;
+    procedure SetID_MOVIMIENTOIsNull(const aValue: Boolean);
+    function GetCOLOR1Value: Integer;
+    procedure SetCOLOR1Value(const aValue: Integer);
+    function GetCOLOR1IsNull: Boolean;
+    procedure SetCOLOR1IsNull(const aValue: Boolean);
+    function GetCOLOR2Value: Integer;
+    procedure SetCOLOR2Value(const aValue: Integer);
+    function GetCOLOR2IsNull: Boolean;
+    procedure SetCOLOR2IsNull(const aValue: Boolean);
+    function GetCOLOR3Value: Integer;
+    procedure SetCOLOR3Value(const aValue: Integer);
+    function GetCOLOR3IsNull: Boolean;
+    procedure SetCOLOR3IsNull(const aValue: Boolean);
+    function GetCOLOR4Value: Integer;
+    procedure SetCOLOR4Value(const aValue: Integer);
+    function GetCOLOR4IsNull: Boolean;
+    procedure SetCOLOR4IsNull(const aValue: Boolean);
+    function GetCOLOR5Value: Integer;
+    procedure SetCOLOR5Value(const aValue: Integer);
+    function GetCOLOR5IsNull: Boolean;
+    procedure SetCOLOR5IsNull(const aValue: Boolean);
+    function GetCOLOR6Value: Integer;
+    procedure SetCOLOR6Value(const aValue: Integer);
+    function GetCOLOR6IsNull: Boolean;
+    procedure SetCOLOR6IsNull(const aValue: Boolean);
+    function GetCOLOR7Value: Integer;
+    procedure SetCOLOR7Value(const aValue: Integer);
+    function GetCOLOR7IsNull: Boolean;
+    procedure SetCOLOR7IsNull(const aValue: Boolean);
+    function GetCOLOR8Value: Integer;
+    procedure SetCOLOR8Value(const aValue: Integer);
+    function GetCOLOR8IsNull: Boolean;
+    procedure SetCOLOR8IsNull(const aValue: Boolean);
+    function GetCOLOR9Value: Integer;
+    procedure SetCOLOR9Value(const aValue: Integer);
+    function GetCOLOR9IsNull: Boolean;
+    procedure SetCOLOR9IsNull(const aValue: Boolean);
+    function GetCOLOR10Value: Integer;
+    procedure SetCOLOR10Value(const aValue: Integer);
+    function GetCOLOR10IsNull: Boolean;
+    procedure SetCOLOR10IsNull(const aValue: Boolean);
+    function GetCOLOR11Value: Integer;
+    procedure SetCOLOR11Value(const aValue: Integer);
+    function GetCOLOR11IsNull: Boolean;
+    procedure SetCOLOR11IsNull(const aValue: Boolean);
+    function GetCOLOR12Value: Integer;
+    procedure SetCOLOR12Value(const aValue: Integer);
+    function GetCOLOR12IsNull: Boolean;
+    procedure SetCOLOR12IsNull(const aValue: Boolean);
+
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property ID_MOVIMIENTO: Integer read GetID_MOVIMIENTOValue write SetID_MOVIMIENTOValue;
+    property ID_MOVIMIENTOIsNull: Boolean read GetID_MOVIMIENTOIsNull write SetID_MOVIMIENTOIsNull;
+    property COLOR1: Integer read GetCOLOR1Value write SetCOLOR1Value;
+    property COLOR1IsNull: Boolean read GetCOLOR1IsNull write SetCOLOR1IsNull;
+    property COLOR2: Integer read GetCOLOR2Value write SetCOLOR2Value;
+    property COLOR2IsNull: Boolean read GetCOLOR2IsNull write SetCOLOR2IsNull;
+    property COLOR3: Integer read GetCOLOR3Value write SetCOLOR3Value;
+    property COLOR3IsNull: Boolean read GetCOLOR3IsNull write SetCOLOR3IsNull;
+    property COLOR4: Integer read GetCOLOR4Value write SetCOLOR4Value;
+    property COLOR4IsNull: Boolean read GetCOLOR4IsNull write SetCOLOR4IsNull;
+    property COLOR5: Integer read GetCOLOR5Value write SetCOLOR5Value;
+    property COLOR5IsNull: Boolean read GetCOLOR5IsNull write SetCOLOR5IsNull;
+    property COLOR6: Integer read GetCOLOR6Value write SetCOLOR6Value;
+    property COLOR6IsNull: Boolean read GetCOLOR6IsNull write SetCOLOR6IsNull;
+    property COLOR7: Integer read GetCOLOR7Value write SetCOLOR7Value;
+    property COLOR7IsNull: Boolean read GetCOLOR7IsNull write SetCOLOR7IsNull;
+    property COLOR8: Integer read GetCOLOR8Value write SetCOLOR8Value;
+    property COLOR8IsNull: Boolean read GetCOLOR8IsNull write SetCOLOR8IsNull;
+    property COLOR9: Integer read GetCOLOR9Value write SetCOLOR9Value;
+    property COLOR9IsNull: Boolean read GetCOLOR9IsNull write SetCOLOR9IsNull;
+    property COLOR10: Integer read GetCOLOR10Value write SetCOLOR10Value;
+    property COLOR10IsNull: Boolean read GetCOLOR10IsNull write SetCOLOR10IsNull;
+    property COLOR11: Integer read GetCOLOR11Value write SetCOLOR11Value;
+    property COLOR11IsNull: Boolean read GetCOLOR11IsNull write SetCOLOR11IsNull;
+    property COLOR12: Integer read GetCOLOR12Value write SetCOLOR12Value;
+    property COLOR12IsNull: Boolean read GetCOLOR12IsNull write SetCOLOR12IsNull;
+  end;
+
+  { TMovimientos_Detalle_ColorDataTableRules }
+  TMovimientos_Detalle_ColorDataTableRules = class(TDADataTableRules, IMovimientos_Detalle_Color)
+  private
+  protected
+    { Property getters and setters }
+    function GetIDValue: Integer; virtual;
+    procedure SetIDValue(const aValue: Integer); virtual;
+    function GetIDIsNull: Boolean; virtual;
+    procedure SetIDIsNull(const aValue: Boolean); virtual;
+    function GetID_MOVIMIENTOValue: Integer; virtual;
+    procedure SetID_MOVIMIENTOValue(const aValue: Integer); virtual;
+    function GetID_MOVIMIENTOIsNull: Boolean; virtual;
+    procedure SetID_MOVIMIENTOIsNull(const aValue: Boolean); virtual;
+    function GetCOLOR1Value: Integer; virtual;
+    procedure SetCOLOR1Value(const aValue: Integer); virtual;
+    function GetCOLOR1IsNull: Boolean; virtual;
+    procedure SetCOLOR1IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR2Value: Integer; virtual;
+    procedure SetCOLOR2Value(const aValue: Integer); virtual;
+    function GetCOLOR2IsNull: Boolean; virtual;
+    procedure SetCOLOR2IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR3Value: Integer; virtual;
+    procedure SetCOLOR3Value(const aValue: Integer); virtual;
+    function GetCOLOR3IsNull: Boolean; virtual;
+    procedure SetCOLOR3IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR4Value: Integer; virtual;
+    procedure SetCOLOR4Value(const aValue: Integer); virtual;
+    function GetCOLOR4IsNull: Boolean; virtual;
+    procedure SetCOLOR4IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR5Value: Integer; virtual;
+    procedure SetCOLOR5Value(const aValue: Integer); virtual;
+    function GetCOLOR5IsNull: Boolean; virtual;
+    procedure SetCOLOR5IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR6Value: Integer; virtual;
+    procedure SetCOLOR6Value(const aValue: Integer); virtual;
+    function GetCOLOR6IsNull: Boolean; virtual;
+    procedure SetCOLOR6IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR7Value: Integer; virtual;
+    procedure SetCOLOR7Value(const aValue: Integer); virtual;
+    function GetCOLOR7IsNull: Boolean; virtual;
+    procedure SetCOLOR7IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR8Value: Integer; virtual;
+    procedure SetCOLOR8Value(const aValue: Integer); virtual;
+    function GetCOLOR8IsNull: Boolean; virtual;
+    procedure SetCOLOR8IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR9Value: Integer; virtual;
+    procedure SetCOLOR9Value(const aValue: Integer); virtual;
+    function GetCOLOR9IsNull: Boolean; virtual;
+    procedure SetCOLOR9IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR10Value: Integer; virtual;
+    procedure SetCOLOR10Value(const aValue: Integer); virtual;
+    function GetCOLOR10IsNull: Boolean; virtual;
+    procedure SetCOLOR10IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR11Value: Integer; virtual;
+    procedure SetCOLOR11Value(const aValue: Integer); virtual;
+    function GetCOLOR11IsNull: Boolean; virtual;
+    procedure SetCOLOR11IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR12Value: Integer; virtual;
+    procedure SetCOLOR12Value(const aValue: Integer); virtual;
+    function GetCOLOR12IsNull: Boolean; virtual;
+    procedure SetCOLOR12IsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property ID_MOVIMIENTO: Integer read GetID_MOVIMIENTOValue write SetID_MOVIMIENTOValue;
+    property ID_MOVIMIENTOIsNull: Boolean read GetID_MOVIMIENTOIsNull write SetID_MOVIMIENTOIsNull;
+    property COLOR1: Integer read GetCOLOR1Value write SetCOLOR1Value;
+    property COLOR1IsNull: Boolean read GetCOLOR1IsNull write SetCOLOR1IsNull;
+    property COLOR2: Integer read GetCOLOR2Value write SetCOLOR2Value;
+    property COLOR2IsNull: Boolean read GetCOLOR2IsNull write SetCOLOR2IsNull;
+    property COLOR3: Integer read GetCOLOR3Value write SetCOLOR3Value;
+    property COLOR3IsNull: Boolean read GetCOLOR3IsNull write SetCOLOR3IsNull;
+    property COLOR4: Integer read GetCOLOR4Value write SetCOLOR4Value;
+    property COLOR4IsNull: Boolean read GetCOLOR4IsNull write SetCOLOR4IsNull;
+    property COLOR5: Integer read GetCOLOR5Value write SetCOLOR5Value;
+    property COLOR5IsNull: Boolean read GetCOLOR5IsNull write SetCOLOR5IsNull;
+    property COLOR6: Integer read GetCOLOR6Value write SetCOLOR6Value;
+    property COLOR6IsNull: Boolean read GetCOLOR6IsNull write SetCOLOR6IsNull;
+    property COLOR7: Integer read GetCOLOR7Value write SetCOLOR7Value;
+    property COLOR7IsNull: Boolean read GetCOLOR7IsNull write SetCOLOR7IsNull;
+    property COLOR8: Integer read GetCOLOR8Value write SetCOLOR8Value;
+    property COLOR8IsNull: Boolean read GetCOLOR8IsNull write SetCOLOR8IsNull;
+    property COLOR9: Integer read GetCOLOR9Value write SetCOLOR9Value;
+    property COLOR9IsNull: Boolean read GetCOLOR9IsNull write SetCOLOR9IsNull;
+    property COLOR10: Integer read GetCOLOR10Value write SetCOLOR10Value;
+    property COLOR10IsNull: Boolean read GetCOLOR10IsNull write SetCOLOR10IsNull;
+    property COLOR11: Integer read GetCOLOR11Value write SetCOLOR11Value;
+    property COLOR11IsNull: Boolean read GetCOLOR11IsNull write SetCOLOR11IsNull;
+    property COLOR12: Integer read GetCOLOR12Value write SetCOLOR12Value;
+    property COLOR12IsNull: Boolean read GetCOLOR12IsNull write SetCOLOR12IsNull;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
   { IDetalleReservas }
   IDetalleReservas = interface(IDAStronglyTypedDataTable)
-  ['{8A4D1E34-9AFD-4798-9D59-1649308DD4AB}']
+  ['{CBB42F4A-4545-4E85-885C-3C83C7BE2D49}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -460,7 +728,7 @@ type
   end;
 
   { TDetalleReservasDataTableRules }
-  TDetalleReservasDataTableRules = class(TIntfObjectDADataTableRules, IDetalleReservas)
+  TDetalleReservasDataTableRules = class(TDADataTableRules, IDetalleReservas)
   private
   protected
     { Property getters and setters }
@@ -758,6 +1026,69 @@ begin
     DataTable.Fields[idx_InventarioUNIDAD_MEDIDA].AsVariant := Null;
 end;
 
+function TInventarioDataTableRules.GetCAMPOTECNICOValue: String;
+begin
+  result := DataTable.Fields[idx_InventarioCAMPOTECNICO].AsString;
+end;
+
+procedure TInventarioDataTableRules.SetCAMPOTECNICOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InventarioCAMPOTECNICO].AsString := aValue;
+end;
+
+function TInventarioDataTableRules.GetCAMPOTECNICOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_InventarioCAMPOTECNICO].IsNull;
+end;
+
+procedure TInventarioDataTableRules.SetCAMPOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_InventarioCAMPOTECNICO].AsVariant := Null;
+end;
+
+function TInventarioDataTableRules.GetCODIGOTECNICOValue: String;
+begin
+  result := DataTable.Fields[idx_InventarioCODIGOTECNICO].AsString;
+end;
+
+procedure TInventarioDataTableRules.SetCODIGOTECNICOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InventarioCODIGOTECNICO].AsString := aValue;
+end;
+
+function TInventarioDataTableRules.GetCODIGOTECNICOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_InventarioCODIGOTECNICO].IsNull;
+end;
+
+procedure TInventarioDataTableRules.SetCODIGOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_InventarioCODIGOTECNICO].AsVariant := Null;
+end;
+
+function TInventarioDataTableRules.GetDISENOTECNICOValue: String;
+begin
+  result := DataTable.Fields[idx_InventarioDISENOTECNICO].AsString;
+end;
+
+procedure TInventarioDataTableRules.SetDISENOTECNICOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InventarioDISENOTECNICO].AsString := aValue;
+end;
+
+function TInventarioDataTableRules.GetDISENOTECNICOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_InventarioDISENOTECNICO].IsNull;
+end;
+
+procedure TInventarioDataTableRules.SetDISENOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_InventarioDISENOTECNICO].AsVariant := Null;
+end;
+
 function TInventarioDataTableRules.GetSTOCKValue: Float;
 begin
   result := DataTable.Fields[idx_InventarioSTOCK].AsFloat;
@@ -990,6 +1321,312 @@ begin
 end;
 
 
+{ TMovimientos_Detalle_ColorDataTableRules }
+constructor TMovimientos_Detalle_ColorDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TMovimientos_Detalle_ColorDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetIDValue: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorID].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetIDValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorID].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetIDIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorID].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorID].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetID_MOVIMIENTOValue: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorID_MOVIMIENTO].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetID_MOVIMIENTOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorID_MOVIMIENTO].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetID_MOVIMIENTOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorID_MOVIMIENTO].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetID_MOVIMIENTOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorID_MOVIMIENTO].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR1Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR1].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR1Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR1].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR1IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR1].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR1IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR1].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR2Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR2].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR2Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR2].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR2IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR2].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR2IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR2].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR3Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR3].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR3Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR3].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR3IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR3].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR3IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR3].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR4Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR4].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR4Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR4].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR4IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR4].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR4IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR4].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR5Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR5].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR5Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR5].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR5IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR5].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR5IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR5].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR6Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR6].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR6Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR6].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR6IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR6].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR6IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR6].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR7Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR7].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR7Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR7].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR7IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR7].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR7IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR7].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR8Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR8].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR8Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR8].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR8IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR8].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR8IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR8].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR9Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR9].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR9Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR9].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR9IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR9].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR9IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR9].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR10Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR10].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR10Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR10].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR10IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR10].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR10IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR10].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR11Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR11].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR11Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR11].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR11IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR11].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR11IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR11].AsVariant := Null;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR12Value: Integer;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR12].AsInteger;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR12Value(const aValue: Integer);
+begin
+  DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR12].AsInteger := aValue;
+end;
+
+function TMovimientos_Detalle_ColorDataTableRules.GetCOLOR12IsNull: boolean;
+begin
+  result := DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR12].IsNull;
+end;
+
+procedure TMovimientos_Detalle_ColorDataTableRules.SetCOLOR12IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_Movimientos_Detalle_ColorCOLOR12].AsVariant := Null;
+end;
+
+
 { TDetalleReservasDataTableRules }
 constructor TDetalleReservasDataTableRules.Create(aDataTable: TDADataTable);
 begin
@@ -1361,6 +1998,7 @@ end;
 
 initialization
   RegisterDataTableRules(RID_Inventario, TInventarioDataTableRules);
+  RegisterDataTableRules(RID_Movimientos_Detalle_Color, TMovimientos_Detalle_ColorDataTableRules);
   RegisterDataTableRules(RID_DetalleReservas, TDetalleReservasDataTableRules);
 
 end.
diff --git a/Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas b/Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas
index 2a15fd5..158321f 100644
--- a/Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas
+++ b/Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas
@@ -1,5 +1,6 @@
 unit schInventarioServer_Intf;
 
+{$D-}
 interface
 
 uses
@@ -9,13 +10,14 @@ 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_InventarioDelta = '{D5FDE8E5-7FF7-4ABB-AE86-0650D9D28956}';
-  RID_DetalleReservasDelta = '{3087502E-1C78-45AA-9164-988726607EE9}';
+  RID_InventarioDelta = '{B1745CBC-C9F8-463E-97A8-382CF332673D}';
+  RID_Movimientos_Detalle_ColorDelta = '{3E603B30-BF7C-46E6-8544-020CB77C09BB}';
+  RID_DetalleReservasDelta = '{D651D2E2-590A-4E70-8235-DDD1A2FA5927}';
 
 type
   { IInventarioDelta }
   IInventarioDelta = interface(IInventario)
-  ['{D5FDE8E5-7FF7-4ABB-AE86-0650D9D28956}']
+  ['{B1745CBC-C9F8-463E-97A8-382CF332673D}']
     { Property getters and setters }
     function GetOldID_ALMACENValue : Integer;
     function GetOldID_ARTICULOValue : Integer;
@@ -25,6 +27,9 @@ type
     function GetOldFAMILIAValue : String;
     function GetOldDESCRIPCIONValue : String;
     function GetOldUNIDAD_MEDIDAValue : String;
+    function GetOldCAMPOTECNICOValue : String;
+    function GetOldCODIGOTECNICOValue : String;
+    function GetOldDISENOTECNICOValue : String;
     function GetOldSTOCKValue : Float;
     function GetOldUNIDADES_ALMACENValue : Float;
     function GetOldRESERVAValue : Float;
@@ -46,6 +51,9 @@ type
     property OldFAMILIA : String read GetOldFAMILIAValue;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
     property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
+    property OldCAMPOTECNICO : String read GetOldCAMPOTECNICOValue;
+    property OldCODIGOTECNICO : String read GetOldCODIGOTECNICOValue;
+    property OldDISENOTECNICO : String read GetOldDISENOTECNICOValue;
     property OldSTOCK : Float read GetOldSTOCKValue;
     property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
     property OldRESERVA : Float read GetOldRESERVAValue;
@@ -112,6 +120,24 @@ type
     function GetOldUNIDAD_MEDIDAIsNull: Boolean; virtual;
     procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
     procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
+    function GetCAMPOTECNICOValue: String; virtual;
+    function GetCAMPOTECNICOIsNull: Boolean; virtual;
+    function GetOldCAMPOTECNICOValue: String; virtual;
+    function GetOldCAMPOTECNICOIsNull: Boolean; virtual;
+    procedure SetCAMPOTECNICOValue(const aValue: String); virtual;
+    procedure SetCAMPOTECNICOIsNull(const aValue: Boolean); virtual;
+    function GetCODIGOTECNICOValue: String; virtual;
+    function GetCODIGOTECNICOIsNull: Boolean; virtual;
+    function GetOldCODIGOTECNICOValue: String; virtual;
+    function GetOldCODIGOTECNICOIsNull: Boolean; virtual;
+    procedure SetCODIGOTECNICOValue(const aValue: String); virtual;
+    procedure SetCODIGOTECNICOIsNull(const aValue: Boolean); virtual;
+    function GetDISENOTECNICOValue: String; virtual;
+    function GetDISENOTECNICOIsNull: Boolean; virtual;
+    function GetOldDISENOTECNICOValue: String; virtual;
+    function GetOldDISENOTECNICOIsNull: Boolean; virtual;
+    procedure SetDISENOTECNICOValue(const aValue: String); virtual;
+    procedure SetDISENOTECNICOIsNull(const aValue: Boolean); virtual;
     function GetSTOCKValue: Float; virtual;
     function GetSTOCKIsNull: Boolean; virtual;
     function GetOldSTOCKValue: Float; virtual;
@@ -212,6 +238,18 @@ type
     property UNIDAD_MEDIDAIsNull : Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
     property OldUNIDAD_MEDIDAIsNull : Boolean read GetOldUNIDAD_MEDIDAIsNull;
+    property CAMPOTECNICO : String read GetCAMPOTECNICOValue write SetCAMPOTECNICOValue;
+    property CAMPOTECNICOIsNull : Boolean read GetCAMPOTECNICOIsNull write SetCAMPOTECNICOIsNull;
+    property OldCAMPOTECNICO : String read GetOldCAMPOTECNICOValue;
+    property OldCAMPOTECNICOIsNull : Boolean read GetOldCAMPOTECNICOIsNull;
+    property CODIGOTECNICO : String read GetCODIGOTECNICOValue write SetCODIGOTECNICOValue;
+    property CODIGOTECNICOIsNull : Boolean read GetCODIGOTECNICOIsNull write SetCODIGOTECNICOIsNull;
+    property OldCODIGOTECNICO : String read GetOldCODIGOTECNICOValue;
+    property OldCODIGOTECNICOIsNull : Boolean read GetOldCODIGOTECNICOIsNull;
+    property DISENOTECNICO : String read GetDISENOTECNICOValue write SetDISENOTECNICOValue;
+    property DISENOTECNICOIsNull : Boolean read GetDISENOTECNICOIsNull write SetDISENOTECNICOIsNull;
+    property OldDISENOTECNICO : String read GetOldDISENOTECNICOValue;
+    property OldDISENOTECNICOIsNull : Boolean read GetOldDISENOTECNICOIsNull;
     property STOCK : Float read GetSTOCKValue write SetSTOCKValue;
     property STOCKIsNull : Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
     property OldSTOCK : Float read GetOldSTOCKValue;
@@ -263,9 +301,199 @@ type
 
   end;
 
+  { IMovimientos_Detalle_ColorDelta }
+  IMovimientos_Detalle_ColorDelta = interface(IMovimientos_Detalle_Color)
+  ['{3E603B30-BF7C-46E6-8544-020CB77C09BB}']
+    { Property getters and setters }
+    function GetOldIDValue : Integer;
+    function GetOldID_MOVIMIENTOValue : Integer;
+    function GetOldCOLOR1Value : Integer;
+    function GetOldCOLOR2Value : Integer;
+    function GetOldCOLOR3Value : Integer;
+    function GetOldCOLOR4Value : Integer;
+    function GetOldCOLOR5Value : Integer;
+    function GetOldCOLOR6Value : Integer;
+    function GetOldCOLOR7Value : Integer;
+    function GetOldCOLOR8Value : Integer;
+    function GetOldCOLOR9Value : Integer;
+    function GetOldCOLOR10Value : Integer;
+    function GetOldCOLOR11Value : Integer;
+    function GetOldCOLOR12Value : Integer;
+
+    { Properties }
+    property OldID : Integer read GetOldIDValue;
+    property OldID_MOVIMIENTO : Integer read GetOldID_MOVIMIENTOValue;
+    property OldCOLOR1 : Integer read GetOldCOLOR1Value;
+    property OldCOLOR2 : Integer read GetOldCOLOR2Value;
+    property OldCOLOR3 : Integer read GetOldCOLOR3Value;
+    property OldCOLOR4 : Integer read GetOldCOLOR4Value;
+    property OldCOLOR5 : Integer read GetOldCOLOR5Value;
+    property OldCOLOR6 : Integer read GetOldCOLOR6Value;
+    property OldCOLOR7 : Integer read GetOldCOLOR7Value;
+    property OldCOLOR8 : Integer read GetOldCOLOR8Value;
+    property OldCOLOR9 : Integer read GetOldCOLOR9Value;
+    property OldCOLOR10 : Integer read GetOldCOLOR10Value;
+    property OldCOLOR11 : Integer read GetOldCOLOR11Value;
+    property OldCOLOR12 : Integer read GetOldCOLOR12Value;
+  end;
+
+  { TMovimientos_Detalle_ColorBusinessProcessorRules }
+  TMovimientos_Detalle_ColorBusinessProcessorRules = class(TDABusinessProcessorRules, IMovimientos_Detalle_Color, IMovimientos_Detalle_ColorDelta)
+  private
+  protected
+    { Property getters and setters }
+    function GetIDValue: Integer; virtual;
+    function GetIDIsNull: Boolean; virtual;
+    function GetOldIDValue: Integer; virtual;
+    function GetOldIDIsNull: Boolean; virtual;
+    procedure SetIDValue(const aValue: Integer); virtual;
+    procedure SetIDIsNull(const aValue: Boolean); virtual;
+    function GetID_MOVIMIENTOValue: Integer; virtual;
+    function GetID_MOVIMIENTOIsNull: Boolean; virtual;
+    function GetOldID_MOVIMIENTOValue: Integer; virtual;
+    function GetOldID_MOVIMIENTOIsNull: Boolean; virtual;
+    procedure SetID_MOVIMIENTOValue(const aValue: Integer); virtual;
+    procedure SetID_MOVIMIENTOIsNull(const aValue: Boolean); virtual;
+    function GetCOLOR1Value: Integer; virtual;
+    function GetCOLOR1IsNull: Boolean; virtual;
+    function GetOldCOLOR1Value: Integer; virtual;
+    function GetOldCOLOR1IsNull: Boolean; virtual;
+    procedure SetCOLOR1Value(const aValue: Integer); virtual;
+    procedure SetCOLOR1IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR2Value: Integer; virtual;
+    function GetCOLOR2IsNull: Boolean; virtual;
+    function GetOldCOLOR2Value: Integer; virtual;
+    function GetOldCOLOR2IsNull: Boolean; virtual;
+    procedure SetCOLOR2Value(const aValue: Integer); virtual;
+    procedure SetCOLOR2IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR3Value: Integer; virtual;
+    function GetCOLOR3IsNull: Boolean; virtual;
+    function GetOldCOLOR3Value: Integer; virtual;
+    function GetOldCOLOR3IsNull: Boolean; virtual;
+    procedure SetCOLOR3Value(const aValue: Integer); virtual;
+    procedure SetCOLOR3IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR4Value: Integer; virtual;
+    function GetCOLOR4IsNull: Boolean; virtual;
+    function GetOldCOLOR4Value: Integer; virtual;
+    function GetOldCOLOR4IsNull: Boolean; virtual;
+    procedure SetCOLOR4Value(const aValue: Integer); virtual;
+    procedure SetCOLOR4IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR5Value: Integer; virtual;
+    function GetCOLOR5IsNull: Boolean; virtual;
+    function GetOldCOLOR5Value: Integer; virtual;
+    function GetOldCOLOR5IsNull: Boolean; virtual;
+    procedure SetCOLOR5Value(const aValue: Integer); virtual;
+    procedure SetCOLOR5IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR6Value: Integer; virtual;
+    function GetCOLOR6IsNull: Boolean; virtual;
+    function GetOldCOLOR6Value: Integer; virtual;
+    function GetOldCOLOR6IsNull: Boolean; virtual;
+    procedure SetCOLOR6Value(const aValue: Integer); virtual;
+    procedure SetCOLOR6IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR7Value: Integer; virtual;
+    function GetCOLOR7IsNull: Boolean; virtual;
+    function GetOldCOLOR7Value: Integer; virtual;
+    function GetOldCOLOR7IsNull: Boolean; virtual;
+    procedure SetCOLOR7Value(const aValue: Integer); virtual;
+    procedure SetCOLOR7IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR8Value: Integer; virtual;
+    function GetCOLOR8IsNull: Boolean; virtual;
+    function GetOldCOLOR8Value: Integer; virtual;
+    function GetOldCOLOR8IsNull: Boolean; virtual;
+    procedure SetCOLOR8Value(const aValue: Integer); virtual;
+    procedure SetCOLOR8IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR9Value: Integer; virtual;
+    function GetCOLOR9IsNull: Boolean; virtual;
+    function GetOldCOLOR9Value: Integer; virtual;
+    function GetOldCOLOR9IsNull: Boolean; virtual;
+    procedure SetCOLOR9Value(const aValue: Integer); virtual;
+    procedure SetCOLOR9IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR10Value: Integer; virtual;
+    function GetCOLOR10IsNull: Boolean; virtual;
+    function GetOldCOLOR10Value: Integer; virtual;
+    function GetOldCOLOR10IsNull: Boolean; virtual;
+    procedure SetCOLOR10Value(const aValue: Integer); virtual;
+    procedure SetCOLOR10IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR11Value: Integer; virtual;
+    function GetCOLOR11IsNull: Boolean; virtual;
+    function GetOldCOLOR11Value: Integer; virtual;
+    function GetOldCOLOR11IsNull: Boolean; virtual;
+    procedure SetCOLOR11Value(const aValue: Integer); virtual;
+    procedure SetCOLOR11IsNull(const aValue: Boolean); virtual;
+    function GetCOLOR12Value: Integer; virtual;
+    function GetCOLOR12IsNull: Boolean; virtual;
+    function GetOldCOLOR12Value: Integer; virtual;
+    function GetOldCOLOR12IsNull: Boolean; virtual;
+    procedure SetCOLOR12Value(const aValue: Integer); virtual;
+    procedure SetCOLOR12IsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property ID : Integer read GetIDValue write SetIDValue;
+    property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
+    property OldID : Integer read GetOldIDValue;
+    property OldIDIsNull : Boolean read GetOldIDIsNull;
+    property ID_MOVIMIENTO : Integer read GetID_MOVIMIENTOValue write SetID_MOVIMIENTOValue;
+    property ID_MOVIMIENTOIsNull : Boolean read GetID_MOVIMIENTOIsNull write SetID_MOVIMIENTOIsNull;
+    property OldID_MOVIMIENTO : Integer read GetOldID_MOVIMIENTOValue;
+    property OldID_MOVIMIENTOIsNull : Boolean read GetOldID_MOVIMIENTOIsNull;
+    property COLOR1 : Integer read GetCOLOR1Value write SetCOLOR1Value;
+    property COLOR1IsNull : Boolean read GetCOLOR1IsNull write SetCOLOR1IsNull;
+    property OldCOLOR1 : Integer read GetOldCOLOR1Value;
+    property OldCOLOR1IsNull : Boolean read GetOldCOLOR1IsNull;
+    property COLOR2 : Integer read GetCOLOR2Value write SetCOLOR2Value;
+    property COLOR2IsNull : Boolean read GetCOLOR2IsNull write SetCOLOR2IsNull;
+    property OldCOLOR2 : Integer read GetOldCOLOR2Value;
+    property OldCOLOR2IsNull : Boolean read GetOldCOLOR2IsNull;
+    property COLOR3 : Integer read GetCOLOR3Value write SetCOLOR3Value;
+    property COLOR3IsNull : Boolean read GetCOLOR3IsNull write SetCOLOR3IsNull;
+    property OldCOLOR3 : Integer read GetOldCOLOR3Value;
+    property OldCOLOR3IsNull : Boolean read GetOldCOLOR3IsNull;
+    property COLOR4 : Integer read GetCOLOR4Value write SetCOLOR4Value;
+    property COLOR4IsNull : Boolean read GetCOLOR4IsNull write SetCOLOR4IsNull;
+    property OldCOLOR4 : Integer read GetOldCOLOR4Value;
+    property OldCOLOR4IsNull : Boolean read GetOldCOLOR4IsNull;
+    property COLOR5 : Integer read GetCOLOR5Value write SetCOLOR5Value;
+    property COLOR5IsNull : Boolean read GetCOLOR5IsNull write SetCOLOR5IsNull;
+    property OldCOLOR5 : Integer read GetOldCOLOR5Value;
+    property OldCOLOR5IsNull : Boolean read GetOldCOLOR5IsNull;
+    property COLOR6 : Integer read GetCOLOR6Value write SetCOLOR6Value;
+    property COLOR6IsNull : Boolean read GetCOLOR6IsNull write SetCOLOR6IsNull;
+    property OldCOLOR6 : Integer read GetOldCOLOR6Value;
+    property OldCOLOR6IsNull : Boolean read GetOldCOLOR6IsNull;
+    property COLOR7 : Integer read GetCOLOR7Value write SetCOLOR7Value;
+    property COLOR7IsNull : Boolean read GetCOLOR7IsNull write SetCOLOR7IsNull;
+    property OldCOLOR7 : Integer read GetOldCOLOR7Value;
+    property OldCOLOR7IsNull : Boolean read GetOldCOLOR7IsNull;
+    property COLOR8 : Integer read GetCOLOR8Value write SetCOLOR8Value;
+    property COLOR8IsNull : Boolean read GetCOLOR8IsNull write SetCOLOR8IsNull;
+    property OldCOLOR8 : Integer read GetOldCOLOR8Value;
+    property OldCOLOR8IsNull : Boolean read GetOldCOLOR8IsNull;
+    property COLOR9 : Integer read GetCOLOR9Value write SetCOLOR9Value;
+    property COLOR9IsNull : Boolean read GetCOLOR9IsNull write SetCOLOR9IsNull;
+    property OldCOLOR9 : Integer read GetOldCOLOR9Value;
+    property OldCOLOR9IsNull : Boolean read GetOldCOLOR9IsNull;
+    property COLOR10 : Integer read GetCOLOR10Value write SetCOLOR10Value;
+    property COLOR10IsNull : Boolean read GetCOLOR10IsNull write SetCOLOR10IsNull;
+    property OldCOLOR10 : Integer read GetOldCOLOR10Value;
+    property OldCOLOR10IsNull : Boolean read GetOldCOLOR10IsNull;
+    property COLOR11 : Integer read GetCOLOR11Value write SetCOLOR11Value;
+    property COLOR11IsNull : Boolean read GetCOLOR11IsNull write SetCOLOR11IsNull;
+    property OldCOLOR11 : Integer read GetOldCOLOR11Value;
+    property OldCOLOR11IsNull : Boolean read GetOldCOLOR11IsNull;
+    property COLOR12 : Integer read GetCOLOR12Value write SetCOLOR12Value;
+    property COLOR12IsNull : Boolean read GetCOLOR12IsNull write SetCOLOR12IsNull;
+    property OldCOLOR12 : Integer read GetOldCOLOR12Value;
+    property OldCOLOR12IsNull : Boolean read GetOldCOLOR12IsNull;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
   { IDetalleReservasDelta }
   IDetalleReservasDelta = interface(IDetalleReservas)
-  ['{3087502E-1C78-45AA-9164-988726607EE9}']
+  ['{D651D2E2-590A-4E70-8235-DDD1A2FA5927}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -511,8 +739,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetID_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ALMACENValue: Integer;
@@ -521,8 +751,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetID_ALMACENValue(const aValue: Integer);
@@ -542,8 +774,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetID_ARTICULOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ARTICULO]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ARTICULO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ARTICULOValue: Integer;
@@ -552,8 +786,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ARTICULOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ARTICULO]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ARTICULO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetID_ARTICULOValue(const aValue: Integer);
@@ -573,8 +809,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldALMACENValue: String;
@@ -583,8 +821,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetALMACENValue(const aValue: String);
@@ -604,8 +844,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetID_EMPRESAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_EMPRESA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_EMPRESA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_EMPRESAValue: Integer;
@@ -614,8 +856,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_EMPRESAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_EMPRESA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_EMPRESA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetID_EMPRESAValue(const aValue: Integer);
@@ -635,8 +879,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetREFERENCIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldREFERENCIAValue: String;
@@ -645,8 +891,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldREFERENCIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioREFERENCIA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioREFERENCIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
@@ -666,8 +914,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetFAMILIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioFAMILIA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioFAMILIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldFAMILIAValue: String;
@@ -676,8 +926,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldFAMILIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioFAMILIA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioFAMILIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetFAMILIAValue(const aValue: String);
@@ -697,8 +949,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetDESCRIPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDESCRIPCION]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDESCRIPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
@@ -707,8 +961,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldDESCRIPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioDESCRIPCION]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioDESCRIPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
@@ -728,8 +984,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetUNIDAD_MEDIDAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDAD_MEDIDA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDAD_MEDIDA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldUNIDAD_MEDIDAValue: String;
@@ -738,8 +996,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldUNIDAD_MEDIDAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDAD_MEDIDA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDAD_MEDIDA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetUNIDAD_MEDIDAValue(const aValue: String);
@@ -753,14 +1013,121 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDAD_MEDIDA] := Null;
 end;
 
+function TInventarioBusinessProcessorRules.GetCAMPOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAMPOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetCAMPOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAMPOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TInventarioBusinessProcessorRules.GetOldCAMPOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCAMPOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetOldCAMPOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCAMPOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TInventarioBusinessProcessorRules.SetCAMPOTECNICOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAMPOTECNICO] := aValue;
+end;
+
+procedure TInventarioBusinessProcessorRules.SetCAMPOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAMPOTECNICO] := Null;
+end;
+
+function TInventarioBusinessProcessorRules.GetCODIGOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCODIGOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetCODIGOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCODIGOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TInventarioBusinessProcessorRules.GetOldCODIGOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCODIGOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetOldCODIGOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCODIGOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TInventarioBusinessProcessorRules.SetCODIGOTECNICOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCODIGOTECNICO] := aValue;
+end;
+
+procedure TInventarioBusinessProcessorRules.SetCODIGOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCODIGOTECNICO] := Null;
+end;
+
+function TInventarioBusinessProcessorRules.GetDISENOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDISENOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetDISENOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDISENOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TInventarioBusinessProcessorRules.GetOldDISENOTECNICOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioDISENOTECNICO];
+end;
+
+function TInventarioBusinessProcessorRules.GetOldDISENOTECNICOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioDISENOTECNICO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TInventarioBusinessProcessorRules.SetDISENOTECNICOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDISENOTECNICO] := aValue;
+end;
+
+procedure TInventarioBusinessProcessorRules.SetDISENOTECNICOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioDISENOTECNICO] := Null;
+end;
+
 function TInventarioBusinessProcessorRules.GetSTOCKValue: Float;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK];
 end;
 
 function TInventarioBusinessProcessorRules.GetSTOCKIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldSTOCKValue: Float;
@@ -769,8 +1136,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldSTOCKIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioSTOCK]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioSTOCK];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetSTOCKValue(const aValue: Float);
@@ -790,8 +1159,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENValue: Float;
@@ -800,8 +1171,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetUNIDADES_ALMACENValue(const aValue: Float);
@@ -821,8 +1194,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetRESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioRESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioRESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldRESERVAValue: Float;
@@ -831,8 +1206,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldRESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioRESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioRESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetRESERVAValue(const aValue: Float);
@@ -852,8 +1229,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetPENDIENTE_RECEPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPENDIENTE_RECEPCION]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPENDIENTE_RECEPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldPENDIENTE_RECEPCIONValue: Float;
@@ -862,8 +1241,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldPENDIENTE_RECEPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioPENDIENTE_RECEPCION]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioPENDIENTE_RECEPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetPENDIENTE_RECEPCIONValue(const aValue: Float);
@@ -883,8 +1264,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetTIPO_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldTIPO_ALMACENValue: String;
@@ -893,8 +1276,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldTIPO_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetTIPO_ALMACENValue(const aValue: String);
@@ -914,8 +1299,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetIDIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldIDValue: Integer;
@@ -924,8 +1311,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldIDIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetIDValue(const aValue: Integer);
@@ -945,8 +1334,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetCANTIDADIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCANTIDAD]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCANTIDAD];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldCANTIDADValue: Float;
@@ -955,8 +1346,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldCANTIDADIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCANTIDAD]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCANTIDAD];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetCANTIDADValue(const aValue: Float);
@@ -976,8 +1369,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetFECHA_MOVIMIENTOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioFECHA_MOVIMIENTO]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioFECHA_MOVIMIENTO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldFECHA_MOVIMIENTOValue: DateTime;
@@ -986,8 +1381,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldFECHA_MOVIMIENTOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioFECHA_MOVIMIENTO]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioFECHA_MOVIMIENTO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetFECHA_MOVIMIENTOValue(const aValue: DateTime);
@@ -1007,8 +1404,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetCAUSAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAUSA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCAUSA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldCAUSAValue: String;
@@ -1017,8 +1416,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldCAUSAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCAUSA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCAUSA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetCAUSAValue(const aValue: String);
@@ -1038,8 +1439,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetTIPOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldTIPOValue: String;
@@ -1048,8 +1451,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldTIPOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetTIPOValue(const aValue: String);
@@ -1069,8 +1474,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetID_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ALMACEN_RESERVAValue: Integer;
@@ -1079,8 +1486,10 @@ begin
 end;
 
 function TInventarioBusinessProcessorRules.GetOldID_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioID_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TInventarioBusinessProcessorRules.SetID_ALMACEN_RESERVAValue(const aValue: Integer);
@@ -1095,6 +1504,508 @@ begin
 end;
 
 
+{ TMovimientos_Detalle_ColorBusinessProcessorRules }
+constructor TMovimientos_Detalle_ColorBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TMovimientos_Detalle_ColorBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetIDIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorID];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldIDIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorID];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetIDValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetID_MOVIMIENTOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetID_MOVIMIENTOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldID_MOVIMIENTOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldID_MOVIMIENTOIsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetID_MOVIMIENTOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetID_MOVIMIENTOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorID_MOVIMIENTO] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR1Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR1];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR1IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR1];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR1Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR1];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR1IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR1];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR1Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR1] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR1IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR1] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR2Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR2];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR2IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR2];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR2Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR2];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR2IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR2];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR2Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR2] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR2IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR2] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR3Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR3];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR3IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR3];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR3Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR3];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR3IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR3];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR3Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR3] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR3IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR3] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR4Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR4];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR4IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR4];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR4Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR4];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR4IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR4];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR4Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR4] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR4IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR4] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR5Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR5];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR5IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR5];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR5Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR5];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR5IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR5];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR5Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR5] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR5IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR5] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR6Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR6];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR6IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR6];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR6Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR6];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR6IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR6];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR6Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR6] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR6IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR6] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR7Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR7];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR7IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR7];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR7Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR7];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR7IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR7];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR7Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR7] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR7IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR7] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR8Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR8];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR8IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR8];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR8Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR8];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR8IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR8];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR8Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR8] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR8IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR8] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR9Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR9];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR9IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR9];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR9Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR9];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR9IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR9];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR9Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR9] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR9IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR9] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR10Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR10];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR10IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR10];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR10Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR10];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR10IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR10];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR10Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR10] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR10IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR10] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR11Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR11];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR11IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR11];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR11Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR11];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR11IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR11];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR11Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR11] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR11IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR11] := Null;
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR12Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR12];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetCOLOR12IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR12];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR12Value: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR12];
+end;
+
+function TMovimientos_Detalle_ColorBusinessProcessorRules.GetOldCOLOR12IsNull: Boolean;
+var v: variant;
+begin
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_Movimientos_Detalle_ColorCOLOR12];
+  result := VarIsNull(v) or VarIsClear(v);
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR12Value(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR12] := aValue;
+end;
+
+procedure TMovimientos_Detalle_ColorBusinessProcessorRules.SetCOLOR12IsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_Movimientos_Detalle_ColorCOLOR12] := Null;
+end;
+
+
 { TDetalleReservasBusinessProcessorRules }
 constructor TDetalleReservasBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
 begin
@@ -1112,8 +2023,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetIDIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldIDValue: Integer;
@@ -1122,8 +2035,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldIDIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetIDValue(const aValue: Integer);
@@ -1143,8 +2058,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetID_EMPRESAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_EMPRESA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_EMPRESA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_EMPRESAValue: Integer;
@@ -1153,8 +2070,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_EMPRESAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_EMPRESA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_EMPRESA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetID_EMPRESAValue(const aValue: Integer);
@@ -1174,8 +2093,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetID_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ALMACENValue: Integer;
@@ -1184,8 +2105,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetID_ALMACENValue(const aValue: Integer);
@@ -1205,8 +2128,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetNOMBRE_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasNOMBRE_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasNOMBRE_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldNOMBRE_ALMACENValue: String;
@@ -1215,8 +2140,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldNOMBRE_ALMACENIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasNOMBRE_ALMACEN]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasNOMBRE_ALMACEN];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetNOMBRE_ALMACENValue(const aValue: String);
@@ -1236,8 +2163,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetFECHA_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFECHA_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFECHA_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFECHA_RESERVAValue: DateTime;
@@ -1246,8 +2175,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFECHA_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFECHA_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFECHA_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetFECHA_RESERVAValue(const aValue: DateTime);
@@ -1267,8 +2198,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetCAUSA_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasCAUSA_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasCAUSA_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldCAUSA_RESERVAValue: String;
@@ -1277,8 +2210,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldCAUSA_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasCAUSA_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasCAUSA_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetCAUSA_RESERVAValue(const aValue: String);
@@ -1298,8 +2233,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetID_ARTICULOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ARTICULO]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ARTICULO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ARTICULOValue: Integer;
@@ -1308,8 +2245,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ARTICULOIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ARTICULO]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ARTICULO];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetID_ARTICULOValue(const aValue: Integer);
@@ -1329,8 +2268,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetREFERENCIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasREFERENCIA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasREFERENCIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldREFERENCIAValue: String;
@@ -1339,8 +2280,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldREFERENCIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasREFERENCIA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasREFERENCIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
@@ -1360,8 +2303,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetDESCRIPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasDESCRIPCION]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasDESCRIPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
@@ -1370,8 +2315,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldDESCRIPCIONIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasDESCRIPCION]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasDESCRIPCION];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
@@ -1391,8 +2338,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetFAMILIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFAMILIA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFAMILIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFAMILIAValue: String;
@@ -1401,8 +2350,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFAMILIAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFAMILIA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFAMILIA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetFAMILIAValue(const aValue: String);
@@ -1422,8 +2373,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetUNIDAD_MEDIDAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasUNIDAD_MEDIDA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasUNIDAD_MEDIDA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldUNIDAD_MEDIDAValue: String;
@@ -1432,8 +2385,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldUNIDAD_MEDIDAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasUNIDAD_MEDIDA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasUNIDAD_MEDIDA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetUNIDAD_MEDIDAValue(const aValue: String);
@@ -1453,8 +2408,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetFABRICANTEIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFABRICANTE]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasFABRICANTE];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFABRICANTEValue: String;
@@ -1463,8 +2420,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldFABRICANTEIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFABRICANTE]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasFABRICANTE];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetFABRICANTEValue(const aValue: String);
@@ -1484,8 +2443,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetREFERENCIA_FABRIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasREFERENCIA_FABR]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasREFERENCIA_FABR];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldREFERENCIA_FABRValue: String;
@@ -1494,8 +2455,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldREFERENCIA_FABRIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasREFERENCIA_FABR]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasREFERENCIA_FABR];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetREFERENCIA_FABRValue(const aValue: String);
@@ -1515,8 +2478,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetCANTIDADIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasCANTIDAD]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasCANTIDAD];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldCANTIDADValue: Currency;
@@ -1525,8 +2490,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldCANTIDADIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasCANTIDAD]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasCANTIDAD];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetCANTIDADValue(const aValue: Currency);
@@ -1546,8 +2513,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetID_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ALMACEN_RESERVAValue: Integer;
@@ -1556,8 +2525,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetID_ALMACEN_RESERVAValue(const aValue: Integer);
@@ -1577,8 +2548,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetNOMBRE_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasNOMBRE_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasNOMBRE_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldNOMBRE_ALMACEN_RESERVAValue: String;
@@ -1587,8 +2560,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldNOMBRE_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasNOMBRE_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasNOMBRE_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetNOMBRE_ALMACEN_RESERVAValue(const aValue: String);
@@ -1608,8 +2583,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetID_EMPRESA_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_EMPRESA_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.NewValueByName[fld_DetalleReservasID_EMPRESA_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_EMPRESA_ALMACEN_RESERVAValue: Integer;
@@ -1618,8 +2595,10 @@ begin
 end;
 
 function TDetalleReservasBusinessProcessorRules.GetOldID_EMPRESA_ALMACEN_RESERVAIsNull: Boolean;
+var v: variant;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_EMPRESA_ALMACEN_RESERVA]);
+  v := BusinessProcessor.CurrentChange.OldValueByName[fld_DetalleReservasID_EMPRESA_ALMACEN_RESERVA];
+  result := VarIsNull(v) or VarIsClear(v);
 end;
 
 procedure TDetalleReservasBusinessProcessorRules.SetID_EMPRESA_ALMACEN_RESERVAValue(const aValue: Integer);
@@ -1636,6 +2615,7 @@ end;
 
 initialization
   RegisterBusinessProcessorRules(RID_InventarioDelta, TInventarioBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_Movimientos_Detalle_ColorDelta, TMovimientos_Detalle_ColorBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_DetalleReservasDelta, TDetalleReservasBusinessProcessorRules);
 
 end.
diff --git a/Source/Modulos/Inventario/Model/uBizInventario.pas b/Source/Modulos/Inventario/Model/uBizInventario.pas
index 6e503d3..2bf7e22 100644
--- a/Source/Modulos/Inventario/Model/uBizInventario.pas
+++ b/Source/Modulos/Inventario/Model/uBizInventario.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   uDAInterfaces, uDADataTable, schInventarioClient_Intf,
-  uBizArticulos, uDBSelectionListUtils;
+  uBizArticulos, uBizMovimientosDetalleColor, uDBSelectionListUtils;
 
 const
   BIZ_CLIENT_INVENTARIO = 'Client.Inventario';
@@ -42,6 +42,10 @@ type
     function GetTipo: TEnumTipoMovimiento;
     procedure SetTipo(const Value: TEnumTipoMovimiento);
     property TipoMovimiento: TEnumTipoMovimiento read GetTipo write SetTipo;
+
+    function GetDetalleColores: IBizMovimientosDetalleColor;
+    procedure SetDetalleColores(Value: IBizMovimientosDetalleColor);
+    property DetalleColores: IBizMovimientosDetalleColor read GetDetalleColores write SetDetalleColores;
   end;
 
   TBizDetalleReservas = class(TDetalleReservasDataTableRules, IBizDetalleReservas, ISeleccionable)
@@ -60,6 +64,12 @@ type
     FIDAlmacenOrigen : Integer;
     FIDAlmacenDestino : Integer;
     FTipoMovimiento : TEnumTipoMovimiento;
+    FDetalleColores : IBizMovimientosDetalleColor;
+    FDetalleColoresLink : TDADataSource;
+
+    function GetDetalleColores: IBizMovimientosDetalleColor;
+    procedure SetDetalleColores(Value: IBizMovimientosDetalleColor);
+
     function GetIDAlmacenOrigen: Integer;
     procedure SetIDAlmacenOrigen(const Value: Integer);
     function GetIDAlmacenDestino: Integer;
@@ -80,6 +90,7 @@ type
     property TipoMovimiento: TEnumTipoMovimiento read GetTipo write SetTipo;
     property SeleccionableInterface : ISeleccionable read FSeleccionableInterface
         write FSeleccionableInterface implements ISeleccionable;
+    property DetalleColores: IBizMovimientosDetalleColor read GetDetalleColores write SetDetalleColores;
 
     constructor Create(aDataTable: TDADataTable); override;
     destructor Destroy; override;
@@ -128,11 +139,16 @@ begin
   IDAlmacenDestino := -1;
   TipoMovimiento := tEntradaLibre;
   FSeleccionableInterface := TSeleccionable.Create(aDataTable);
+  FDetalleColoresLink := TDADataSource.Create(NIL);
+  FDetalleColoresLink.DataTable := aDataTable;
 end;
 
 destructor TBizInventario.Destroy;
 begin
   FSeleccionableInterface := NIL;
+  FDetalleColores := NIL;
+  FDetalleColoresLink.Free;
+  
   inherited;
 end;
 
@@ -157,6 +173,11 @@ begin
   End;
 end;
 
+function TBizInventario.GetDetalleColores: IBizMovimientosDetalleColor;
+begin
+  Result := FDetalleColores;
+end;
+
 function TBizInventario.GetIDAlmacenDestino: Integer;
 begin
   Result := FIDAlmacenDestino;
@@ -172,6 +193,12 @@ begin
   Result := FTipoMovimiento;
 end;
 
+procedure TBizInventario.SetDetalleColores(Value: IBizMovimientosDetalleColor);
+begin
+  FDetalleColores := Value;
+  EnlazarMaestroDetalle(FDetalleColoresLink, FDetalleColores);
+end;
+
 procedure TBizInventario.SetIDAlmacenDestino(const Value: Integer);
 begin
   FIDAlmacenDestino := Value;
diff --git a/Source/Modulos/Inventario/Model/uBizMovimientosDetalleColor.pas b/Source/Modulos/Inventario/Model/uBizMovimientosDetalleColor.pas
new file mode 100644
index 0000000..21fb9e8
--- /dev/null
+++ b/Source/Modulos/Inventario/Model/uBizMovimientosDetalleColor.pas
@@ -0,0 +1,48 @@
+unit uBizMovimientosDetalleColor;
+
+interface
+
+uses
+  uDADataTable, schInventarioClient_Intf;
+
+const
+  BIZ_CLIENT_MOVIMIENTOS_DETALLE_COLOR = 'Client.MovimientosDetalleColor';
+
+
+type
+  IBizMovimientosDetalleColor = interface(IMovimientos_Detalle_Color)
+  ['{D8145BFA-9DBC-4889-9FC4-7C7194A24BBF}']
+  end;
+
+  TBizMovimientosDetalleColor = class(TMovimientos_Detalle_ColorDataTableRules, IBizMovimientosDetalleColor)
+  protected
+    procedure OnNewRecord(Sender: TDADataTable); override;
+    procedure BeforeInsert(Sender: TDADataTable); override;
+  end;
+
+implementation
+
+uses
+  DB;
+
+{ TBizMovimientosDetalleColor }
+
+procedure TBizMovimientosDetalleColor.BeforeInsert(Sender: TDADataTable);
+var
+  AMasterTable : TDADataTable;
+begin
+  inherited;
+  AMasterTable := DataTable.GetMasterDataTable;
+  if Assigned(AMasterTable) and (AMasterTable.State = dsInsert) then
+    AMasterTable.Post;
+end;
+
+procedure TBizMovimientosDetalleColor.OnNewRecord(Sender: TDADataTable);
+begin
+  inherited;
+end;
+
+initialization
+  RegisterDataTableRules(BIZ_CLIENT_MOVIMIENTOS_DETALLE_COLOR, TBizMovimientosDetalleColor);
+
+end.
diff --git a/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm b/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm
index e6b5662..4983957 100644
--- a/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm
+++ b/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm
@@ -175,7 +175,9 @@ object PluginInventario: TPluginInventario
     object actInventarioObras: TAction
       Category = 'Log'#237'stica'
       Caption = 'Inventario obras'
+      Enabled = False
       ImageIndex = 1
+      Visible = False
       OnExecute = actInventarioObrasExecute
     end
   end
diff --git a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
index 1a89e5b..3bb8aa9 100644
--- a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
+++ b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
@@ -5,8 +5,8 @@ object srvInventario: TsrvInventario
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
   BeforeAcquireConnection = DataAbstractServiceBeforeAcquireConnection
-  Height = 168
-  Width = 300
+  Height = 212
+  Width = 335
   object schInventario: TDASchema
     ConnectionManager = dmServer.ConnectionManager
     DataDictionary = DataDictionary
@@ -19,18 +19,19 @@ object srvInventario: TsrvInventario
             TargetTable = 'V_INVENTARIO'
             SQL = 
               'SELECT'#10'    ID_ALMACEN, ID_ARTICULO, NOMBRE as ALMACEN, ID_EMPRES' +
-              'A, REFERENCIA, FAMILIA,'#10'    DESCRIPCION, UNIDAD_MEDIDA,'#10'/*    RE' +
-              'FERENCIA_PROV as REFERENCIA_PROVEEDOR, PRECIO_NETO, COSTE_UNIDAD' +
-              'ES,  SE ELIMINAN LOS PRECIOS CON HASTA SABER QUE DECISIONES SE T' +
-              'OMAN*/'#10'    STOCK, UNIDADES_ALMACEN, RESERVA, PENDIENTE_RECEPCION' +
-              ', TIPO_ALMACEN,'#10'    '#10'    /*'#10'    NO BORRAR YA QUE SIRVE PARA LAS ' +
-              'ENTRADAS Y SALIDAS DE ALMACEN(TABLA MOVIMIENTOS)'#10'    DEBERIA GEN' +
-              'ERAR UNA TABLA DE MOVIMIENTOS INDEPENDIENTE DEL INVENTARIO PERO ' +
-              'POR FALTA'#10'    DE TIEMPO Y FIABILIDAD YA QUE AHORA FUNCIONA TODO,' +
-              ' CREAMOS ESTOS CAMPOS FICTICIOS'#10'    */'#10#10'    0 as ID, 0 as CANTID' +
-              'AD, current_date as FECHA_MOVIMIENTO, NULL as CAUSA, NULL as TIP' +
-              'O,'#10'    0 as ID_ALMACEN_RESERVA'#10#10#10'FROM V_INVENTARIO'#10'where {where}' +
-              #10'ORDER BY ID_ARTICULO'#10
+              'A, REFERENCIA, FAMILIA,'#10'    DESCRIPCION, UNIDAD_MEDIDA, CAMPOTEC' +
+              'NICO, CODIGOTECNICO, DISENOTECNICO,'#10#10'/*    REFERENCIA_PROV as RE' +
+              'FERENCIA_PROVEEDOR, PRECIO_NETO, COSTE_UNIDADES,  SE ELIMINAN LO' +
+              'S PRECIOS CON HASTA SABER QUE DECISIONES SE TOMAN*/'#10'    STOCK, U' +
+              'NIDADES_ALMACEN, RESERVA, PENDIENTE_RECEPCION, TIPO_ALMACEN,'#10'   ' +
+              ' '#10'    /*'#10'    NO BORRAR YA QUE SIRVE PARA LAS ENTRADAS Y SALIDAS ' +
+              'DE ALMACEN(TABLA MOVIMIENTOS)'#10'    DEBERIA GENERAR UNA TABLA DE M' +
+              'OVIMIENTOS INDEPENDIENTE DEL INVENTARIO PERO POR FALTA'#10'    DE TI' +
+              'EMPO Y FIABILIDAD YA QUE AHORA FUNCIONA TODO, CREAMOS ESTOS CAMP' +
+              'OS FICTICIOS'#10'    */'#10#10'    0 as ID, 0 as CANTIDAD, current_date as' +
+              ' FECHA_MOVIMIENTO, NULL as CAUSA, NULL as TIPO,'#10'    0 as ID_ALMA' +
+              'CEN_RESERVA'#10#10#10'FROM V_INVENTARIO'#10'where {where}'#10'ORDER BY ID_ARTICU' +
+              'LO'#10#10#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -43,8 +44,7 @@ object srvInventario: TsrvInventario
               end
               item
                 DatasetField = 'ALMACEN'
-                TableField = '<unknown>'
-                SQLOrigin = 'ALMACEN'
+                TableField = 'ALMACEN'
               end
               item
                 DatasetField = 'ID_EMPRESA'
@@ -66,6 +66,18 @@ object srvInventario: TsrvInventario
                 DatasetField = 'UNIDAD_MEDIDA'
                 TableField = 'UNIDAD_MEDIDA'
               end
+              item
+                DatasetField = 'CAMPOTECNICO'
+                TableField = 'CAMPOTECNICO'
+              end
+              item
+                DatasetField = 'CODIGOTECNICO'
+                TableField = 'CODIGOTECNICO'
+              end
+              item
+                DatasetField = 'DISENOTECNICO'
+                TableField = 'DISENOTECNICO'
+              end
               item
                 DatasetField = 'STOCK'
                 TableField = 'STOCK'
@@ -88,33 +100,27 @@ object srvInventario: TsrvInventario
               end
               item
                 DatasetField = 'ID'
-                TableField = '<unknown>'
-                SQLOrigin = 'ID'
+                TableField = 'ID'
               end
               item
                 DatasetField = 'CANTIDAD'
-                TableField = '<unknown>'
-                SQLOrigin = 'CANTIDAD'
+                TableField = 'CANTIDAD'
               end
               item
                 DatasetField = 'FECHA_MOVIMIENTO'
-                TableField = '<unknown>'
-                SQLOrigin = 'FECHA_MOVIMIENTO'
+                TableField = 'FECHA_MOVIMIENTO'
               end
               item
                 DatasetField = 'CAUSA'
-                TableField = '<unknown>'
-                SQLOrigin = 'CAUSA'
+                TableField = 'CAUSA'
               end
               item
                 DatasetField = 'TIPO'
-                TableField = '<unknown>'
-                SQLOrigin = 'TIPO'
+                TableField = 'TIPO'
               end
               item
                 DatasetField = 'ID_ALMACEN_RESERVA'
-                TableField = '<unknown>'
-                SQLOrigin = 'ID_ALMACEN_RESERVA'
+                TableField = 'ID_ALMACEN_RESERVA'
               end>
           end>
         Name = 'Inventario'
@@ -163,6 +169,21 @@ object srvInventario: TsrvInventario
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'CAMPOTECNICO'
+            DataType = datString
+            Size = 200
+          end
+          item
+            Name = 'CODIGOTECNICO'
+            DataType = datString
+            Size = 15
+          end
+          item
+            Name = 'DISENOTECNICO'
+            DataType = datString
+            Size = 6
+          end
           item
             Name = 'STOCK'
             DataType = datFloat
@@ -190,7 +211,8 @@ object srvInventario: TsrvInventario
           end
           item
             Name = 'ID'
-            DataType = datInteger
+            DataType = datAutoInc
+            GeneratorName = 'GEN_MOVIMIENTOS_ID'
             DictionaryEntry = 'INVENTARIO_ID'
             InPrimaryKey = True
           end
@@ -221,6 +243,151 @@ object srvInventario: TsrvInventario
             DataType = datInteger
           end>
       end
+      item
+        Params = <>
+        Statements = <
+          item
+            ConnectionType = 'Interbase'
+            Default = True
+            Name = 'IBX'
+            SQL = 
+              'SELECT ID, ID_MOVIMIENTO, COLOR1, COLOR2, COLOR3, COLOR4, COLOR5' +
+              ', COLOR6, COLOR7, COLOR8,'#10'       COLOR9, COLOR10, COLOR11, COLOR' +
+              '12'#10'FROM MOVIMIENTOS_DETALLE_COLOR'#10'where {where}'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_MOVIMIENTO'
+                TableField = 'ID_MOVIMIENTO'
+              end
+              item
+                DatasetField = 'COLOR1'
+                TableField = 'COLOR1'
+              end
+              item
+                DatasetField = 'COLOR2'
+                TableField = 'COLOR2'
+              end
+              item
+                DatasetField = 'COLOR3'
+                TableField = 'COLOR3'
+              end
+              item
+                DatasetField = 'COLOR4'
+                TableField = 'COLOR4'
+              end
+              item
+                DatasetField = 'COLOR5'
+                TableField = 'COLOR5'
+              end
+              item
+                DatasetField = 'COLOR6'
+                TableField = 'COLOR6'
+              end
+              item
+                DatasetField = 'COLOR7'
+                TableField = 'COLOR7'
+              end
+              item
+                DatasetField = 'COLOR8'
+                TableField = 'COLOR8'
+              end
+              item
+                DatasetField = 'COLOR9'
+                TableField = 'COLOR9'
+              end
+              item
+                DatasetField = 'COLOR10'
+                TableField = 'COLOR10'
+              end
+              item
+                DatasetField = 'COLOR11'
+                TableField = 'COLOR11'
+              end
+              item
+                DatasetField = 'COLOR12'
+                TableField = 'COLOR12'
+              end>
+          end>
+        Name = 'Movimientos_Detalle_Color'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_MOVIMIENTOS_DET_COLOR_ID'
+            DictionaryEntry = 'Movimientos_Detalle_Color_ID'
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_MOVIMIENTO'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_ID_MOVIMIENTO'
+          end
+          item
+            Name = 'COLOR1'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR1'
+          end
+          item
+            Name = 'COLOR2'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR2'
+          end
+          item
+            Name = 'COLOR3'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR3'
+          end
+          item
+            Name = 'COLOR4'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR4'
+          end
+          item
+            Name = 'COLOR5'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR5'
+          end
+          item
+            Name = 'COLOR6'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR6'
+          end
+          item
+            Name = 'COLOR7'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR7'
+          end
+          item
+            Name = 'COLOR8'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR8'
+          end
+          item
+            Name = 'COLOR9'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR9'
+          end
+          item
+            Name = 'COLOR10'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR10'
+          end
+          item
+            Name = 'COLOR11'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR11'
+          end
+          item
+            Name = 'COLOR12'
+            DataType = datInteger
+            DictionaryEntry = 'Movimientos_Detalle_Color_COLOR12'
+          end>
+      end
       item
         Params = <>
         Statements = <
@@ -518,9 +685,264 @@ object srvInventario: TsrvInventario
             ColumnMappings = <>
           end>
         Name = 'Update_Inventario'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_MOVIMIENTOS_DET_COLOR_ID'
+            Value = ''
+          end
+          item
+            Name = 'ID_MOVIMIENTO'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR1'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR2'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR3'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR4'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR5'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR6'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR7'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR8'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR9'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR10'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR11'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR12'
+            DataType = datInteger
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'MOVIMIENTOS_DETALLE_COLOR'
+            SQL = 
+              'INSERT'#10'  INTO MOVIMIENTOS_DETALLE_COLOR'#10'    (ID, ID_MOVIMIENTO, ' +
+              'COLOR1, COLOR2, COLOR3, COLOR4, '#10'     COLOR5, COLOR6, COLOR7, CO' +
+              'LOR8, COLOR9, COLOR10, COLOR11, '#10'     COLOR12)'#10'  VALUES'#10'    (:ID' +
+              ', :ID_MOVIMIENTO, :COLOR1, :COLOR2, :COLOR3, :COLOR4,'#10'     :COLO' +
+              'R5, :COLOR6, :COLOR7, :COLOR8, :COLOR9, :COLOR10, '#10'     :COLOR11' +
+              ', :COLOR12)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Insert_Movimientos_Detalle_Color'
+      end
+      item
+        Params = <
+          item
+            Name = 'OLD_ID'
+            DataType = datInteger
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'MOVIMIENTOS_DETALLE_COLOR'
+            SQL = 
+              'DELETE '#10'  FROM'#10'    MOVIMIENTOS_DETALLE_COLOR'#10'  WHERE'#10'    (ID = :' +
+              'OLD_ID)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Delete_Movimientos_Detalle_Color'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'ID_MOVIMIENTO'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR1'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR2'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR3'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR4'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR5'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR6'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR7'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR8'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR9'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR10'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR11'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COLOR12'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'OLD_ID'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'MOVIMIENTOS_DETALLE_COLOR'
+            SQL = 
+              'UPDATE MOVIMIENTOS_DETALLE_COLOR'#10'  SET '#10'    ID = :ID, '#10'    ID_MO' +
+              'VIMIENTO = :ID_MOVIMIENTO,'#10'    COLOR1 = :COLOR1, '#10'    COLOR2 = :' +
+              'COLOR2, '#10'    COLOR3 = :COLOR3, '#10'    COLOR4 = :COLOR4, '#10'    COLOR' +
+              '5 = :COLOR5, '#10'    COLOR6 = :COLOR6, '#10'    COLOR7 = :COLOR7, '#10'    ' +
+              'COLOR8 = :COLOR8, '#10'    COLOR9 = :COLOR9, '#10'    COLOR10 = :COLOR10' +
+              ', '#10'    COLOR11 = :COLOR11, '#10'    COLOR12 = :COLOR12'#10'  WHERE'#10'    (' +
+              'ID = :OLD_ID)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Update_Movimientos_Detalle_Color'
+      end>
+    RelationShips = <
+      item
+        Name = 'FK_Movimientos_Detalle_Color'
+        MasterDatasetName = 'Inventario'
+        MasterFields = 'ID'
+        DetailDatasetName = 'Movimientos_Detalle_Color'
+        DetailFields = 'ID_MOVIMIENTO'
+        RelationshipType = rtForeignKey
+      end>
+    UpdateRules = <
+      item
+        Name = 'Insert Inventario'
+        DoUpdate = False
+        DoDelete = False
+        DatasetName = 'Inventario'
+        FailureBehavior = fbRaiseException
+      end
+      item
+        Name = 'Insert Movimientos_Detalle_Color'
+        DoUpdate = False
+        DoDelete = False
+        DatasetName = 'Movimientos_Detalle_Color'
+        FailureBehavior = fbRaiseException
+      end
+      item
+        Name = 'Update Inventario'
+        DoInsert = False
+        DoDelete = False
+        DatasetName = 'Inventario'
+        FailureBehavior = fbRaiseException
+      end
+      item
+        Name = 'Update Movimientos_Detalle_Color'
+        DoInsert = False
+        DoDelete = False
+        DatasetName = 'Movimientos_Detalle_Color'
+        FailureBehavior = fbRaiseException
+      end
+      item
+        Name = 'Delete Movimientos_Detalle_Color'
+        DoUpdate = False
+        DoInsert = False
+        DatasetName = 'Movimientos_Detalle_Color'
+        FailureBehavior = fbRaiseException
+      end
+      item
+        Name = 'Delete Inventario'
+        DoUpdate = False
+        DoInsert = False
+        DatasetName = 'Inventario'
+        FailureBehavior = fbRaiseException
       end>
-    RelationShips = <>
-    UpdateRules = <>
     Version = 0
     Left = 40
     Top = 16
@@ -531,7 +953,7 @@ object srvInventario: TsrvInventario
     DeleteCommandName = 'Delete_Inventario'
     UpdateCommandName = 'Update_Inventario'
     ReferencedDataset = 'INVENTARIO'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly
     Left = 208
     Top = 16
@@ -600,7 +1022,8 @@ object srvInventario: TsrvInventario
       end
       item
         Name = 'INVENTARIO_ID'
-        DataType = datInteger
+        DataType = datAutoInc
+        GeneratorName = 'GEN_MOVIMIENTOS_ID'
         ServerAutoRefresh = True
       end
       item
@@ -729,6 +1152,64 @@ object srvInventario: TsrvInventario
       item
         Name = 'DETALLE_RESERVAS_INV_ID_EMPRESA'
         DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_MOVIMIENTOS_DET_COLOR_ID'
+        DisplayLabel = 'ID'
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_ID_MOVIMIENTO'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR1'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR2'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR3'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR4'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR5'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR6'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR7'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR8'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR9'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR10'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR11'
+        DataType = datInteger
+      end
+      item
+        Name = 'Movimientos_Detalle_Color_COLOR12'
+        DataType = datInteger
       end>
     Left = 126
     Top = 14
@@ -746,4 +1227,15 @@ object srvInventario: TsrvInventario
     Left = 208
     Top = 72
   end
+  object bpMovimientos_DetalleColor: TDABusinessProcessor
+    Schema = schInventario
+    InsertCommandName = 'Insert_Movimientos_Detalle_Color'
+    DeleteCommandName = 'Delete_Movimientos_Detalle_Color'
+    UpdateCommandName = 'Update_Movimientos_Detalle_Color'
+    ReferencedDataset = 'Movimientos_Detalle_Color'
+    ProcessorOptions = [poPrepareCommands]
+    UpdateMode = updWhereKeyOnly
+    Left = 208
+    Top = 136
+  end
 end
diff --git a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.pas b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.pas
index c5cc49f..e1b95a7 100644
--- a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.pas
+++ b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.pas
@@ -24,6 +24,7 @@ type
     bpInventario: TDABusinessProcessor;
     Bin2DataStreamer: TDABin2DataStreamer;
     bpReservas: TDABusinessProcessor;
+    bpMovimientos_DetalleColor: TDABusinessProcessor;
     schInventario: TDASchema;
     DataDictionary: TDADataDictionary;
     procedure DARemoteServiceAfterGetDatasetData(const Dataset: IDADataset;
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
index cc6a7ca..50e1a6c 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
@@ -6,80 +6,61 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
   ExplicitHeight = 611
   PixelsPerInch = 96
   TextHeight = 13
-  object pnlHeader: TPanel
-    Left = 0
-    Top = 0
-    Width = 656
-    Height = 64
-    Align = alTop
-    BevelOuter = bvNone
-    Color = clWhite
-    Padding.Left = 25
-    Padding.Top = 8
-    Padding.Right = 25
-    Padding.Bottom = 8
-    ParentBackground = False
-    TabOrder = 5
-    object lblTitle: TLabel
-      AlignWithMargins = True
-      Left = 25
-      Top = 8
-      Width = 606
-      Height = 13
-      Margins.Left = 0
-      Margins.Top = 0
-      Margins.Right = 0
-      Margins.Bottom = 8
-      Align = alTop
-      Caption = ''
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      ExplicitWidth = 135
-    end
-    object lblComments: TLabel
-      AlignWithMargins = True
-      Left = 50
-      Top = 29
-      Width = 581
-      Height = 27
-      Margins.Left = 25
-      Margins.Top = 0
-      Margins.Right = 0
-      Align = alClient
-      ExplicitWidth = 3
-      ExplicitHeight = 13
-    end
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 697
+    ExplicitWidth = 697
     inherited Image1: TImage
       Left = 670
+      ExplicitLeft = 670
     end
   end
   inherited TBXDock: TSpTBXDock
     Width = 697
+    ExplicitWidth = 697
+    inherited tbxMain: TSpTBXToolbar
+      ExplicitWidth = 265
+    end
+    inherited tbxFiltro: TSpTBXToolbar
+      Left = 265
+      ExplicitLeft = 265
+    end
     inherited tbxMenu: TSpTBXToolbar
       ExplicitWidth = 697
     end
     inherited TBXTMain2: TSpTBXToolbar
+      Left = 661
       DockPos = 401
+      ExplicitLeft = 661
     end
   end
   inherited StatusBar: TJvStatusBar
     Top = 558
     Width = 697
+    ExplicitTop = 558
+    ExplicitWidth = 697
+  end
+  inherited pnlHeader: TPanel
+    Width = 697
+    TabOrder = 5
+    inherited lblTitle: TLabel
+      Width = 647
+    end
+    inherited lblComments: TLabel
+      Width = 622
+      Height = 24
+    end
   end
   inherited frViewBarraSeleccion1: TfrViewBarraSeleccion
     Top = 509
     Width = 697
+    ExplicitTop = 509
+    ExplicitWidth = 697
     inherited JvFooter1: TJvFooter
       Width = 697
+      ExplicitWidth = 697
       inherited bSeleccionar: TJvFooterBtn
         Left = 485
+        ExplicitLeft = 485
       end
       inherited bCancelar: TJvFooterBtn
         Left = 589
@@ -89,9 +70,9 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
   end
   inline frViewElegirArticulosCatalogo1: TfrViewElegirArticulosCatalogo [5]
     Left = 0
-    Top = 136
+    Top = 140
     Width = 697
-    Height = 373
+    Height = 369
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -101,11 +82,14 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitLeft = -59
-    ExplicitTop = -18
+    ExplicitTop = 140
+    ExplicitWidth = 697
+    ExplicitHeight = 369
     inherited cxGrid: TcxGrid
       Width = 697
-      Height = 245
+      Height = 242
+      ExplicitWidth = 697
+      ExplicitHeight = 242
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -117,29 +101,69 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
       Width = 697
+      ExplicitWidth = 697
       inherited TBXDockablePanel1: TSpTBXDockablePanel
+        Width = 697
+        ExplicitWidth = 697
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 697
+          ExplicitWidth = 697
+          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 = ''
+            ExplicitWidth = 121
+            Width = 121
+          end
+          inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 225
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 225
+            ExplicitWidth = 121
+            Width = 121
+          end
           inherited eLista: TcxComboBox
+            Left = 383
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 383
             ExplicitWidth = 304
             Width = 304
           end
         end
         inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-          Width = 697
+          Width = 687
+          ExplicitWidth = 687
           inherited tbxBotones: TSpTBXToolbar
             Width = 687
+            ExplicitWidth = 687
           end
         end
       end
     end
     inherited pnlAgrupaciones: TSpTBXDockablePanel
-      Top = 347
-      ExplicitWidth = 715
+      Top = 344
+      Width = 697
+      ExplicitTop = 344
+      ExplicitWidth = 697
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 697
+        ExplicitWidth = 697
         inherited TBXToolbar1: TSpTBXToolbar
-          Width = 687
+          Width = 697
+          ExplicitWidth = 697
         end
       end
     end
@@ -149,6 +173,9 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
         BuiltInReportLink = True
       end
     end
+    inherited dxPSEngineController1: TdxPSEngineController
+      Active = True
+    end
     inherited cxViewGridPopupMenu: TcxGridPopupMenu
       PopupMenus = <
         item
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
index eefc1bb..d223e41 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
@@ -10,7 +10,8 @@ uses
   JvExComCtrls, JvStatusBar, SpTBXItem, TB2ExtItems,  TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
   uIEditorElegirArticulosCatalogo, uDAInterfaces,
-  uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo;
+  uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo,
+  StdCtrls, TntStdCtrls, SpTBXEditors;
 
 type
   TfEditorElegirArticulosCatalogo = class(TfEditorElegirArticulos, IEditorElegirArticulosCatalogo)
diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm
index 849fe97..21e1cdb 100644
--- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm
@@ -10,8 +10,10 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 177
     Width = 853
     Caption = 'Entrada de art'#237'culos en '
+    ExplicitTop = 177
     ExplicitWidth = 853
     inherited Image1: TImage
       Left = 720
@@ -37,6 +39,8 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     inherited lblDesbloquear: TcxLabel
       Left = 755
       ExplicitLeft = 755
+      AnchorX = 800
+      AnchorY = 14
     end
   end
   inherited TBXDock: TSpTBXDock
@@ -63,19 +67,19 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     end
   end
   inherited pgPaginas: TPageControl
-    Top = 257
+    Top = 324
     Width = 847
-    Height = 277
+    Height = 210
     MultiLine = True
     Visible = False
-    ExplicitTop = 257
+    ExplicitTop = 324
     ExplicitWidth = 847
-    ExplicitHeight = 277
+    ExplicitHeight = 210
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 839
-      ExplicitHeight = 249
+      ExplicitHeight = 182
     end
   end
   inherited StatusBar: TJvStatusBar
@@ -91,7 +95,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   object ToolBar1: TToolBar [4]
     AlignWithMargins = True
     Left = 5
-    Top = 224
+    Top = 291
     Width = 843
     Height = 30
     Margins.Left = 5
@@ -137,202 +141,81 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       AutoSize = True
     end
   end
-  object TBXDockPaneles: TSpTBXDock [5]
+  object pnlMovimiento: TSpTBXDockablePanel [5]
     Left = 0
-    Top = 76
+    Top = 204
     Width = 853
-    Height = 146
-    object pnlMovimiento: TSpTBXDockablePanel
-      Left = 0
-      Top = 89
-      Align = alTop
-      Caption = 'Filtrar'
-      CaptionRotation = dpcrAlwaysVert
-      DockedHeight = 53
-      DockMode = dmCannotFloat
-      DockPos = 3
-      DockRow = 1
-      FloatingWidth = 128
-      FloatingHeight = 84
-      ShowCaptionWhenDocked = False
-      SupportedDocks = [dkStandardDock, dkMultiDock]
-      TabOrder = 0
-      Visible = False
-      DesignSize = (
-        849
-        53)
-      object Label1: TLabel
-        Left = 266
-        Top = 17
-        Width = 36
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Motivo:'
-      end
-      object Label2: TLabel
-        Left = 12
-        Top = 17
-        Width = 107
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Fecha del movimiento:'
-        Color = 16054521
-        ParentColor = False
-      end
-      object eFechaMovimiento: TcxDateEdit
-        Left = 126
-        Top = 14
-        Style.BorderColor = clWindowFrame
-        Style.BorderStyle = ebs3D
-        Style.HotTrack = False
-        Style.LookAndFeel.NativeStyle = True
-        Style.ButtonStyle = bts3D
-        Style.PopupBorderStyle = epbsFrame3D
-        StyleDisabled.LookAndFeel.NativeStyle = True
-        StyleFocused.LookAndFeel.NativeStyle = True
-        StyleHot.LookAndFeel.NativeStyle = True
-        TabOrder = 0
-        Width = 121
-      end
-      object eCausa: TcxTextEdit
-        Left = 308
-        Top = 14
-        Anchors = [akLeft, akTop, akRight]
-        AutoSize = False
-        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 = 1
-        Height = 21
-        Width = 1977
-      end
+    Height = 85
+    Caption = 'Filtrar'
+    Align = alTop
+    DockMode = dmCannotFloat
+    DockPos = 3
+    DockRow = 1
+    TabOrder = 0
+    Visible = False
+    ShowCaptionWhenDocked = False
+    DesignSize = (
+      853
+      85)
+    object Label1: TLabel
+      Left = 266
+      Top = 17
+      Width = 36
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Motivo:'
     end
-    object pnlEntradaPedido: TSpTBXDockablePanel
-      Left = 0
-      Top = 0
-      Align = alTop
-      Caption = 'Filtrar'
-      CaptionRotation = dpcrAlwaysVert
-      DockedHeight = 85
-      DockMode = dmCannotFloat
-      DockPos = 0
-      FloatingWidth = 128
-      FloatingHeight = 84
-      ShowCaptionWhenDocked = False
-      SupportedDocks = [dkStandardDock, dkMultiDock]
+    object Label2: TLabel
+      Left = 12
+      Top = 17
+      Width = 107
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Fecha del movimiento:'
+      Color = 16054521
+      ParentColor = False
+    end
+    object eFechaMovimiento: TcxDateEdit
+      Left = 126
+      Top = 14
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 0
+      Width = 121
+    end
+    object eCausa: TcxTextEdit
+      Left = 308
+      Top = 14
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      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 = 1
-      Visible = False
-      object Label3: TLabel
-        Left = 202
-        Top = 17
-        Width = 60
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Ref. pedido:'
-      end
-      object Label4: TLabel
-        Left = 8
-        Top = 17
-        Width = 85
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Fecha del pedido:'
-        Color = 16054521
-        ParentColor = False
-      end
-      object edtFechaPedido: TLabel
-        Left = 99
-        Top = 17
-        Width = 71
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'FechaPedido'
-        Color = 16054521
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'Tahoma'
-        Font.Style = [fsBold]
-        ParentColor = False
-        ParentFont = False
-      end
-      object edtReferenciaPedido: TLabel
-        Left = 268
-        Top = 17
-        Width = 99
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'ReferenciaPedido'
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'Tahoma'
-        Font.Style = [fsBold]
-        ParentFont = False
-      end
-      object Label6: TLabel
-        Left = 5
-        Top = 49
-        Width = 47
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Situaci'#243'n:'
-        Color = 16054521
-        ParentColor = False
-      end
-      object edtSituacion: TLabel
-        Left = 99
-        Top = 49
-        Width = 52
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Situacion'
-        Color = 16054521
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'Tahoma'
-        Font.Style = [fsBold]
-        ParentColor = False
-        ParentFont = False
-      end
-      object Label7: TLabel
-        Left = 202
-        Top = 49
-        Width = 54
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Proveedor:'
-      end
-      object edtProveedor: TLabel
-        Left = 268
-        Top = 49
-        Width = 59
-        Height = 13
-        Margins.Bottom = 0
-        Caption = 'Proveedor'
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'Tahoma'
-        Font.Style = [fsBold]
-        ParentFont = False
-      end
+      Height = 21
+      Width = 1977
     end
   end
   inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [6]
     Left = 0
-    Top = 254
+    Top = 321
     Width = 853
-    Height = 283
+    Height = 216
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -342,14 +225,14 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     ParentFont = False
     TabOrder = 6
     ReadOnly = False
-    ExplicitTop = 254
+    ExplicitTop = 321
     ExplicitWidth = 853
-    ExplicitHeight = 283
+    ExplicitHeight = 216
     inherited cxGrid: TcxGrid
       Width = 837
-      Height = 139
+      Height = 72
       ExplicitWidth = 837
-      ExplicitHeight = 139
+      ExplicitHeight = 72
       inherited cxGridView: TcxGridDBTableView
         DataController.KeyFieldNames = 'RecID'
         inherited cxGridViewSTOCK: TcxGridDBColumn
@@ -361,6 +244,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       Width = 853
       ExplicitWidth = 853
       inherited TBXDockablePanel1: TSpTBXDockablePanel
+        Width = 853
         ExplicitWidth = 853
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 853
@@ -380,23 +264,27 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
             StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 246
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 246
           end
           inherited eLista: TcxComboBox
+            Left = 419
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 419
             ExplicitWidth = 380
             Width = 380
           end
         end
         inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-          Width = 853
-          ExplicitWidth = 853
+          Width = 843
+          ExplicitWidth = 843
           inherited tbxBotones: TSpTBXToolbar
             Width = 843
             ExplicitWidth = 843
@@ -405,15 +293,16 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       end
     end
     inherited pnlAgrupaciones: TSpTBXDockablePanel
-      Top = 257
-      ExplicitTop = 257
+      Top = 190
+      Width = 853
+      ExplicitTop = 190
       ExplicitWidth = 853
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 853
         ExplicitWidth = 853
         inherited TBXToolbar1: TSpTBXToolbar
-          Width = 843
-          ExplicitWidth = 843
+          Width = 853
+          ExplicitWidth = 853
         end
       end
     end
@@ -432,56 +321,116 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         end>
     end
   end
-  inherited EditorActionList: TActionList [7]
-    Top = 56
-    inherited actNuevo: TAction
-      Visible = False
+  object pnlEntradaPedido: TSpTBXDockablePanel [7]
+    Left = 0
+    Top = 49
+    Width = 853
+    Height = 128
+    Caption = 'Filtrar'
+    Align = alTop
+    DockMode = dmCannotFloat
+    DockPos = 0
+    TabOrder = 1
+    Visible = False
+    ShowCaptionWhenDocked = False
+    object Label3: TLabel
+      Left = 202
+      Top = 17
+      Width = 60
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Ref. pedido:'
     end
-    inherited actModificar: TAction
-      Visible = False
+    object Label4: TLabel
+      Left = 8
+      Top = 17
+      Width = 85
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Fecha del pedido:'
+      Color = 16054521
+      ParentColor = False
     end
-    inherited actGuardar: TAction
-      Visible = False
+    object edtFechaPedido: TLabel
+      Left = 99
+      Top = 17
+      Width = 71
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'FechaPedido'
+      Color = 16054521
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentColor = False
+      ParentFont = False
     end
-    inherited actEliminar: TAction
-      Visible = False
+    object edtReferenciaPedido: TLabel
+      Left = 268
+      Top = 17
+      Width = 99
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'ReferenciaPedido'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
     end
-    inherited actConfPagina: TAction
-      Visible = False
+    object Label6: TLabel
+      Left = 5
+      Top = 49
+      Width = 47
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Situaci'#243'n:'
+      Color = 16054521
+      ParentColor = False
     end
-    inherited actPrevisualizar: TAction
-      Visible = False
+    object edtSituacion: TLabel
+      Left = 99
+      Top = 49
+      Width = 52
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Situacion'
+      Color = 16054521
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentColor = False
+      ParentFont = False
     end
-    inherited actImprimir: TAction
-      Visible = False
+    object Label7: TLabel
+      Left = 202
+      Top = 49
+      Width = 54
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Proveedor:'
     end
-    inherited actRefrescar: TAction
-      Visible = False
-    end
-    inherited actDuplicar: TAction
-      Visible = False
-    end
-    object actAnadirInventario: TAction
-      Category = 'Inventario'
-      Caption = 'Elegir art'#237'culos...'
-      ImageIndex = 24
-      OnExecute = actAnadirInventarioExecute
-    end
-    object actEliminarInventario: TAction
-      Category = 'Inventario'
-      Caption = 'Quitar este art'#237'culo'
-      ImageIndex = 4
-      OnExecute = actEliminarInventarioExecute
-      OnUpdate = actEliminarInventarioUpdate
-    end
-    object actAnchoAuto: TAction
-      Category = 'Ver'
-      Caption = 'Ancho autom'#225'tico'
-      ImageIndex = 21
-      OnExecute = actAnchoAutoExecute
+    object edtProveedor: TLabel
+      Left = 268
+      Top = 49
+      Width = 59
+      Height = 13
+      Margins.Bottom = 0
+      Caption = 'Proveedor'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
     end
   end
-  inherited SmallImages: TPngImageList [8]
+  inherited SmallImages: TPngImageList
     PngImages = <
       item
         PngImage.Data = {
@@ -1023,7 +972,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       end>
     Bitmap = {}
   end
-  inherited LargeImages: TPngImageList [9]
+  inherited LargeImages: TPngImageList
     PngImages = <
       item
         PngImage.Data = {
@@ -1812,12 +1761,57 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       end>
     Bitmap = {}
   end
-  inherited JvFormStorage: TJvFormStorage [10]
-  end
-  inherited dsDataTable: TDADataSource [11]
+  inherited dsDataTable: TDADataSource
     Left = 56
     Top = 56
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [12]
+  inherited EditorActionList: TActionList [13]
+    Top = 56
+    inherited actNuevo: TAction
+      Visible = False
+    end
+    inherited actModificar: TAction
+      Visible = False
+    end
+    inherited actGuardar: TAction
+      Visible = False
+    end
+    inherited actEliminar: TAction
+      Visible = False
+    end
+    inherited actConfPagina: TAction
+      Visible = False
+    end
+    inherited actPrevisualizar: TAction
+      Visible = False
+    end
+    inherited actImprimir: TAction
+      Visible = False
+    end
+    inherited actRefrescar: TAction
+      Visible = False
+    end
+    inherited actDuplicar: TAction
+      Visible = False
+    end
+    object actAnadirInventario: TAction
+      Category = 'Inventario'
+      Caption = 'Elegir art'#237'culos...'
+      ImageIndex = 24
+      OnExecute = actAnadirInventarioExecute
+    end
+    object actEliminarInventario: TAction
+      Category = 'Inventario'
+      Caption = 'Quitar este art'#237'culo'
+      ImageIndex = 4
+      OnExecute = actEliminarInventarioExecute
+      OnUpdate = actEliminarInventarioUpdate
+    end
+    object actAnchoAuto: TAction
+      Category = 'Ver'
+      Caption = 'Ancho autom'#225'tico'
+      ImageIndex = 21
+      OnExecute = actAnchoAutoExecute
+    end
   end
 end
diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas
index 707a14a..441e43f 100644
--- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas
+++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas
@@ -14,7 +14,7 @@ uses
   JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit,
   cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin,
   dxLayoutControl, cxStyles, StdCtrls, Buttons, SpTBXDkPanels, uBizPedidosProveedor,
-  uDAInterfaces;
+  uDAInterfaces, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters;
 
 type
   TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos)
@@ -36,7 +36,6 @@ type
     pnlEntradaPedido: TSpTBXDockablePanel;
     Label3: TLabel;
     Label4: TLabel;
-    TBXDockPaneles: TSpTBXDock;
     edtFechaPedido: TLabel;
     edtReferenciaPedido: TLabel;
     Label6: TLabel;
@@ -148,14 +147,14 @@ begin
   else
     dsDataTable.DataTable := NIL;
 
-  frViewEntradaSalidaArticulos1.dsDataSource.DataTable := dsDataTable.DataTable;
+  frViewEntradaSalidaArticulos1.Inventario := FArticulos;
 
 //  PonerEtiquetasEnEditor
 end;
 
 procedure TfEditorEntradaSalidaArticulos.SetController(const Value: IInventarioController);
 begin
-  FController := Value
+  FController := Value;
 end;
 
 procedure TfEditorEntradaSalidaArticulos.SetInventario(const Value: IBizInventario);
diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm
index 63711ca..45d37e3 100644
--- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm
@@ -83,7 +83,7 @@ inherited fEditorInventario: TfEditorInventario
     Width = 669
     ExplicitWidth = 669
     inherited tbxMain: TSpTBXToolbar
-      ExplicitWidth = 669
+      ExplicitWidth = 490
       object TBXSeparatorItem84: TSpTBXSeparatorItem [6]
       end
       object TBXItem54: TSpTBXItem [7]
@@ -119,7 +119,6 @@ inherited fEditorInventario: TfEditorInventario
       DockPos = 264
       Visible = True
       ExplicitLeft = 328
-      ExplicitWidth = 113
       object TBXItem38: TSpTBXItem
         Action = actReservados
         DisplayMode = nbdmImageAndText
@@ -198,6 +197,30 @@ inherited fEditorInventario: TfEditorInventario
             Kind = skSum
             Column = frViewInventario1.cxGridViewPENDIENTE_RECEPCION
           end>
+        inherited cxGridViewFAMILIA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewALMACEN: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewUNIDADES_ALMACEN: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewRESERVA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewPENDIENTE_RECEPCION: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -274,6 +297,9 @@ inherited fEditorInventario: TfEditorInventario
     end
     inherited pnlAlmacenes: TPanel
       Width = 669
+      Enabled = False
+      Visible = False
+      ExplicitTop = 96
       ExplicitWidth = 669
       DesignSize = (
         669
@@ -324,30 +350,41 @@ inherited fEditorInventario: TfEditorInventario
     inherited actAnchoAuto: TAction
       ImageIndex = 27
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
     object actRecibirPedido: TAction
       Category = 'Logistica'
       Caption = 'Recibir pedido'
+      Enabled = False
       ImageIndex = 24
+      Visible = False
       OnExecute = actRecibirPedidoExecute
       OnUpdate = actRecibirPedidoUpdate
     end
     object actTrasladar: TAction
       Category = 'Logistica'
       Caption = 'Trasladar'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actTrasladarExecute
       OnUpdate = actTrasladarUpdate
     end
     object actReservar: TAction
       Category = 'Logistica'
       Caption = 'Reservar'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actReservarExecute
       OnUpdate = actReservarUpdate
     end
     object actLiberar: TAction
       Category = 'Logistica'
       Caption = 'Liberar'
+      Enabled = False
       ImageIndex = 26
       Visible = False
       OnExecute = actLiberarExecute
@@ -356,7 +393,9 @@ inherited fEditorInventario: TfEditorInventario
     object actReservados: TAction
       Category = 'Logistica'
       Caption = 'Ver reservados'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actReservadosExecute
       OnUpdate = actReservadosUpdate
     end
diff --git a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm
index 36995ae..4158329 100644
--- a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm
+++ b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm
@@ -2,14 +2,34 @@ inherited frViewElegirArticulosCatalogo: TfrViewElegirArticulosCatalogo
   inherited frViewFiltroBase1: TfrViewFiltroBase
     inherited TBXDockablePanel1: TSpTBXDockablePanel
       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 = ''
           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
+        inherited eLista: TcxComboBox
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+        end
       end
     end
   end
diff --git a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas
index 0c583ab..a8bc61e 100644
--- a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas
+++ b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas
@@ -12,7 +12,10 @@ uses
   uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg,
   ActnList, TB2Item, SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock, uViewFiltroBase,
-  uDAInterfaces;
+  uDAInterfaces, cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore,
+  dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv,
+  dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer,
+  uCustomView, uViewBase;
   
 type
   IViewElegirArticulosCatalogo = interface(IViewArticulos)
diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
index c621fbc..a705f9c 100644
--- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
+++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
@@ -1,6 +1,8 @@
 inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
   Width = 674
   Height = 464
+  OnCreate = CustomViewCreate
+  OnDestroy = CustomViewDestroy
   ExplicitWidth = 674
   ExplicitHeight = 464
   inherited cxGrid: TcxGrid
@@ -24,17 +26,12 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
       OptionsSelection.CellSelect = True
       object cxGridViewRecID: TcxGridDBColumn
         DataBinding.FieldName = 'RecID'
-        Visible = False
       end
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
-        Visible = False
-        VisibleForCustomization = False
       end
       object cxGridViewID_ARTICULO: TcxGridDBColumn
         DataBinding.FieldName = 'ID_ARTICULO'
-        Visible = False
-        VisibleForCustomization = False
       end
       object cxGridViewID_PEDIDO_PROVEEDOR: TcxGridDBColumn
         DataBinding.FieldName = 'ID_PEDIDO_PROVEEDOR'
@@ -57,6 +54,8 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
       object cxGridViewREFERENCIA_PROV: TcxGridDBColumn
         Caption = 'Ref. proveedor'
         DataBinding.FieldName = 'REFERENCIA_PROVEEDOR'
+        Visible = False
+        VisibleForCustomization = False
         Width = 80
       end
       object cxGridViewDESCRIPCION: TcxGridDBColumn
@@ -82,13 +81,26 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         Properties.Alignment.Horz = taRightJustify
         Properties.DisplayFormat = ',0.##;-,0.##'
         Properties.EditFormat = ',0.##;-,0.##'
+        Visible = False
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
         Width = 80
       end
+      object cxGridViewCANTIDAD2: TcxGridDBColumn
+        Caption = 'Cantidad'
+        DataBinding.FieldName = 'CANTIDAD'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = cxGridViewCANTIDAD2PropertiesButtonClick
+      end
       object cxGridViewID_EMPRESA: TcxGridDBColumn
         DataBinding.FieldName = 'ID_EMPRESA'
-        Visible = False
       end
     end
   end
@@ -96,6 +108,7 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
     Width = 674
     ExplicitWidth = 674
     inherited TBXDockablePanel1: TSpTBXDockablePanel
+      Width = 674
       ExplicitWidth = 674
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 674
@@ -138,8 +151,8 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         end
       end
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-        Width = 674
-        ExplicitWidth = 674
+        Width = 664
+        ExplicitWidth = 664
         inherited tbxBotones: TSpTBXToolbar
           Width = 664
           ExplicitWidth = 664
@@ -149,17 +162,31 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
   end
   inherited pnlAgrupaciones: TSpTBXDockablePanel
     Top = 438
+    Width = 674
     ExplicitTop = 438
     ExplicitWidth = 674
     inherited TBXAlignmentPanel1: TSpTBXDockablePanel
       Width = 674
       ExplicitWidth = 674
       inherited TBXToolbar1: TSpTBXToolbar
-        Width = 664
-        ExplicitWidth = 664
+        Width = 674
+        ExplicitWidth = 674
       end
     end
   end
+  object DBGrid1: TDBGrid [3]
+    Left = 48
+    Top = 272
+    Width = 488
+    Height = 120
+    DataSource = DADataSource1
+    TabOrder = 3
+    TitleFont.Charset = DEFAULT_CHARSET
+    TitleFont.Color = clWindowText
+    TitleFont.Height = -11
+    TitleFont.Name = 'Tahoma'
+    TitleFont.Style = []
+  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 39253.500748333330000000
@@ -180,4 +207,8 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
     Left = 56
     Top = 16
   end
+  object DADataSource1: TDADataSource
+    Left = 32
+    Top = 264
+  end
 end
diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas
index af409dd..3148063 100644
--- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas
+++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas
@@ -14,13 +14,20 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   uAlmacenesController, uBizAlmacenes, TB2Item, SpTBXItem, TB2Dock, TB2Toolbar,
   uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, SpTBXDkPanels,
-  uViewFiltroBase, cxSpinEdit, uDAInterfaces;
-   
+  uViewFiltroBase, cxSpinEdit, uDAInterfaces, cxLookAndFeels,
+  cxLookAndFeelPainters, dxPSPDFExportCore, dxPSPDFExport, cxDrawTextUtils,
+  dxPSPrVwStd, dxPSPrVwAdv, dxPScxEditorProducers, dxPScxExtEditorProducers,
+  dxPScxPageControlProducer, uCustomView, uViewBase, cxButtonEdit, uInventarioController,
+  uArticulosInventarioController, uBizInventario, Grids, DBGrids;
+
 type
   IViewViewEntradaSalidaArticulos = interface(IViewGrid)
     ['{C195FC01-604A-484E-A809-0ED49890DBBE}']
 //    function GetAlmacenes: IBizAlmacen;
 //    property Almacenes: IBizAlmacen read GetAlmacenes;
+    function GetInventario: IBizInventario;
+    procedure SetInventario(const Value: IBizInventario);
+    property Inventario: IBizInventario read GetInventario write SetInventario;
   end;
 
   TfrViewEntradaSalidaArticulos = class(TfrViewGrid, IViewViewEntradaSalidaArticulos)
@@ -39,10 +46,23 @@ type
     cxGridViewSTOCK: TcxGridDBColumn;
     cxStyle_CANTIDAD_IMPAR: TcxStyle;
     cxStyle_CANTIDAD_PAR: TcxStyle;
+    cxGridViewCANTIDAD2: TcxGridDBColumn;
+    DBGrid1: TDBGrid;
+    DADataSource1: TDADataSource;
     procedure cxGridViewStylesGetContentStyle(
       Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
       AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+    procedure cxGridViewCANTIDAD2PropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure CustomViewDestroy(Sender: TObject);
+    procedure CustomViewCreate(Sender: TObject);
+
   private
+    FArticulosInventarioController : IArticulosInventarioController;
+    FInventario: IBizInventario;
+    function GetInventario: IBizInventario;
+    procedure SetInventario(const Value: IBizInventario);
+
 //Es para cuando el almacen destino sea relativo a cada artículo, como lo vamos a
 //hacer relativo al conjunto esto sobra
 //    FController: IAlmacenesController;
@@ -52,6 +72,8 @@ type
 //    property Almacenes: IBizAlmacen read GetAlmacenes;
 //    constructor Create(AOwner : TComponent); override;
 //    destructor destroy; override;
+    property Inventario: IBizInventario read GetInventario write SetInventario;
+
   end;
 
 implementation
@@ -85,6 +107,27 @@ end;}
 
 { TfrViewEntradaSalidaArticulos }
 
+procedure TfrViewEntradaSalidaArticulos.CustomViewCreate(Sender: TObject);
+begin
+  inherited;
+  FArticulosInventarioController := TArticulosInventarioController.Create;
+end;
+
+procedure TfrViewEntradaSalidaArticulos.CustomViewDestroy(Sender: TObject);
+begin
+  FInventario := Nil;
+  FArticulosInventarioController := Nil;
+
+  inherited;
+end;
+
+procedure TfrViewEntradaSalidaArticulos.cxGridViewCANTIDAD2PropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  (FArticulosInventarioController as IArticulosInventarioController).ModificarCantidadColores(FInventario);
+end;
+
 procedure TfrViewEntradaSalidaArticulos.cxGridViewStylesGetContentStyle(
   Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
   AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
@@ -109,4 +152,17 @@ begin
   end;
 end;
 
+function TfrViewEntradaSalidaArticulos.GetInventario: IBizInventario;
+begin
+  Result := FInventario;
+end;
+
+procedure TfrViewEntradaSalidaArticulos.SetInventario(const Value: IBizInventario);
+begin
+  FInventario := Value;
+  dsDataSource.DataTable := FInventario.DataTable;
+
+  DADataSource1.DataTable := FInventario.DetalleColores.DataTable;  
+end;
+
 end.
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm
index ad97abc..0e77694 100644
--- a/Source/Modulos/Inventario/Views/uViewInventario.dfm
+++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm
@@ -82,16 +82,28 @@ inherited frViewInventario: TfrViewInventario
         SortIndex = 0
         SortOrder = soAscending
       end
+      object cxGridViewCODIGOTECNICO: TcxGridDBColumn
+        Caption = 'C'#243'digo'
+        DataBinding.FieldName = 'CODIGOTECNICO'
+      end
       object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
         Caption = 'Ref. proveedor'
         DataBinding.FieldName = 'REFERENCIA_PROVEEDOR'
         MinWidth = 30
       end
+      object cxGridViewDISENOTECNICO: TcxGridDBColumn
+        Caption = 'Dise'#241'o'
+        DataBinding.FieldName = 'DISENOTECNICO'
+      end
       object cxGridViewDESCRIPCION: TcxGridDBColumn
         Caption = 'Descripci'#243'n'
         DataBinding.FieldName = 'DESCRIPCION'
         MinWidth = 80
       end
+      object cxGridViewCAMPOTECNICO: TcxGridDBColumn
+        Caption = 'Campo t'#233'cnico'
+        DataBinding.FieldName = 'CAMPOTECNICO'
+      end
       object cxGridViewSTOCK: TcxGridDBColumn
         DataBinding.FieldName = 'STOCK'
         PropertiesClassName = 'TcxSpinEditProperties'
@@ -191,21 +203,25 @@ inherited frViewInventario: TfrViewInventario
           StyleHot.LookAndFeel.SkinName = ''
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Left = 300
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 300
         end
         inherited eLista: TcxComboBox
+          Left = 507
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 507
         end
       end
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 668
-        ExplicitWidth = 678
+        ExplicitWidth = 668
         inherited tbxBotones: TSpTBXToolbar
           Width = 668
           ExplicitWidth = 668
@@ -223,7 +239,7 @@ inherited frViewInventario: TfrViewInventario
       ExplicitWidth = 678
       inherited TBXToolbar1: TSpTBXToolbar
         Width = 678
-        ExplicitWidth = 668
+        ExplicitWidth = 678
       end
     end
   end
@@ -270,6 +286,9 @@ inherited frViewInventario: TfrViewInventario
       BuiltInReportLink = True
     end
   end
+  inherited dxPSEngineController1: TdxPSEngineController
+    Active = True
+  end
   inherited cxStyleRepository1: TcxStyleRepository
     inherited cxStyleSelection: TcxStyle
       AssignedValues = [svColor, svFont, svTextColor]
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas
index 416aa1d..9ddc6f4 100644
--- a/Source/Modulos/Inventario/Views/uViewInventario.pas
+++ b/Source/Modulos/Inventario/Views/uViewInventario.pas
@@ -58,6 +58,9 @@ type
     pnlAlmacenes: TPanel;
     cxListaAlmacenesObras: TcxComboBox;
     eAlmacen: TLabel;
+    cxGridViewCAMPOTECNICO: TcxGridDBColumn;
+    cxGridViewCODIGOTECNICO: TcxGridDBColumn;
+    cxGridViewDISENOTECNICO: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
             ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out
             AStyle: TcxStyle);
diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
index c1ddfc2..1e34a1d 100644
--- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc	
+++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D6.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA2.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
index 5298d40..2de0118 100644
--- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc	
+++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D4.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA0.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
index 2426c6e..95489dd 100644
--- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc	
+++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D2.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf9E.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
index 6235e87..bc4214c 100644
--- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc	
+++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf246.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf112.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
index 6e9cb46..50aebcb 100644
--- a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc	
+++ b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc	
@@ -25,4 +25,4 @@ END
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorPedidosClienteReport.dfm */
 /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf244.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf110.tmp */
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 848d839..5244167 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index fec0c02..ea04452 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -3,7 +3,7 @@ program FactuGES_Server;
 {#ROGEN:..\Servicios\FactuGES.rodl} // RemObjects: Careful, do not remove!
 
 uses
-//  ExceptionLog,
+  ExceptionLog,
   uROComInit,
   uROComboService,
   Forms,
@@ -125,8 +125,6 @@ uses
   MidasSpeedFix in 'Utiles\MidasSpeedFix.pas',
   schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
   schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
-  schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
-  schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
   uBizVendedoresServer in '..\Modulos\Contactos\Model\uBizVendedoresServer.pas',
   schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
@@ -143,7 +141,9 @@ uses
   schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
   schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schPedidosClienteClient_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas',
-  schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas';
+  schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas',
+  schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
+  schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index ae87e30..4193db8 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,347 +1,347 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-		<MainSource>FactuGES_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d11;SpTBXLib_d11;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxExportD10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-		<DCC_DebugVN>True</DCC_DebugVN>
-		<DCC_UnitSearchPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_UnitSearchPath>
-		<DCC_ResourcePath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_ResourcePath>
-		<DCC_ObjPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_ObjPath>
-		<DCC_IncludePath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_IncludePath>
-	</PropertyGroup>
-	<ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
-		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 18 de febrero de 2010 12:17</VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-	</ProjectExtensions>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
-	<ItemGroup>
-		<DelphiCompile Include="FactuGES_Server.dpr">
-			<MainSource>MainSource</MainSource>
-		</DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
-			<Form>srvEmpresas</Form>
-		</DCCReference>
-		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>srvProvinciasPoblaciones_Impl</Form>
-		</DCCReference>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvUsuarios</Form>
-		</DCCReference>
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
-		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
-		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptAlbaranesCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordAlbaranCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvAlbaranesCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptAlbaranesProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordAlbaranProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvAlbaranesProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
-			<Form>srvAlmacenes</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
-		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
-			<Form>srvArticulos</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas"/>
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptEtiquetasContacto</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptFichasEmpleado</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
-			<Form>srvContactos</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvFabricantes</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptFacturasCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordFacturaCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvFacturasCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptFacturasProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvFacturasProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvFamilias</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvFormasPago</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvGestorDocumentos</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvGestorInformes</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvHistoricoMovimientos</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvInventario</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
-		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvObras</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptPedidosProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordPedidoProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvPedidosProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
-			<Form>RptPedidosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvPedidosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptPresupuestosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordCertificadoTrabajo</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptWordPresupuestoCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvPresupuestosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptRecibosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvRecibosCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptRecibosProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvRecibosProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvReferencias</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>RptRemesasCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvRemesasCliente</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvRemesasProveedor</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvTiposIVA</Form>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvUnidadesMedida</Form>
-		</DCCReference>
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-			<DesignClass>TDataAbstractService</DesignClass>
-			<Form>srvConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
-			<DesignClass>TFrame</DesignClass>
-			<Form>frConexionBD</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
-			<DesignClass>TFrame</DesignClass>
-			<Form>frConfGeneral</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
-			<DesignClass>TForm</DesignClass>
-			<Form>fConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<DesignClass>TFrame</DesignClass>
-			<Form>FrameConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="srvLogin_Impl.pas">
-			<DesignClass>TDARemoteService</DesignClass>
-			<Form>srvLogin</Form>
-		</DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
-		</DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
-			<DesignClass>TDataModule</DesignClass>
-			<Form>dmServer</Form>
-		</DCCReference>
-		<DCCReference Include="uServerMainForm.pas">
-			<Form>fServerForm</Form>
-		</DCCReference>
-		<DCCReference Include="Utiles\AHWord97.pas"/>
-		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
-	</ItemGroup>
+  <PropertyGroup>
+    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+    <MainSource>FactuGES_Server.dpr</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d11;SpTBXLib_d11;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxExportD10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+    <DCC_DebugVN>True</DCC_DebugVN>
+    <DCC_UnitSearchPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_UnitSearchPath>
+    <DCC_ResourcePath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_ResourcePath>
+    <DCC_ObjPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_ObjPath>
+    <DCC_IncludePath>$(BDS)\Lib\Debug\Indy10;$(BDS)\lib\Debug</DCC_IncludePath>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 18 de febrero de 2010 12:17</VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="FactuGES_Server.dpr">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+      <Form>srvEmpresas</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+      <Form>srvProvinciasPoblaciones_Impl</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+      <Form>srvUsuarios</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
+    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
+    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+      <Form>RptAlbaranesCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+      <Form>RptWordAlbaranCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+      <Form>srvAlbaranesCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
+      <Form>RptAlbaranesProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
+      <Form>RptWordAlbaranProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+      <Form>srvAlbaranesProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+      <Form>srvAlmacenes</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
+    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+      <Form>srvArticulos</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+      <Form>RptEtiquetasContacto</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+      <Form>RptFichasEmpleado</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+      <Form>srvContactos</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+      <Form>srvFabricantes</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+      <Form>RptFacturasCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+      <Form>RptWordFacturaCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+      <Form>srvFacturasCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+      <Form>RptFacturasProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+      <Form>srvFacturasProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+      <Form>srvFamilias</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+      <Form>srvFormasPago</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+      <Form>srvGestorDocumentos</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+      <Form>srvGestorInformes</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+      <Form>srvHistoricoMovimientos</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+      <Form>srvInventario</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
+    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+      <Form>srvObras</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+      <Form>RptPedidosProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+      <Form>RptWordPedidoProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+      <Form>srvPedidosProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
+      <Form>RptPedidosCliente</Form>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
+      <Form>srvPedidosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+      <Form>RptPresupuestosCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+      <Form>RptWordCertificadoTrabajo</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+      <Form>RptWordPresupuestoCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+      <Form>srvPresupuestosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+      <Form>RptRecibosCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+      <Form>srvRecibosCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+      <Form>RptRecibosProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+      <Form>srvRecibosProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+      <Form>srvReferencias</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
+    <DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
+      <Form>RptRemesasCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+      <Form>srvRemesasCliente</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+      <Form>srvRemesasProveedor</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+      <Form>srvTiposIVA</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+      <Form>srvUnidadesMedida</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+      <Form>srvConfiguracion</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConexionBD.pas">
+      <Form>frConexionBD</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>frConfGeneral</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>fConfiguracion</Form>
+      <DesignClass>TForm</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>FrameConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="srvLogin_Impl.pas">
+      <Form>srvLogin</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uAcercaDe.pas">
+      <Form>fAcercaDe</Form>
+    </DCCReference>
+    <DCCReference Include="uDataModuleServer.pas">
+      <Form>dmServer</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uServerMainForm.pas">
+      <Form>fServerForm</Form>
+    </DCCReference>
+    <DCCReference Include="Utiles\AHWord97.pas" />
+    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
+    <DCCReference Include="Utiles\RegExpr.pas" />
+    <DCCReference Include="Utiles\uBusinessUtils.pas" />
+    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
+    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+    <DCCReference Include="Utiles\uServerAppUtils.pas" />
+    <DCCReference Include="Utiles\uSesionesUtils.pas" />
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 189cf44..5ce9ac2 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -17,7 +17,7 @@ BEGIN
               VALUE "InternalName", "FactuGES Servidor\0"
               VALUE "ProductName", "FactuGES Servidor\0"
               VALUE "ProductVersion", "1.0.2.0\0"
-              VALUE "CompileDate", "viernes, 19 de marzo de 2010 13:53\0"
+              VALUE "CompileDate", "viernes, 19 de marzo de 2010 17:59\0"
          END
     END
     BLOCK "VarFileInfo"