diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Base/GUIBase/GUIBase.res b/Source/Base/GUIBase/GUIBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/GUIBase/GUIBase.res and b/Source/Base/GUIBase/GUIBase.res differ
diff --git a/Source/Informes_Group.bdsgroup b/Source/Informes_Group.bdsgroup
index 630df8e8..fc2ce27e 100644
--- a/Source/Informes_Group.bdsgroup
+++ b/Source/Informes_Group.bdsgroup
@@ -14,8 +14,8 @@
       <Projects Name="GUIBase.bpl">Base\GUIBase\GUIBase.bdsproj</Projects>
       <Projects Name="Informes_model.bpl">Modulos\Informes base\Model\Informes_model.bdsproj</Projects>
       <Projects Name="Informes_data.bpl">Modulos\Informes base\Data\Informes_data.bdsproj</Projects>
-      <Projects Name="Informes_controller.bpl">Modulos\Informes base\Controller\Informes_controller.bdsproj</Projects>
       <Projects Name="InformesBase_controller.bpl">Modulos\Informes base\Controller\InformesBase_controller.bdsproj</Projects>
+      <Projects Name="Informes_controller.bpl">Modulos\Informes base\Controller\Informes_controller.bdsproj</Projects>
       <Projects Name="Informes_view.bpl">Modulos\Informes base\Views\Informes_view.bdsproj</Projects>
       <Projects Name="InformesBase_view.bpl">Modulos\Informes base\Views\InformesBase_view.bdsproj</Projects>
       <Projects Name="Informes_plugin.bpl">Modulos\Informes base\Plugin\Informes_plugin.bdsproj</Projects>
@@ -33,7 +33,7 @@
       <Projects Name="FactuGES_Server.exe">Servidor\FactuGES_Server.bdsproj</Projects>
       <Projects Name="Articulos_view.bpl">Modulos\Articulos\Views\Articulos_view.bdsproj</Projects>
       <Projects Name="AlbaranesCliente_view.bpl">Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.bdsproj</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl Informes_controller.bpl InformesBase_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_view.bpl InfVentasArticulo_plugin.bpl InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe Articulos_view.bpl AlbaranesCliente_view.bpl</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl InformesBase_controller.bpl Informes_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_view.bpl InfVentasArticulo_plugin.bpl InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe Articulos_view.bpl AlbaranesCliente_view.bpl</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>
diff --git a/Source/Modulos/Informe margen por articulo/Controller/uInfMargenArticuloController.pas b/Source/Modulos/Informe margen por articulo/Controller/uInfMargenArticuloController.pas
index 783dd591..7349bcb0 100644
--- a/Source/Modulos/Informe margen por articulo/Controller/uInfMargenArticuloController.pas	
+++ b/Source/Modulos/Informe margen por articulo/Controller/uInfMargenArticuloController.pas	
@@ -8,11 +8,16 @@ uses
   uBizInfMargenArticulo, uIDataModuleInfMargenArticulo, uInformeBaseController,
   uBizInformes;
 
+const
+  CTE_AGRUPACION_PORARTICULO = 0;
+  CTE_AGRUPACION_PORCLIENTE = 1;
+
 type
   IInfMargenArticuloController = interface(IInformeBaseController)
   ['{1F19FFE4-7AA6-4CAB-B7F0-687FE858FD31}']
 //    procedure VerTodos(AInfMargenArticulo: IBizInfMargenArticulo);
-//    function BuscarTodos: IBizInfMargenArticulo;
+    function BuscarAgrupadoPorCliente: IBizInfMargenArticulo;
+    function BuscarAgrupadoPorArticulo: IBizInfMargenArticulo;
 //    function Buscar(const ID_ALMACEN: Integer): IBizInfMargenArticulo;
 //    function ExtraerSeleccionados(AArticulos: IBizInfMargenArticulo) : IBizInfMargenArticulo;
 
@@ -23,7 +28,7 @@ type
 
   TInfMargenArticuloController = class(TObservador, IInfMargenArticuloController, IInformeBaseController)
   private
-    function BuscarTodos: IBizInfMargenArticulo;
+    function darAgrupacionParaInforme: Integer;
 
   protected
     FDataModule : IDataModuleInfMargenArticulo;
@@ -39,12 +44,16 @@ type
     procedure AsignarDataModule; virtual;
 
   public
+
     constructor Create; virtual;
     destructor Destroy; override;
 
 //    function Buscar(const ID_ALMACEN: Integer): IBizInfMargenArticulo;
 //    function ExtraerSeleccionados(AArticulos: IBizInfMargenArticulo) : IBizInfMargenArticulo;
 //    function Ver(AArticulos: IBizInfMargenArticulo; AInfMargenArticulo : IBizInfMargenArticulo): Boolean;
+    function BuscarAgrupadoPorCliente: IBizInfMargenArticulo;
+    function BuscarAgrupadoPorArticulo: IBizInfMargenArticulo;
+
     procedure Nuevo(AInforme : IBizInforme);
     procedure Ver(AInforme : IBizInforme);
 //    procedure VerTodos(AInfMargenArticulo: IBizInfMargenArticulo);
@@ -55,11 +64,10 @@ implementation
 uses
   Forms, cxControls, DB, uEditorRegistryUtils,
   uIEditorInfMargenArticulo, uDataModuleUsuarios,
-  uDataModuleInfMargenArticulo,
-  uDAInterfaces, uDataTableUtils,
+  uDataModuleInfMargenArticulo, uDAInterfaces, uDataTableUtils,
   uDateUtils, uROTypes, DateUtils, Controls, Windows,
   dialogs, Variants, uControllerDetallesBase, uDialogUtils,
-  schInfMargenArticuloClient_Intf;
+  JSDialog, JSDialogs, schInfMargenArticuloClient_Intf;
 
 { TInfMargenArticuloController }
 
@@ -76,9 +84,15 @@ begin
 end;
 }
 
-function TInfMargenArticuloController.BuscarTodos: IBizInfMargenArticulo;
+function TInfMargenArticuloController.BuscarAgrupadoPorArticulo: IBizInfMargenArticulo;
 begin
-  Result := FDataModule.GetItems;
+  Result := FDataModule.GetItems(tArticulo);
+  FiltrarEmpresa(Result);
+end;
+
+function TInfMargenArticuloController.BuscarAgrupadoPorCliente: IBizInfMargenArticulo;
+begin
+  Result := FDataModule.GetItems(tCliente);
   FiltrarEmpresa(Result);
 end;
 
@@ -92,6 +106,44 @@ begin
   Result := Supports(EditorRegistry.CreateEditor(AName), IID, Intf);
 end;
 
+function TInfMargenArticuloController.darAgrupacionParaInforme: Integer;
+var
+  JsDialog: TJSDialog;
+  Respuesta: Integer;
+
+begin
+  JsDialog := TJSDialog.Create(nil);
+  try
+    JsDialog.Content.Add('Elija una opci'#243'n:');
+    JsDialog.Instruction.Text := 'Agrupar por...';
+    JsDialog.DialogOptions := [doCommandLinks, doModal];
+    JsDialog.ButtonBar.Buttons := [cbOk];
+
+    with JsDialog.CustomButtons.Add do
+    begin
+       Caption := 'Agrupar el informe por art'#237'culo';
+       Value := 0;
+       Default := True;
+    end;
+
+    with JsDialog.CustomButtons.Add do
+    begin
+       Caption := 'Agrupar el informe por cliente';
+       Value := 1;
+    end;
+
+    repeat
+      Respuesta := JsDialog.Execute;
+    until Respuesta <> IDCANCEL;
+
+    Result := JsDialog.CustomButtonResult;
+
+  finally
+    FreeAndNil(JsDialog);
+  end;
+
+end;
+
 destructor TInfMargenArticuloController.Destroy;
 begin
   FDataModule := Nil;
@@ -151,10 +203,14 @@ begin
       if not Assigned(FDataModule) then
          AsignarDataModule;
       Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Datos := BuscarTodos;
+
+      //Establecemos la vista agrupada basica
+      case AInforme.TIPO_AGRUPACION of
+      CTE_AGRUPACION_PORARTICULO : Datos := BuscarAgrupadoPorArticulo;
+      CTE_AGRUPACION_PORCLIENTE : Datos := BuscarAgrupadoPorCliente;
+      end;
+
       Informe := AInforme;
-
-
 //      Datos.VisibleColumns := FDataModule.GetNameColumns;
     end;
   finally
@@ -216,7 +272,7 @@ begin
       AddOperator(opAND);
 
     OpenBraket;
-    AddText(fld_InfMargenArticuloID_EMPRESA + ' = ' + IntToStr(dmUsuarios.IDEmpresaActual));
+    AddText(fld_InfMargenPorClienteID_EMPRESA + ' = ' + IntToStr(dmUsuarios.IDEmpresaActual));
     CloseBraket;
   end;
 end;
@@ -227,6 +283,9 @@ begin
   AInforme.CATEGORIA := 'MARGEN ARTICULOS';
   AInforme.CONTROLLER := 'InfMargenArticuloController';
   AInforme.ID_EMPRESA := dmUsuarios.EmpresaActual.ID;
+
+  //ESTABLECEMOS EL TIPO DE AGRUPACION INICIAL PARA EL INFORME QUE DESEAMOS CREAR
+  AInforme.TIPO_AGRUPACION := darAgrupacionParaInforme;
 end;
 
 end.
diff --git a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm
index 61febb48..8855977e 100644
--- a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm	
+++ b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm	
@@ -66,7 +66,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
     ProbeServers = False
     ProbeFrequency = 60000
     UserAgent = 'RemObjects SDK'
-    TargetURL = 'http://localhost:8090/bin'
+    TargetURL = 'http://localhost:8099/bin'
     Left = 64
     Top = 272
   end
@@ -74,7 +74,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
     Left = 64
     Top = 324
   end
-  object tbl_InfMargenArticulo2: TDACDSDataTable
+  object tbl_InfMargen: TDACDSDataTable
     RemoteUpdatesOptions = []
     Fields = <>
     Params = <>
@@ -161,12 +161,525 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
     Adapter = DABinAdapter
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'InfMargenArticulo'
     IndexDefs = <>
-    Left = 280
-    Top = 232
+    Left = 288
+    Top = 208
   end
-  object tbl_InfMargenArticulo: TDACDSDataTable
+  object tbl_InfMargenPorArticulo1: TDACDSDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID_EMPRESA'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Id empresa'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_ID_EMPRESA'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'ID_ARTICULO'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Id art'#237'culo'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_ID_ARTICULO'
+        InPrimaryKey = True
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'FAMILIA'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Familia'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_FAMILIA'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Referencia'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_REFERENCIA'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'REFERENCIA_PROV'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Ref. proveedor'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_REFERENCIA_PROV'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'DESCRIPCION'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Descripci'#243'n'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_DESCRIPCION'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'COMISIONABLE'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Comisionable'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_COMISIONABLE'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'INVENTARIABLE'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Inventariable'
+        Alignment = taLeftJustify
+        DictionaryEntry = 'InfVentasArticulo_INVENTARIABLE'
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_UNIDAD_ULT_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_NETO_ULT_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_PORTE_ULT_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_UNIDAD_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_NETO_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_PORTE_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_UNIDAD_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_NETO_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_PORTE_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_UNIDAD_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_NETO_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_PORTE_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_UNIDAD_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_NETO_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_PORTE_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'IMP_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
+      item
+        Name = 'POR_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end>
+    Params = <
+      item
+        Name = 'FECHAINI'
+        BlobType = dabtUnknown
+        Value = ''
+        ParamType = daptInput
+      end
+      item
+        Name = 'FECHAFIN'
+        BlobType = dabtUnknown
+        Value = ''
+        ParamType = daptInput
+      end>
+    MasterMappingMode = mmDataRequest
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    SchemaCall.MethodName = 'GetDatasetSchema'
+    SchemaCall.Params = <
+      item
+        Name = 'Result'
+        ParamType = fResult
+        DataType = rtBinary
+      end
+      item
+        Name = 'aDatasetName'
+        ParamType = fIn
+        DataType = rtString
+        Value = 'InfMargenPorArticulo'
+      end>
+    DataRequestCall.MethodName = 'GetDatasetDataEx'
+    DataRequestCall.Params = <
+      item
+        Name = 'Result'
+        ParamType = fResult
+        DataType = rtBinary
+      end
+      item
+        Name = 'DatasetName'
+        ParamType = fIn
+        DataType = rtString
+        Value = 'InfMargenPorArticulo'
+      end
+      item
+        Name = 'Params'
+        ParamType = fIn
+        DataType = rtUserDefined
+        UserClassName = 'TDADatasetParamArray'
+      end
+      item
+        Name = 'UserFilter'
+        ParamType = fIn
+        DataType = rtString
+        Value = ''
+      end
+      item
+        Name = 'IncludeSchema'
+        ParamType = fIn
+        DataType = rtBoolean
+        Value = False
+      end
+      item
+        Name = 'MaxRecords'
+        ParamType = fIn
+        DataType = rtInteger
+        Value = -1
+      end>
+    DataUpdateCall.MethodName = 'UpdateData'
+    DataUpdateCall.Params = <
+      item
+        Name = 'Result'
+        ParamType = fResult
+        DataType = rtBinary
+      end
+      item
+        Name = 'Delta'
+        ParamType = fIn
+        DataType = rtBinary
+      end>
+    ScriptCall.MethodName = 'GetDatasetScripts'
+    ScriptCall.Params = <
+      item
+        Name = 'Result'
+        ParamType = fResult
+        DataType = rtString
+        Value = ''
+      end
+      item
+        Name = 'DatasetNames'
+        ParamType = fIn
+        DataType = rtString
+        Value = 'InfMargenPorArticulo'
+      end>
+    ReadOnly = False
+    RemoteService = RORemoteService
+    Adapter = DABinAdapter
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    LogicalName = 'InfMargenPorArticulo'
+    IndexDefs = <>
+    Left = 200
+    Top = 112
+  end
+  object ds_InfMargenPorArticulo1: TDADataSource
+    DataTable = tbl_InfMargenPorArticulo1
+    Left = 200
+    Top = 48
+  end
+  object tbl_InfMargenPorCliente1: TDACDSDataTable
     RemoteUpdatesOptions = []
     Fields = <
       item
@@ -655,7 +1168,19 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
         Lookup = False
         LookupCache = False
       end>
-    Params = <>
+    Params = <
+      item
+        Name = 'FECHAINI'
+        BlobType = dabtUnknown
+        Value = ''
+        ParamType = daptInput
+      end
+      item
+        Name = 'FECHAFIN'
+        BlobType = dabtUnknown
+        Value = ''
+        ParamType = daptInput
+      end>
     MasterMappingMode = mmDataRequest
     StreamingOptions = [soDisableEventsWhileStreaming]
     SchemaCall.MethodName = 'GetDatasetSchema'
@@ -669,7 +1194,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
         Name = 'aDatasetName'
         ParamType = fIn
         DataType = rtString
-        Value = 'InfMargenArticulo'
+        Value = 'InfMargenPorCliente'
       end>
     DataRequestCall.MethodName = 'GetDatasetDataEx'
     DataRequestCall.Params = <
@@ -682,7 +1207,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
         Name = 'DatasetName'
         ParamType = fIn
         DataType = rtString
-        Value = 'InfMargenArticulo'
+        Value = 'InfMargenPorCliente'
       end
       item
         Name = 'Params'
@@ -732,16 +1257,21 @@ object dmInfMargenArticulo: TdmInfMargenArticulo
         Name = 'DatasetNames'
         ParamType = fIn
         DataType = rtString
-        Value = 'InfMargenArticulo'
+        Value = 'InfMargenPorCliente'
       end>
     ReadOnly = False
     RemoteService = RORemoteService
     Adapter = DABinAdapter
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'InfMargenArticulo'
+    LogicalName = 'InfMargenPorCliente'
     IndexDefs = <>
-    Left = 280
-    Top = 168
+    Left = 360
+    Top = 104
+  end
+  object ds_InfMargenPorCliente1: TDADataSource
+    DataTable = tbl_InfMargenPorCliente1
+    Left = 360
+    Top = 40
   end
 end
diff --git a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas
index c64e2e91..ba22fe23 100644
--- a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas	
+++ b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas	
@@ -20,14 +20,17 @@ type
     LoginRemoteService: TRORemoteService;
     ROWinInetHTTPChannel1: TROWinInetHTTPChannel;
     ROBinMessage1: TROBinMessage;
-    tbl_InfMargenArticulo2: TDACDSDataTable;
-    tbl_InfMargenArticulo: TDACDSDataTable;
+    tbl_InfMargen: TDACDSDataTable;
+    tbl_InfMargenPorArticulo1: TDACDSDataTable;
+    ds_InfMargenPorArticulo1: TDADataSource;
+    tbl_InfMargenPorCliente1: TDACDSDataTable;
+    ds_InfMargenPorCliente1: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
 
   protected
     function _CloneDataTable (const ADataTable : TDACDSDataTable): TDACDSDataTable; overload;
   public
-    function GetItems : IBizInfMargenArticulo;
+    function GetItems(Agrupado: TEnumAgrupaciones) : IBizInfMargenArticulo;
     function GetNameColumns: String;
   end;
 
@@ -51,20 +54,33 @@ begin
   RORemoteService.Message := dmConexion.Message;
 end;
 
-function TdmInfMargenArticulo.GetItems: IBizInfMargenArticulo;
+function TdmInfMargenArticulo.GetItems(Agrupado: TEnumAgrupaciones): IBizInfMargenArticulo;
 var
   AInfMargenArticulo : TDACDSDataTable;
 begin
   ShowHourglassCursor;
   try
-    AInfMargenArticulo := _CloneDataTable(tbl_InfMargenArticulo2);
-    AInfMargenArticulo.Fields.AssignFieldCollection(tbl_InfMargenArticulo.Fields);
 
+    if (Agrupado = tCliente) then
+    begin
+      tbl_InfMargen.LogicalName := 'InfMargenPorCliente';
+      tbl_InfMargen.SchemaCall.ParamByName('DatasetName').AsString := 'InfMargenPorCliente';
+      tbl_InfMargen.DataRequestCall.ParamByName('DatasetName').AsString := 'InfMargenPorCliente';
+    end
+    else
+    begin
+      tbl_InfMargen.LogicalName := 'InfMargenPorArticulo';
+      tbl_InfMargen.SchemaCall.ParamByName('DatasetName').AsString := 'InfMargenPorArticulo';
+      tbl_InfMargen.DataRequestCall.ParamByName('DatasetName').AsString := 'InfMargenPorArticulo';
+    end;
+
+    AInfMargenArticulo := _CloneDataTable(tbl_InfMargen);
+    AInfMargenArticulo.Fields.AssignFieldCollection(tbl_InfMargenPorCliente1.Fields); //Siempre por cliente
     AInfMargenArticulo.BusinessRulesID := BIZ_InfMargenArticulo;
 
     //Importante inicializar columnas visibles
 //    AInfMargenArticulo.FieldByName(fld_InfMargenArticuloID_FACTURA).Visible := False;
-    AInfMargenArticulo.FieldByName(fld_InfMargenArticuloID_ARTICULO).Visible := False;
+    AInfMargenArticulo.FieldByName(fld_InfMargenPorClienteID_ARTICULO).Visible := False;
     AInfMargenArticulo.LoadSchema;
    (AInfMargenArticulo as IBizInfMargenArticulo).VisibleColumns := GetNameColumns;
 
@@ -81,9 +97,9 @@ var
 begin
   AList := TStringList.Create;
   try
-    for i := 0 to tbl_InfMargenArticulo.FieldCount - 1 do
-      if tbl_InfMargenArticulo.Fields[i].Visible then
-        AList.Add(tbl_InfMargenArticulo.Fields[i].Name);
+    for i := 0 to tbl_InfMargenPorCliente1.FieldCount - 1 do
+      if tbl_InfMargenPorCliente1.Fields[i].Visible then
+        AList.Add(tbl_InfMargenPorCliente1.Fields[i].Name);
     Result := AList.CommaText;
   finally
     FreeAndNil(AList);
diff --git a/Source/Modulos/Informe margen por articulo/Model/Data/uIDataModuleInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Model/Data/uIDataModuleInfMargenArticulo.pas
index ad2acae1..f3ba1cf0 100644
--- a/Source/Modulos/Informe margen por articulo/Model/Data/uIDataModuleInfMargenArticulo.pas	
+++ b/Source/Modulos/Informe margen por articulo/Model/Data/uIDataModuleInfMargenArticulo.pas	
@@ -6,9 +6,11 @@ uses
   uBizInfMargenArticulo;
 
 type
+  TEnumAgrupaciones = (tCliente, tArticulo);
+  
   IDataModuleInfMargenArticulo = interface
   ['{B539E3DE-CC9D-4F12-84AF-2534971B0BE4}']
-    function GetItems : IBizInfMargenArticulo;
+    function GetItems(Agrupado: TEnumAgrupaciones) : IBizInfMargenArticulo;
     function GetNameColumns: String;
   end;
 
diff --git a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas
index c689d78d..32b66850 100644
--- a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas	
+++ b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas	
@@ -9,101 +9,177 @@ 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_InfMargenArticulo = '{92D84183-B3FF-4539-8D7B-157CC5F2C581}';
+  RID_InfMargenPorCliente = '{3692A5E8-B098-4018-BD80-96BFA7A96109}';
+  RID_InfMargenPorArticulo = '{EB4E62CD-5F26-47D0-99CD-8E607B2B7C74}';
 
   { Data table names }
-  nme_InfMargenArticulo = 'InfMargenArticulo';
+  nme_InfMargenPorCliente = 'InfMargenPorCliente';
+  nme_InfMargenPorArticulo = 'InfMargenPorArticulo';
 
-  { InfMargenArticulo fields }
-  fld_InfMargenArticuloID_EMPRESA = 'ID_EMPRESA';
-  fld_InfMargenArticuloID_CLIENTE = 'ID_CLIENTE';
-  fld_InfMargenArticuloID_ARTICULO = 'ID_ARTICULO';
-  fld_InfMargenArticuloFAMILIA = 'FAMILIA';
-  fld_InfMargenArticuloREFERENCIA = 'REFERENCIA';
-  fld_InfMargenArticuloREFERENCIA_PROV = 'REFERENCIA_PROV';
-  fld_InfMargenArticuloDESCRIPCION = 'DESCRIPCION';
-  fld_InfMargenArticuloCOMISIONABLE = 'COMISIONABLE';
-  fld_InfMargenArticuloINVENTARIABLE = 'INVENTARIABLE';
-  fld_InfMargenArticuloNIF_CIF_CLIENTE = 'NIF_CIF_CLIENTE';
-  fld_InfMargenArticuloNOMBRE_CLIENTE = 'NOMBRE_CLIENTE';
-  fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE = 'NOMBRE_COMERCIAL_CLIENTE';
-  fld_InfMargenArticuloNIF_CIF_AGENTE = 'NIF_CIF_AGENTE';
-  fld_InfMargenArticuloNOMBRE_AGENTE = 'NOMBRE_AGENTE';
-  fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT = 'IMP_UNIDAD_ULT_VENT';
-  fld_InfMargenArticuloIMP_NETO_ULT_VENT = 'IMP_NETO_ULT_VENT';
-  fld_InfMargenArticuloIMP_PORTE_ULT_VENT = 'IMP_PORTE_ULT_VENT';
-  fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT = 'IMP_UNIDAD_PRO_VENT';
-  fld_InfMargenArticuloIMP_NETO_PRO_VENT = 'IMP_NETO_PRO_VENT';
-  fld_InfMargenArticuloIMP_PORTE_PRO_VENT = 'IMP_PORTE_PRO_VENT';
-  fld_InfMargenArticuloIMP_UNIDAD_COMPRA = 'IMP_UNIDAD_COMPRA';
-  fld_InfMargenArticuloIMP_NETO_COMPRA = 'IMP_NETO_COMPRA';
-  fld_InfMargenArticuloIMP_PORTE_COMPRA = 'IMP_PORTE_COMPRA';
-  fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP = 'IMP_UNIDAD_ULT_COMP';
-  fld_InfMargenArticuloIMP_NETO_ULT_COMP = 'IMP_NETO_ULT_COMP';
-  fld_InfMargenArticuloIMP_PORTE_ULT_COMP = 'IMP_PORTE_ULT_COMP';
-  fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP = 'IMP_UNIDAD_PRO_COMP';
-  fld_InfMargenArticuloIMP_NETO_PRO_COMP = 'IMP_NETO_PRO_COMP';
-  fld_InfMargenArticuloIMP_PORTE_PRO_COMP = 'IMP_PORTE_PRO_COMP';
-  fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA = 'IMP_MARGEN_ULT_VENT_COMPRA';
-  fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA = 'POR_MARGEN_ULT_VENT_COMPRA';
-  fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 'IMP_MARGEN_ULT_VENT_ULT_COMP';
-  fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 'POR_MARGEN_ULT_VENT_ULT_COMP';
-  fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 'IMP_MARGEN_ULT_VENT_PRO_COMP';
-  fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 'POR_MARGEN_ULT_VENT_PRO_COMP';
-  fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA = 'IMP_MARGEN_PRO_VENT_COMPRA';
-  fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA = 'POR_MARGEN_PRO_VENT_COMPRA';
-  fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 'IMP_MARGEN_PRO_VENT_ULT_COMP';
-  fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 'POR_MARGEN_PRO_VENT_ULT_COMP';
-  fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 'IMP_MARGEN_PRO_VENT_PRO_COMP';
-  fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 'POR_MARGEN_PRO_VENT_PRO_COMP';
+  { InfMargenPorCliente fields }
+  fld_InfMargenPorClienteID_EMPRESA = 'ID_EMPRESA';
+  fld_InfMargenPorClienteID_CLIENTE = 'ID_CLIENTE';
+  fld_InfMargenPorClienteID_ARTICULO = 'ID_ARTICULO';
+  fld_InfMargenPorClienteFAMILIA = 'FAMILIA';
+  fld_InfMargenPorClienteREFERENCIA = 'REFERENCIA';
+  fld_InfMargenPorClienteREFERENCIA_PROV = 'REFERENCIA_PROV';
+  fld_InfMargenPorClienteDESCRIPCION = 'DESCRIPCION';
+  fld_InfMargenPorClienteCOMISIONABLE = 'COMISIONABLE';
+  fld_InfMargenPorClienteINVENTARIABLE = 'INVENTARIABLE';
+  fld_InfMargenPorClienteNIF_CIF_CLIENTE = 'NIF_CIF_CLIENTE';
+  fld_InfMargenPorClienteNOMBRE_CLIENTE = 'NOMBRE_CLIENTE';
+  fld_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE = 'NOMBRE_COMERCIAL_CLIENTE';
+  fld_InfMargenPorClienteNIF_CIF_AGENTE = 'NIF_CIF_AGENTE';
+  fld_InfMargenPorClienteNOMBRE_AGENTE = 'NOMBRE_AGENTE';
+  fld_InfMargenPorClienteIMP_UNIDAD_ULT_VENT = 'IMP_UNIDAD_ULT_VENT';
+  fld_InfMargenPorClienteIMP_NETO_ULT_VENT = 'IMP_NETO_ULT_VENT';
+  fld_InfMargenPorClienteIMP_PORTE_ULT_VENT = 'IMP_PORTE_ULT_VENT';
+  fld_InfMargenPorClienteIMP_UNIDAD_PRO_VENT = 'IMP_UNIDAD_PRO_VENT';
+  fld_InfMargenPorClienteIMP_NETO_PRO_VENT = 'IMP_NETO_PRO_VENT';
+  fld_InfMargenPorClienteIMP_PORTE_PRO_VENT = 'IMP_PORTE_PRO_VENT';
+  fld_InfMargenPorClienteIMP_UNIDAD_COMPRA = 'IMP_UNIDAD_COMPRA';
+  fld_InfMargenPorClienteIMP_NETO_COMPRA = 'IMP_NETO_COMPRA';
+  fld_InfMargenPorClienteIMP_PORTE_COMPRA = 'IMP_PORTE_COMPRA';
+  fld_InfMargenPorClienteIMP_UNIDAD_ULT_COMP = 'IMP_UNIDAD_ULT_COMP';
+  fld_InfMargenPorClienteIMP_NETO_ULT_COMP = 'IMP_NETO_ULT_COMP';
+  fld_InfMargenPorClienteIMP_PORTE_ULT_COMP = 'IMP_PORTE_ULT_COMP';
+  fld_InfMargenPorClienteIMP_UNIDAD_PRO_COMP = 'IMP_UNIDAD_PRO_COMP';
+  fld_InfMargenPorClienteIMP_NETO_PRO_COMP = 'IMP_NETO_PRO_COMP';
+  fld_InfMargenPorClienteIMP_PORTE_PRO_COMP = 'IMP_PORTE_PRO_COMP';
+  fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA = 'IMP_MARGEN_ULT_VENT_COMPRA';
+  fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA = 'POR_MARGEN_ULT_VENT_COMPRA';
+  fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP = 'IMP_MARGEN_ULT_VENT_ULT_COMP';
+  fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP = 'POR_MARGEN_ULT_VENT_ULT_COMP';
+  fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP = 'IMP_MARGEN_ULT_VENT_PRO_COMP';
+  fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP = 'POR_MARGEN_ULT_VENT_PRO_COMP';
+  fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA = 'IMP_MARGEN_PRO_VENT_COMPRA';
+  fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA = 'POR_MARGEN_PRO_VENT_COMPRA';
+  fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP = 'IMP_MARGEN_PRO_VENT_ULT_COMP';
+  fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP = 'POR_MARGEN_PRO_VENT_ULT_COMP';
+  fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP = 'IMP_MARGEN_PRO_VENT_PRO_COMP';
+  fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP = 'POR_MARGEN_PRO_VENT_PRO_COMP';
 
-  { InfMargenArticulo field indexes }
-  idx_InfMargenArticuloID_EMPRESA = 0;
-  idx_InfMargenArticuloID_CLIENTE = 1;
-  idx_InfMargenArticuloID_ARTICULO = 2;
-  idx_InfMargenArticuloFAMILIA = 3;
-  idx_InfMargenArticuloREFERENCIA = 4;
-  idx_InfMargenArticuloREFERENCIA_PROV = 5;
-  idx_InfMargenArticuloDESCRIPCION = 6;
-  idx_InfMargenArticuloCOMISIONABLE = 7;
-  idx_InfMargenArticuloINVENTARIABLE = 8;
-  idx_InfMargenArticuloNIF_CIF_CLIENTE = 9;
-  idx_InfMargenArticuloNOMBRE_CLIENTE = 10;
-  idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE = 11;
-  idx_InfMargenArticuloNIF_CIF_AGENTE = 12;
-  idx_InfMargenArticuloNOMBRE_AGENTE = 13;
-  idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT = 14;
-  idx_InfMargenArticuloIMP_NETO_ULT_VENT = 15;
-  idx_InfMargenArticuloIMP_PORTE_ULT_VENT = 16;
-  idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT = 17;
-  idx_InfMargenArticuloIMP_NETO_PRO_VENT = 18;
-  idx_InfMargenArticuloIMP_PORTE_PRO_VENT = 19;
-  idx_InfMargenArticuloIMP_UNIDAD_COMPRA = 20;
-  idx_InfMargenArticuloIMP_NETO_COMPRA = 21;
-  idx_InfMargenArticuloIMP_PORTE_COMPRA = 22;
-  idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP = 23;
-  idx_InfMargenArticuloIMP_NETO_ULT_COMP = 24;
-  idx_InfMargenArticuloIMP_PORTE_ULT_COMP = 25;
-  idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP = 26;
-  idx_InfMargenArticuloIMP_NETO_PRO_COMP = 27;
-  idx_InfMargenArticuloIMP_PORTE_PRO_COMP = 28;
-  idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA = 29;
-  idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA = 30;
-  idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 31;
-  idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 32;
-  idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 33;
-  idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 34;
-  idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA = 35;
-  idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA = 36;
-  idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 37;
-  idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 38;
-  idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 39;
-  idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 40;
+  { InfMargenPorCliente field indexes }
+  idx_InfMargenPorClienteID_EMPRESA = 0;
+  idx_InfMargenPorClienteID_CLIENTE = 1;
+  idx_InfMargenPorClienteID_ARTICULO = 2;
+  idx_InfMargenPorClienteFAMILIA = 3;
+  idx_InfMargenPorClienteREFERENCIA = 4;
+  idx_InfMargenPorClienteREFERENCIA_PROV = 5;
+  idx_InfMargenPorClienteDESCRIPCION = 6;
+  idx_InfMargenPorClienteCOMISIONABLE = 7;
+  idx_InfMargenPorClienteINVENTARIABLE = 8;
+  idx_InfMargenPorClienteNIF_CIF_CLIENTE = 9;
+  idx_InfMargenPorClienteNOMBRE_CLIENTE = 10;
+  idx_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE = 11;
+  idx_InfMargenPorClienteNIF_CIF_AGENTE = 12;
+  idx_InfMargenPorClienteNOMBRE_AGENTE = 13;
+  idx_InfMargenPorClienteIMP_UNIDAD_ULT_VENT = 14;
+  idx_InfMargenPorClienteIMP_NETO_ULT_VENT = 15;
+  idx_InfMargenPorClienteIMP_PORTE_ULT_VENT = 16;
+  idx_InfMargenPorClienteIMP_UNIDAD_PRO_VENT = 17;
+  idx_InfMargenPorClienteIMP_NETO_PRO_VENT = 18;
+  idx_InfMargenPorClienteIMP_PORTE_PRO_VENT = 19;
+  idx_InfMargenPorClienteIMP_UNIDAD_COMPRA = 20;
+  idx_InfMargenPorClienteIMP_NETO_COMPRA = 21;
+  idx_InfMargenPorClienteIMP_PORTE_COMPRA = 22;
+  idx_InfMargenPorClienteIMP_UNIDAD_ULT_COMP = 23;
+  idx_InfMargenPorClienteIMP_NETO_ULT_COMP = 24;
+  idx_InfMargenPorClienteIMP_PORTE_ULT_COMP = 25;
+  idx_InfMargenPorClienteIMP_UNIDAD_PRO_COMP = 26;
+  idx_InfMargenPorClienteIMP_NETO_PRO_COMP = 27;
+  idx_InfMargenPorClienteIMP_PORTE_PRO_COMP = 28;
+  idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA = 29;
+  idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA = 30;
+  idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP = 31;
+  idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP = 32;
+  idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP = 33;
+  idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP = 34;
+  idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA = 35;
+  idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA = 36;
+  idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP = 37;
+  idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP = 38;
+  idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP = 39;
+  idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP = 40;
+
+  { InfMargenPorArticulo fields }
+  fld_InfMargenPorArticuloID_EMPRESA = 'ID_EMPRESA';
+  fld_InfMargenPorArticuloID_ARTICULO = 'ID_ARTICULO';
+  fld_InfMargenPorArticuloFAMILIA = 'FAMILIA';
+  fld_InfMargenPorArticuloREFERENCIA = 'REFERENCIA';
+  fld_InfMargenPorArticuloREFERENCIA_PROV = 'REFERENCIA_PROV';
+  fld_InfMargenPorArticuloDESCRIPCION = 'DESCRIPCION';
+  fld_InfMargenPorArticuloCOMISIONABLE = 'COMISIONABLE';
+  fld_InfMargenPorArticuloINVENTARIABLE = 'INVENTARIABLE';
+  fld_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT = 'IMP_UNIDAD_ULT_VENT';
+  fld_InfMargenPorArticuloIMP_NETO_ULT_VENT = 'IMP_NETO_ULT_VENT';
+  fld_InfMargenPorArticuloIMP_PORTE_ULT_VENT = 'IMP_PORTE_ULT_VENT';
+  fld_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT = 'IMP_UNIDAD_PRO_VENT';
+  fld_InfMargenPorArticuloIMP_NETO_PRO_VENT = 'IMP_NETO_PRO_VENT';
+  fld_InfMargenPorArticuloIMP_PORTE_PRO_VENT = 'IMP_PORTE_PRO_VENT';
+  fld_InfMargenPorArticuloIMP_UNIDAD_COMPRA = 'IMP_UNIDAD_COMPRA';
+  fld_InfMargenPorArticuloIMP_NETO_COMPRA = 'IMP_NETO_COMPRA';
+  fld_InfMargenPorArticuloIMP_PORTE_COMPRA = 'IMP_PORTE_COMPRA';
+  fld_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP = 'IMP_UNIDAD_ULT_COMP';
+  fld_InfMargenPorArticuloIMP_NETO_ULT_COMP = 'IMP_NETO_ULT_COMP';
+  fld_InfMargenPorArticuloIMP_PORTE_ULT_COMP = 'IMP_PORTE_ULT_COMP';
+  fld_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP = 'IMP_UNIDAD_PRO_COMP';
+  fld_InfMargenPorArticuloIMP_NETO_PRO_COMP = 'IMP_NETO_PRO_COMP';
+  fld_InfMargenPorArticuloIMP_PORTE_PRO_COMP = 'IMP_PORTE_PRO_COMP';
+  fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA = 'IMP_MARGEN_ULT_VENT_COMPRA';
+  fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA = 'POR_MARGEN_ULT_VENT_COMPRA';
+  fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 'IMP_MARGEN_ULT_VENT_ULT_COMP';
+  fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 'POR_MARGEN_ULT_VENT_ULT_COMP';
+  fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 'IMP_MARGEN_ULT_VENT_PRO_COMP';
+  fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 'POR_MARGEN_ULT_VENT_PRO_COMP';
+  fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA = 'IMP_MARGEN_PRO_VENT_COMPRA';
+  fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA = 'POR_MARGEN_PRO_VENT_COMPRA';
+  fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 'IMP_MARGEN_PRO_VENT_ULT_COMP';
+  fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 'POR_MARGEN_PRO_VENT_ULT_COMP';
+  fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 'IMP_MARGEN_PRO_VENT_PRO_COMP';
+  fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 'POR_MARGEN_PRO_VENT_PRO_COMP';
+
+  { InfMargenPorArticulo field indexes }
+  idx_InfMargenPorArticuloID_EMPRESA = 0;
+  idx_InfMargenPorArticuloID_ARTICULO = 1;
+  idx_InfMargenPorArticuloFAMILIA = 2;
+  idx_InfMargenPorArticuloREFERENCIA = 3;
+  idx_InfMargenPorArticuloREFERENCIA_PROV = 4;
+  idx_InfMargenPorArticuloDESCRIPCION = 5;
+  idx_InfMargenPorArticuloCOMISIONABLE = 6;
+  idx_InfMargenPorArticuloINVENTARIABLE = 7;
+  idx_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT = 8;
+  idx_InfMargenPorArticuloIMP_NETO_ULT_VENT = 9;
+  idx_InfMargenPorArticuloIMP_PORTE_ULT_VENT = 10;
+  idx_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT = 11;
+  idx_InfMargenPorArticuloIMP_NETO_PRO_VENT = 12;
+  idx_InfMargenPorArticuloIMP_PORTE_PRO_VENT = 13;
+  idx_InfMargenPorArticuloIMP_UNIDAD_COMPRA = 14;
+  idx_InfMargenPorArticuloIMP_NETO_COMPRA = 15;
+  idx_InfMargenPorArticuloIMP_PORTE_COMPRA = 16;
+  idx_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP = 17;
+  idx_InfMargenPorArticuloIMP_NETO_ULT_COMP = 18;
+  idx_InfMargenPorArticuloIMP_PORTE_ULT_COMP = 19;
+  idx_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP = 20;
+  idx_InfMargenPorArticuloIMP_NETO_PRO_COMP = 21;
+  idx_InfMargenPorArticuloIMP_PORTE_PRO_COMP = 22;
+  idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA = 23;
+  idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA = 24;
+  idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 25;
+  idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 26;
+  idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 27;
+  idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 28;
+  idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA = 29;
+  idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA = 30;
+  idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 31;
+  idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 32;
+  idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 33;
+  idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 34;
 
 type
-  { IInfMargenArticulo }
-  IInfMargenArticulo = interface(IDAStronglyTypedDataTable)
-  ['{3EC440B5-DE16-4E0A-9C9C-BDED49BDCBC7}']
+  { IInfMargenPorCliente }
+  IInfMargenPorCliente = interface(IDAStronglyTypedDataTable)
+  ['{EB6B9398-B7CF-4F84-8C4A-950B0DA5FDED}']
     { Property getters and setters }
     function GetID_EMPRESAValue: Integer;
     procedure SetID_EMPRESAValue(const aValue: Integer);
@@ -233,8 +309,8 @@ type
     property POR_MARGEN_PRO_VENT_PRO_COMP: Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue;
   end;
 
-  { TInfMargenArticuloDataTableRules }
-  TInfMargenArticuloDataTableRules = class(TDADataTableRules, IInfMargenArticulo)
+  { TInfMargenPorClienteDataTableRules }
+  TInfMargenPorClienteDataTableRules = class(TDADataTableRules, IInfMargenPorCliente)
   private
   protected
     { Property getters and setters }
@@ -370,433 +446,1029 @@ type
 
   end;
 
+  { IInfMargenPorArticulo }
+  IInfMargenPorArticulo = interface(IDAStronglyTypedDataTable)
+  ['{08C2EB72-D112-4206-98B0-F47FE2FE0C73}']
+    { Property getters and setters }
+    function GetID_EMPRESAValue: Integer;
+    procedure SetID_EMPRESAValue(const aValue: Integer);
+    function GetID_ARTICULOValue: Integer;
+    procedure SetID_ARTICULOValue(const aValue: Integer);
+    function GetFAMILIAValue: String;
+    procedure SetFAMILIAValue(const aValue: String);
+    function GetREFERENCIAValue: String;
+    procedure SetREFERENCIAValue(const aValue: String);
+    function GetREFERENCIA_PROVValue: String;
+    procedure SetREFERENCIA_PROVValue(const aValue: String);
+    function GetDESCRIPCIONValue: String;
+    procedure SetDESCRIPCIONValue(const aValue: String);
+    function GetCOMISIONABLEValue: Integer;
+    procedure SetCOMISIONABLEValue(const aValue: Integer);
+    function GetINVENTARIABLEValue: Integer;
+    procedure SetINVENTARIABLEValue(const aValue: Integer);
+    function GetIMP_UNIDAD_ULT_VENTValue: Float;
+    procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
+    function GetIMP_NETO_ULT_VENTValue: Float;
+    procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float);
+    function GetIMP_PORTE_ULT_VENTValue: Float;
+    procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
+    function GetIMP_UNIDAD_PRO_VENTValue: Float;
+    procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
+    function GetIMP_NETO_PRO_VENTValue: Float;
+    procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float);
+    function GetIMP_PORTE_PRO_VENTValue: Float;
+    procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
+    function GetIMP_UNIDAD_COMPRAValue: Float;
+    procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
+    function GetIMP_NETO_COMPRAValue: Float;
+    procedure SetIMP_NETO_COMPRAValue(const aValue: Float);
+    function GetIMP_PORTE_COMPRAValue: Float;
+    procedure SetIMP_PORTE_COMPRAValue(const aValue: Float);
+    function GetIMP_UNIDAD_ULT_COMPValue: Float;
+    procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
+    function GetIMP_NETO_ULT_COMPValue: Float;
+    procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float);
+    function GetIMP_PORTE_ULT_COMPValue: Float;
+    procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
+    function GetIMP_UNIDAD_PRO_COMPValue: Float;
+    procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
+    function GetIMP_NETO_PRO_COMPValue: Float;
+    procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float);
+    function GetIMP_PORTE_PRO_COMPValue: Float;
+    procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
+    function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+    procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+    function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+    procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+    function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+    procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+    function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+    procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+    function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+    procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+    function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+    procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+    function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+    procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+    function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+    procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+    function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+    procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+    function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+    procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+    function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+    procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+    function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+    procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+
+
+    { Properties }
+    property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue;
+    property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue;
+    property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
+    property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property REFERENCIA_PROV: String read GetREFERENCIA_PROVValue write SetREFERENCIA_PROVValue;
+    property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue;
+    property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
+    property IMP_UNIDAD_ULT_VENT: Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue;
+    property IMP_NETO_ULT_VENT: Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue;
+    property IMP_PORTE_ULT_VENT: Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue;
+    property IMP_UNIDAD_PRO_VENT: Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue;
+    property IMP_NETO_PRO_VENT: Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue;
+    property IMP_PORTE_PRO_VENT: Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue;
+    property IMP_UNIDAD_COMPRA: Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue;
+    property IMP_NETO_COMPRA: Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue;
+    property IMP_PORTE_COMPRA: Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue;
+    property IMP_UNIDAD_ULT_COMP: Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue;
+    property IMP_NETO_ULT_COMP: Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue;
+    property IMP_PORTE_ULT_COMP: Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue;
+    property IMP_UNIDAD_PRO_COMP: Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue;
+    property IMP_NETO_PRO_COMP: Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue;
+    property IMP_PORTE_PRO_COMP: Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue;
+    property IMP_MARGEN_ULT_VENT_COMPRA: Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue;
+    property POR_MARGEN_ULT_VENT_COMPRA: Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue;
+    property IMP_MARGEN_ULT_VENT_ULT_COMP: Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue;
+    property POR_MARGEN_ULT_VENT_ULT_COMP: Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue;
+    property IMP_MARGEN_ULT_VENT_PRO_COMP: Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue;
+    property POR_MARGEN_ULT_VENT_PRO_COMP: Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue;
+    property IMP_MARGEN_PRO_VENT_COMPRA: Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue;
+    property POR_MARGEN_PRO_VENT_COMPRA: Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue;
+    property IMP_MARGEN_PRO_VENT_ULT_COMP: Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue;
+    property POR_MARGEN_PRO_VENT_ULT_COMP: Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue;
+    property IMP_MARGEN_PRO_VENT_PRO_COMP: Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue;
+    property POR_MARGEN_PRO_VENT_PRO_COMP: Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue;
+  end;
+
+  { TInfMargenPorArticuloDataTableRules }
+  TInfMargenPorArticuloDataTableRules = class(TDADataTableRules, IInfMargenPorArticulo)
+  private
+  protected
+    { Property getters and setters }
+    function GetID_EMPRESAValue: Integer; virtual;
+    procedure SetID_EMPRESAValue(const aValue: Integer); virtual;
+    function GetID_ARTICULOValue: Integer; virtual;
+    procedure SetID_ARTICULOValue(const aValue: Integer); virtual;
+    function GetFAMILIAValue: String; virtual;
+    procedure SetFAMILIAValue(const aValue: String); virtual;
+    function GetREFERENCIAValue: String; virtual;
+    procedure SetREFERENCIAValue(const aValue: String); virtual;
+    function GetREFERENCIA_PROVValue: String; virtual;
+    procedure SetREFERENCIA_PROVValue(const aValue: String); virtual;
+    function GetDESCRIPCIONValue: String; virtual;
+    procedure SetDESCRIPCIONValue(const aValue: String); virtual;
+    function GetCOMISIONABLEValue: Integer; virtual;
+    procedure SetCOMISIONABLEValue(const aValue: Integer); virtual;
+    function GetINVENTARIABLEValue: Integer; virtual;
+    procedure SetINVENTARIABLEValue(const aValue: Integer); virtual;
+    function GetIMP_UNIDAD_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_NETO_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_NETO_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_COMPRAValue: Float; virtual;
+    procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_NETO_COMPRAValue: Float; virtual;
+    procedure SetIMP_NETO_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_COMPRAValue: Float; virtual;
+    procedure SetIMP_PORTE_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_NETO_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_NETO_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual;
+
+    { Properties }
+    property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue;
+    property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue;
+    property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
+    property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property REFERENCIA_PROV: String read GetREFERENCIA_PROVValue write SetREFERENCIA_PROVValue;
+    property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue;
+    property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
+    property IMP_UNIDAD_ULT_VENT: Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue;
+    property IMP_NETO_ULT_VENT: Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue;
+    property IMP_PORTE_ULT_VENT: Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue;
+    property IMP_UNIDAD_PRO_VENT: Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue;
+    property IMP_NETO_PRO_VENT: Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue;
+    property IMP_PORTE_PRO_VENT: Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue;
+    property IMP_UNIDAD_COMPRA: Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue;
+    property IMP_NETO_COMPRA: Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue;
+    property IMP_PORTE_COMPRA: Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue;
+    property IMP_UNIDAD_ULT_COMP: Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue;
+    property IMP_NETO_ULT_COMP: Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue;
+    property IMP_PORTE_ULT_COMP: Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue;
+    property IMP_UNIDAD_PRO_COMP: Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue;
+    property IMP_NETO_PRO_COMP: Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue;
+    property IMP_PORTE_PRO_COMP: Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue;
+    property IMP_MARGEN_ULT_VENT_COMPRA: Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue;
+    property POR_MARGEN_ULT_VENT_COMPRA: Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue;
+    property IMP_MARGEN_ULT_VENT_ULT_COMP: Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue;
+    property POR_MARGEN_ULT_VENT_ULT_COMP: Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue;
+    property IMP_MARGEN_ULT_VENT_PRO_COMP: Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue;
+    property POR_MARGEN_ULT_VENT_PRO_COMP: Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue;
+    property IMP_MARGEN_PRO_VENT_COMPRA: Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue;
+    property POR_MARGEN_PRO_VENT_COMPRA: Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue;
+    property IMP_MARGEN_PRO_VENT_ULT_COMP: Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue;
+    property POR_MARGEN_PRO_VENT_ULT_COMP: Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue;
+    property IMP_MARGEN_PRO_VENT_PRO_COMP: Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue;
+    property POR_MARGEN_PRO_VENT_PRO_COMP: Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses Variants;
 
-{ TInfMargenArticuloDataTableRules }
-constructor TInfMargenArticuloDataTableRules.Create(aDataTable: TDADataTable);
+{ TInfMargenPorClienteDataTableRules }
+constructor TInfMargenPorClienteDataTableRules.Create(aDataTable: TDADataTable);
 begin
   inherited;
 end;
 
-destructor TInfMargenArticuloDataTableRules.Destroy;
+destructor TInfMargenPorClienteDataTableRules.Destroy;
 begin
   inherited;
 end;
 
-function TInfMargenArticuloDataTableRules.GetID_EMPRESAValue: Integer;
+function TInfMargenPorClienteDataTableRules.GetID_EMPRESAValue: Integer;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloID_EMPRESA].AsInteger;
+  result := DataTable.Fields[idx_InfMargenPorClienteID_EMPRESA].AsInteger;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetID_EMPRESAValue(const aValue: Integer);
+procedure TInfMargenPorClienteDataTableRules.SetID_EMPRESAValue(const aValue: Integer);
 begin
-  DataTable.Fields[idx_InfMargenArticuloID_EMPRESA].AsInteger := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteID_EMPRESA].AsInteger := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetID_CLIENTEValue: Integer;
+function TInfMargenPorClienteDataTableRules.GetID_CLIENTEValue: Integer;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloID_CLIENTE].AsInteger;
+  result := DataTable.Fields[idx_InfMargenPorClienteID_CLIENTE].AsInteger;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetID_CLIENTEValue(const aValue: Integer);
+procedure TInfMargenPorClienteDataTableRules.SetID_CLIENTEValue(const aValue: Integer);
 begin
-  DataTable.Fields[idx_InfMargenArticuloID_CLIENTE].AsInteger := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteID_CLIENTE].AsInteger := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetID_ARTICULOValue: Integer;
+function TInfMargenPorClienteDataTableRules.GetID_ARTICULOValue: Integer;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloID_ARTICULO].AsInteger;
+  result := DataTable.Fields[idx_InfMargenPorClienteID_ARTICULO].AsInteger;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetID_ARTICULOValue(const aValue: Integer);
+procedure TInfMargenPorClienteDataTableRules.SetID_ARTICULOValue(const aValue: Integer);
 begin
-  DataTable.Fields[idx_InfMargenArticuloID_ARTICULO].AsInteger := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteID_ARTICULO].AsInteger := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetFAMILIAValue: String;
+function TInfMargenPorClienteDataTableRules.GetFAMILIAValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloFAMILIA].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteFAMILIA].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetFAMILIAValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetFAMILIAValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloFAMILIA].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteFAMILIA].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetREFERENCIAValue: String;
+function TInfMargenPorClienteDataTableRules.GetREFERENCIAValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloREFERENCIA].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteREFERENCIA].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetREFERENCIAValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetREFERENCIAValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloREFERENCIA].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteREFERENCIA].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetREFERENCIA_PROVValue: String;
+function TInfMargenPorClienteDataTableRules.GetREFERENCIA_PROVValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloREFERENCIA_PROV].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteREFERENCIA_PROV].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetREFERENCIA_PROVValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetREFERENCIA_PROVValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloREFERENCIA_PROV].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteREFERENCIA_PROV].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetDESCRIPCIONValue: String;
+function TInfMargenPorClienteDataTableRules.GetDESCRIPCIONValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloDESCRIPCION].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteDESCRIPCION].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetDESCRIPCIONValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetDESCRIPCIONValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloDESCRIPCION].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteDESCRIPCION].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetCOMISIONABLEValue: Integer;
+function TInfMargenPorClienteDataTableRules.GetCOMISIONABLEValue: Integer;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloCOMISIONABLE].AsInteger;
+  result := DataTable.Fields[idx_InfMargenPorClienteCOMISIONABLE].AsInteger;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetCOMISIONABLEValue(const aValue: Integer);
+procedure TInfMargenPorClienteDataTableRules.SetCOMISIONABLEValue(const aValue: Integer);
 begin
-  DataTable.Fields[idx_InfMargenArticuloCOMISIONABLE].AsInteger := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteCOMISIONABLE].AsInteger := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetINVENTARIABLEValue: Integer;
+function TInfMargenPorClienteDataTableRules.GetINVENTARIABLEValue: Integer;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloINVENTARIABLE].AsInteger;
+  result := DataTable.Fields[idx_InfMargenPorClienteINVENTARIABLE].AsInteger;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetINVENTARIABLEValue(const aValue: Integer);
+procedure TInfMargenPorClienteDataTableRules.SetINVENTARIABLEValue(const aValue: Integer);
 begin
-  DataTable.Fields[idx_InfMargenArticuloINVENTARIABLE].AsInteger := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteINVENTARIABLE].AsInteger := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetNIF_CIF_CLIENTEValue: String;
+function TInfMargenPorClienteDataTableRules.GetNIF_CIF_CLIENTEValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloNIF_CIF_CLIENTE].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteNIF_CIF_CLIENTE].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetNIF_CIF_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetNIF_CIF_CLIENTEValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloNIF_CIF_CLIENTE].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteNIF_CIF_CLIENTE].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetNOMBRE_CLIENTEValue: String;
+function TInfMargenPorClienteDataTableRules.GetNOMBRE_CLIENTEValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloNOMBRE_CLIENTE].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteNOMBRE_CLIENTE].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetNOMBRE_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetNOMBRE_CLIENTEValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloNOMBRE_CLIENTE].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteNOMBRE_CLIENTE].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetNOMBRE_COMERCIAL_CLIENTEValue: String;
+function TInfMargenPorClienteDataTableRules.GetNOMBRE_COMERCIAL_CLIENTEValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetNIF_CIF_AGENTEValue: String;
+function TInfMargenPorClienteDataTableRules.GetNIF_CIF_AGENTEValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloNIF_CIF_AGENTE].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteNIF_CIF_AGENTE].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetNIF_CIF_AGENTEValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetNIF_CIF_AGENTEValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloNIF_CIF_AGENTE].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteNIF_CIF_AGENTE].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetNOMBRE_AGENTEValue: String;
+function TInfMargenPorClienteDataTableRules.GetNOMBRE_AGENTEValue: String;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloNOMBRE_AGENTE].AsString;
+  result := DataTable.Fields[idx_InfMargenPorClienteNOMBRE_AGENTE].AsString;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetNOMBRE_AGENTEValue(const aValue: String);
+procedure TInfMargenPorClienteDataTableRules.SetNOMBRE_AGENTEValue(const aValue: String);
 begin
-  DataTable.Fields[idx_InfMargenArticuloNOMBRE_AGENTE].AsString := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteNOMBRE_AGENTE].AsString := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_ULT_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_ULT_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_NETO_ULT_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_NETO_ULT_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_ULT_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_ULT_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_PORTE_ULT_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_PORTE_ULT_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_ULT_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_ULT_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_PRO_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_PRO_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_NETO_PRO_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_NETO_PRO_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_PRO_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_PRO_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_PORTE_PRO_VENTValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_PORTE_PRO_VENTValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_VENT].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_PRO_VENT].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_VENT].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_PRO_VENT].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_UNIDAD_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_NETO_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_NETO_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_NETO_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_PORTE_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_PORTE_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_NETO_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_NETO_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_PORTE_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_PORTE_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_UNIDAD_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_NETO_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_NETO_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_NETO_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_PORTE_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_PORTE_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_PORTE_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
 end;
 
-function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteDataTableRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
+  result := DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
 end;
 
-procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteDataTableRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
+  DataTable.Fields[idx_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
+end;
+
+
+{ TInfMargenPorArticuloDataTableRules }
+constructor TInfMargenPorArticuloDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TInfMargenPorArticuloDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetID_EMPRESAValue: Integer;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloID_EMPRESA].AsInteger;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetID_EMPRESAValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloID_EMPRESA].AsInteger := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetID_ARTICULOValue: Integer;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloID_ARTICULO].AsInteger;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetID_ARTICULOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloID_ARTICULO].AsInteger := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetFAMILIAValue: String;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloFAMILIA].AsString;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetFAMILIAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloFAMILIA].AsString := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetREFERENCIAValue: String;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloREFERENCIA].AsString;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetREFERENCIAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloREFERENCIA].AsString := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetREFERENCIA_PROVValue: String;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloREFERENCIA_PROV].AsString;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetREFERENCIA_PROVValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloREFERENCIA_PROV].AsString := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetDESCRIPCIONValue: String;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloDESCRIPCION].AsString;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetDESCRIPCIONValue(const aValue: String);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloDESCRIPCION].AsString := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetCOMISIONABLEValue: Integer;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloCOMISIONABLE].AsInteger;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetCOMISIONABLEValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloCOMISIONABLE].AsInteger := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetINVENTARIABLEValue: Integer;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloINVENTARIABLE].AsInteger;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetINVENTARIABLEValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloINVENTARIABLE].AsInteger := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_NETO_ULT_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_ULT_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_ULT_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_PORTE_ULT_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_ULT_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_ULT_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_NETO_PRO_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_PRO_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_PRO_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_PORTE_PRO_VENTValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_PRO_VENT].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_PRO_VENT].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_UNIDAD_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_NETO_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_PORTE_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_NETO_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_PORTE_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_NETO_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_NETO_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_PORTE_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_PORTE_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
+end;
+
+function TInfMargenPorArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat;
+end;
+
+procedure TInfMargenPorArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue;
 end;
 
 
 initialization
-  RegisterDataTableRules(RID_InfMargenArticulo, TInfMargenArticuloDataTableRules);
+  RegisterDataTableRules(RID_InfMargenPorCliente, TInfMargenPorClienteDataTableRules);
+  RegisterDataTableRules(RID_InfMargenPorArticulo, TInfMargenPorArticuloDataTableRules);
 
 end.
diff --git a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas
index 01f43f0f..6ab88926 100644
--- a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas	
+++ b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas	
@@ -9,12 +9,13 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_InfMargenArticuloDelta = '{E5366B0B-4C1B-4831-8053-90F6A565F217}';
+  RID_InfMargenPorClienteDelta = '{4849A47C-A068-4F94-8175-8642792A1951}';
+  RID_InfMargenPorArticuloDelta = '{E660929D-6B13-4D1F-91E2-399D5B205DEA}';
 
 type
-  { IInfMargenArticuloDelta }
-  IInfMargenArticuloDelta = interface(IInfMargenArticulo)
-  ['{E5366B0B-4C1B-4831-8053-90F6A565F217}']
+  { IInfMargenPorClienteDelta }
+  IInfMargenPorClienteDelta = interface(IInfMargenPorCliente)
+  ['{4849A47C-A068-4F94-8175-8642792A1951}']
     { Property getters and setters }
     function GetOldID_EMPRESAValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -102,8 +103,8 @@ type
     property OldPOR_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue;
   end;
 
-  { TInfMargenArticuloBusinessProcessorRules }
-  TInfMargenArticuloBusinessProcessorRules = class(TDABusinessProcessorRules, IInfMargenArticulo, IInfMargenArticuloDelta)
+  { TInfMargenPorClienteBusinessProcessorRules }
+  TInfMargenPorClienteBusinessProcessorRules = class(TDABusinessProcessorRules, IInfMargenPorCliente, IInfMargenPorClienteDelta)
   private
   protected
     { Property getters and setters }
@@ -321,639 +322,1444 @@ type
 
   end;
 
+  { IInfMargenPorArticuloDelta }
+  IInfMargenPorArticuloDelta = interface(IInfMargenPorArticulo)
+  ['{E660929D-6B13-4D1F-91E2-399D5B205DEA}']
+    { Property getters and setters }
+    function GetOldID_EMPRESAValue : Integer;
+    function GetOldID_ARTICULOValue : Integer;
+    function GetOldFAMILIAValue : String;
+    function GetOldREFERENCIAValue : String;
+    function GetOldREFERENCIA_PROVValue : String;
+    function GetOldDESCRIPCIONValue : String;
+    function GetOldCOMISIONABLEValue : Integer;
+    function GetOldINVENTARIABLEValue : Integer;
+    function GetOldIMP_UNIDAD_ULT_VENTValue : Float;
+    function GetOldIMP_NETO_ULT_VENTValue : Float;
+    function GetOldIMP_PORTE_ULT_VENTValue : Float;
+    function GetOldIMP_UNIDAD_PRO_VENTValue : Float;
+    function GetOldIMP_NETO_PRO_VENTValue : Float;
+    function GetOldIMP_PORTE_PRO_VENTValue : Float;
+    function GetOldIMP_UNIDAD_COMPRAValue : Float;
+    function GetOldIMP_NETO_COMPRAValue : Float;
+    function GetOldIMP_PORTE_COMPRAValue : Float;
+    function GetOldIMP_UNIDAD_ULT_COMPValue : Float;
+    function GetOldIMP_NETO_ULT_COMPValue : Float;
+    function GetOldIMP_PORTE_ULT_COMPValue : Float;
+    function GetOldIMP_UNIDAD_PRO_COMPValue : Float;
+    function GetOldIMP_NETO_PRO_COMPValue : Float;
+    function GetOldIMP_PORTE_PRO_COMPValue : Float;
+    function GetOldIMP_MARGEN_ULT_VENT_COMPRAValue : Float;
+    function GetOldPOR_MARGEN_ULT_VENT_COMPRAValue : Float;
+    function GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue : Float;
+    function GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue : Float;
+    function GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue : Float;
+    function GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue : Float;
+    function GetOldIMP_MARGEN_PRO_VENT_COMPRAValue : Float;
+    function GetOldPOR_MARGEN_PRO_VENT_COMPRAValue : Float;
+    function GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue : Float;
+    function GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue : Float;
+    function GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue : Float;
+    function GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue : Float;
+
+    { Properties }
+    property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
+    property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue;
+    property OldFAMILIA : String read GetOldFAMILIAValue;
+    property OldREFERENCIA : String read GetOldREFERENCIAValue;
+    property OldREFERENCIA_PROV : String read GetOldREFERENCIA_PROVValue;
+    property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+    property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue;
+    property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue;
+    property OldIMP_UNIDAD_ULT_VENT : Float read GetOldIMP_UNIDAD_ULT_VENTValue;
+    property OldIMP_NETO_ULT_VENT : Float read GetOldIMP_NETO_ULT_VENTValue;
+    property OldIMP_PORTE_ULT_VENT : Float read GetOldIMP_PORTE_ULT_VENTValue;
+    property OldIMP_UNIDAD_PRO_VENT : Float read GetOldIMP_UNIDAD_PRO_VENTValue;
+    property OldIMP_NETO_PRO_VENT : Float read GetOldIMP_NETO_PRO_VENTValue;
+    property OldIMP_PORTE_PRO_VENT : Float read GetOldIMP_PORTE_PRO_VENTValue;
+    property OldIMP_UNIDAD_COMPRA : Float read GetOldIMP_UNIDAD_COMPRAValue;
+    property OldIMP_NETO_COMPRA : Float read GetOldIMP_NETO_COMPRAValue;
+    property OldIMP_PORTE_COMPRA : Float read GetOldIMP_PORTE_COMPRAValue;
+    property OldIMP_UNIDAD_ULT_COMP : Float read GetOldIMP_UNIDAD_ULT_COMPValue;
+    property OldIMP_NETO_ULT_COMP : Float read GetOldIMP_NETO_ULT_COMPValue;
+    property OldIMP_PORTE_ULT_COMP : Float read GetOldIMP_PORTE_ULT_COMPValue;
+    property OldIMP_UNIDAD_PRO_COMP : Float read GetOldIMP_UNIDAD_PRO_COMPValue;
+    property OldIMP_NETO_PRO_COMP : Float read GetOldIMP_NETO_PRO_COMPValue;
+    property OldIMP_PORTE_PRO_COMP : Float read GetOldIMP_PORTE_PRO_COMPValue;
+    property OldIMP_MARGEN_ULT_VENT_COMPRA : Float read GetOldIMP_MARGEN_ULT_VENT_COMPRAValue;
+    property OldPOR_MARGEN_ULT_VENT_COMPRA : Float read GetOldPOR_MARGEN_ULT_VENT_COMPRAValue;
+    property OldIMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue;
+    property OldPOR_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue;
+    property OldIMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue;
+    property OldPOR_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue;
+    property OldIMP_MARGEN_PRO_VENT_COMPRA : Float read GetOldIMP_MARGEN_PRO_VENT_COMPRAValue;
+    property OldPOR_MARGEN_PRO_VENT_COMPRA : Float read GetOldPOR_MARGEN_PRO_VENT_COMPRAValue;
+    property OldIMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue;
+    property OldPOR_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue;
+    property OldIMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue;
+    property OldPOR_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue;
+  end;
+
+  { TInfMargenPorArticuloBusinessProcessorRules }
+  TInfMargenPorArticuloBusinessProcessorRules = class(TDABusinessProcessorRules, IInfMargenPorArticulo, IInfMargenPorArticuloDelta)
+  private
+  protected
+    { Property getters and setters }
+    function GetID_EMPRESAValue: Integer; virtual;
+    function GetOldID_EMPRESAValue: Integer; virtual;
+    procedure SetID_EMPRESAValue(const aValue: Integer); virtual;
+    function GetID_ARTICULOValue: Integer; virtual;
+    function GetOldID_ARTICULOValue: Integer; virtual;
+    procedure SetID_ARTICULOValue(const aValue: Integer); virtual;
+    function GetFAMILIAValue: String; virtual;
+    function GetOldFAMILIAValue: String; virtual;
+    procedure SetFAMILIAValue(const aValue: String); virtual;
+    function GetREFERENCIAValue: String; virtual;
+    function GetOldREFERENCIAValue: String; virtual;
+    procedure SetREFERENCIAValue(const aValue: String); virtual;
+    function GetREFERENCIA_PROVValue: String; virtual;
+    function GetOldREFERENCIA_PROVValue: String; virtual;
+    procedure SetREFERENCIA_PROVValue(const aValue: String); virtual;
+    function GetDESCRIPCIONValue: String; virtual;
+    function GetOldDESCRIPCIONValue: String; virtual;
+    procedure SetDESCRIPCIONValue(const aValue: String); virtual;
+    function GetCOMISIONABLEValue: Integer; virtual;
+    function GetOldCOMISIONABLEValue: Integer; virtual;
+    procedure SetCOMISIONABLEValue(const aValue: Integer); virtual;
+    function GetINVENTARIABLEValue: Integer; virtual;
+    function GetOldINVENTARIABLEValue: Integer; virtual;
+    procedure SetINVENTARIABLEValue(const aValue: Integer); virtual;
+    function GetIMP_UNIDAD_ULT_VENTValue: Float; virtual;
+    function GetOldIMP_UNIDAD_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_NETO_ULT_VENTValue: Float; virtual;
+    function GetOldIMP_NETO_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_ULT_VENTValue: Float; virtual;
+    function GetOldIMP_PORTE_ULT_VENTValue: Float; virtual;
+    procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_PRO_VENTValue: Float; virtual;
+    function GetOldIMP_UNIDAD_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_NETO_PRO_VENTValue: Float; virtual;
+    function GetOldIMP_NETO_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_PRO_VENTValue: Float; virtual;
+    function GetOldIMP_PORTE_PRO_VENTValue: Float; virtual;
+    procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_COMPRAValue: Float; virtual;
+    function GetOldIMP_UNIDAD_COMPRAValue: Float; virtual;
+    procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_NETO_COMPRAValue: Float; virtual;
+    function GetOldIMP_NETO_COMPRAValue: Float; virtual;
+    procedure SetIMP_NETO_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_COMPRAValue: Float; virtual;
+    function GetOldIMP_PORTE_COMPRAValue: Float; virtual;
+    procedure SetIMP_PORTE_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_ULT_COMPValue: Float; virtual;
+    function GetOldIMP_UNIDAD_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_NETO_ULT_COMPValue: Float; virtual;
+    function GetOldIMP_NETO_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_ULT_COMPValue: Float; virtual;
+    function GetOldIMP_PORTE_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_UNIDAD_PRO_COMPValue: Float; virtual;
+    function GetOldIMP_UNIDAD_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_NETO_PRO_COMPValue: Float; virtual;
+    function GetOldIMP_NETO_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_PORTE_PRO_COMPValue: Float; virtual;
+    function GetOldIMP_PORTE_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    function GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    function GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    function GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    function GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    function GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    function GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    function GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    function GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    function GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    function GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual;
+    function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    function GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual;
+    function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    function GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual;
+    procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual;
+
+    { Properties }
+    property ID_EMPRESA : Integer read GetID_EMPRESAValue write SetID_EMPRESAValue;
+    property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
+    property ID_ARTICULO : Integer read GetID_ARTICULOValue write SetID_ARTICULOValue;
+    property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue;
+    property FAMILIA : String read GetFAMILIAValue write SetFAMILIAValue;
+    property OldFAMILIA : String read GetOldFAMILIAValue;
+    property REFERENCIA : String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property OldREFERENCIA : String read GetOldREFERENCIAValue;
+    property REFERENCIA_PROV : String read GetREFERENCIA_PROVValue write SetREFERENCIA_PROVValue;
+    property OldREFERENCIA_PROV : String read GetOldREFERENCIA_PROVValue;
+    property DESCRIPCION : String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+    property COMISIONABLE : Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue;
+    property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue;
+    property INVENTARIABLE : Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
+    property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue;
+    property IMP_UNIDAD_ULT_VENT : Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue;
+    property OldIMP_UNIDAD_ULT_VENT : Float read GetOldIMP_UNIDAD_ULT_VENTValue;
+    property IMP_NETO_ULT_VENT : Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue;
+    property OldIMP_NETO_ULT_VENT : Float read GetOldIMP_NETO_ULT_VENTValue;
+    property IMP_PORTE_ULT_VENT : Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue;
+    property OldIMP_PORTE_ULT_VENT : Float read GetOldIMP_PORTE_ULT_VENTValue;
+    property IMP_UNIDAD_PRO_VENT : Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue;
+    property OldIMP_UNIDAD_PRO_VENT : Float read GetOldIMP_UNIDAD_PRO_VENTValue;
+    property IMP_NETO_PRO_VENT : Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue;
+    property OldIMP_NETO_PRO_VENT : Float read GetOldIMP_NETO_PRO_VENTValue;
+    property IMP_PORTE_PRO_VENT : Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue;
+    property OldIMP_PORTE_PRO_VENT : Float read GetOldIMP_PORTE_PRO_VENTValue;
+    property IMP_UNIDAD_COMPRA : Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue;
+    property OldIMP_UNIDAD_COMPRA : Float read GetOldIMP_UNIDAD_COMPRAValue;
+    property IMP_NETO_COMPRA : Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue;
+    property OldIMP_NETO_COMPRA : Float read GetOldIMP_NETO_COMPRAValue;
+    property IMP_PORTE_COMPRA : Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue;
+    property OldIMP_PORTE_COMPRA : Float read GetOldIMP_PORTE_COMPRAValue;
+    property IMP_UNIDAD_ULT_COMP : Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue;
+    property OldIMP_UNIDAD_ULT_COMP : Float read GetOldIMP_UNIDAD_ULT_COMPValue;
+    property IMP_NETO_ULT_COMP : Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue;
+    property OldIMP_NETO_ULT_COMP : Float read GetOldIMP_NETO_ULT_COMPValue;
+    property IMP_PORTE_ULT_COMP : Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue;
+    property OldIMP_PORTE_ULT_COMP : Float read GetOldIMP_PORTE_ULT_COMPValue;
+    property IMP_UNIDAD_PRO_COMP : Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue;
+    property OldIMP_UNIDAD_PRO_COMP : Float read GetOldIMP_UNIDAD_PRO_COMPValue;
+    property IMP_NETO_PRO_COMP : Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue;
+    property OldIMP_NETO_PRO_COMP : Float read GetOldIMP_NETO_PRO_COMPValue;
+    property IMP_PORTE_PRO_COMP : Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue;
+    property OldIMP_PORTE_PRO_COMP : Float read GetOldIMP_PORTE_PRO_COMPValue;
+    property IMP_MARGEN_ULT_VENT_COMPRA : Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue;
+    property OldIMP_MARGEN_ULT_VENT_COMPRA : Float read GetOldIMP_MARGEN_ULT_VENT_COMPRAValue;
+    property POR_MARGEN_ULT_VENT_COMPRA : Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue;
+    property OldPOR_MARGEN_ULT_VENT_COMPRA : Float read GetOldPOR_MARGEN_ULT_VENT_COMPRAValue;
+    property IMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue;
+    property OldIMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue;
+    property POR_MARGEN_ULT_VENT_ULT_COMP : Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue;
+    property OldPOR_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue;
+    property IMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue;
+    property OldIMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue;
+    property POR_MARGEN_ULT_VENT_PRO_COMP : Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue;
+    property OldPOR_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue;
+    property IMP_MARGEN_PRO_VENT_COMPRA : Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue;
+    property OldIMP_MARGEN_PRO_VENT_COMPRA : Float read GetOldIMP_MARGEN_PRO_VENT_COMPRAValue;
+    property POR_MARGEN_PRO_VENT_COMPRA : Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue;
+    property OldPOR_MARGEN_PRO_VENT_COMPRA : Float read GetOldPOR_MARGEN_PRO_VENT_COMPRAValue;
+    property IMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue;
+    property OldIMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue;
+    property POR_MARGEN_PRO_VENT_ULT_COMP : Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue;
+    property OldPOR_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue;
+    property IMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue;
+    property OldIMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue;
+    property POR_MARGEN_PRO_VENT_PRO_COMP : Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue;
+    property OldPOR_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses
   Variants, uROBinaryHelpers;
 
-{ TInfMargenArticuloBusinessProcessorRules }
-constructor TInfMargenArticuloBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+{ TInfMargenPorClienteBusinessProcessorRules }
+constructor TInfMargenPorClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
 begin
   inherited;
 end;
 
-destructor TInfMargenArticuloBusinessProcessorRules.Destroy;
+destructor TInfMargenPorClienteBusinessProcessorRules.Destroy;
 begin
   inherited;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetID_EMPRESAValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetID_EMPRESAValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_EMPRESA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_EMPRESA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldID_EMPRESAValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldID_EMPRESAValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_EMPRESA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteID_EMPRESA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetID_EMPRESAValue(const aValue: Integer);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetID_EMPRESAValue(const aValue: Integer);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_EMPRESA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_EMPRESA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetID_CLIENTEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetID_CLIENTEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_CLIENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_CLIENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldID_CLIENTEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldID_CLIENTEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_CLIENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteID_CLIENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetID_CLIENTEValue(const aValue: Integer);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetID_CLIENTEValue(const aValue: Integer);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_CLIENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_CLIENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetID_ARTICULOValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetID_ARTICULOValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_ARTICULO];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_ARTICULO];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldID_ARTICULOValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldID_ARTICULOValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_ARTICULO];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteID_ARTICULO];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetID_ARTICULOValue(const aValue: Integer);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetID_ARTICULOValue(const aValue: Integer);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_ARTICULO] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteID_ARTICULO] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetFAMILIAValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetFAMILIAValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloFAMILIA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteFAMILIA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldFAMILIAValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldFAMILIAValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloFAMILIA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteFAMILIA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetFAMILIAValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetFAMILIAValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloFAMILIA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteFAMILIA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetREFERENCIAValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetREFERENCIAValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteREFERENCIA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldREFERENCIAValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldREFERENCIAValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloREFERENCIA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteREFERENCIA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteREFERENCIA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetREFERENCIA_PROVValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetREFERENCIA_PROVValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA_PROV];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteREFERENCIA_PROV];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldREFERENCIA_PROVValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldREFERENCIA_PROVValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloREFERENCIA_PROV];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteREFERENCIA_PROV];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetREFERENCIA_PROVValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetREFERENCIA_PROVValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA_PROV] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteREFERENCIA_PROV] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetDESCRIPCIONValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetDESCRIPCIONValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCRIPCION];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteDESCRIPCION];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloDESCRIPCION];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteDESCRIPCION];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCRIPCION] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteDESCRIPCION] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetCOMISIONABLEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetCOMISIONABLEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCOMISIONABLE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteCOMISIONABLE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldCOMISIONABLEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldCOMISIONABLEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCOMISIONABLE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteCOMISIONABLE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetCOMISIONABLEValue(const aValue: Integer);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetCOMISIONABLEValue(const aValue: Integer);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCOMISIONABLE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteCOMISIONABLE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetINVENTARIABLEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetINVENTARIABLEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloINVENTARIABLE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteINVENTARIABLE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldINVENTARIABLEValue: Integer;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldINVENTARIABLEValue: Integer;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloINVENTARIABLE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteINVENTARIABLE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetINVENTARIABLEValue(const aValue: Integer);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetINVENTARIABLEValue(const aValue: Integer);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloINVENTARIABLE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteINVENTARIABLE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetNIF_CIF_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetNIF_CIF_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_CLIENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNIF_CIF_CLIENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldNIF_CIF_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldNIF_CIF_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNIF_CIF_CLIENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteNIF_CIF_CLIENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetNIF_CIF_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetNIF_CIF_CLIENTEValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_CLIENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNIF_CIF_CLIENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetNOMBRE_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetNOMBRE_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_CLIENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_CLIENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldNOMBRE_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldNOMBRE_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNOMBRE_CLIENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteNOMBRE_CLIENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetNOMBRE_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetNOMBRE_CLIENTEValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_CLIENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_CLIENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetNOMBRE_COMERCIAL_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetNOMBRE_COMERCIAL_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldNOMBRE_COMERCIAL_CLIENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldNOMBRE_COMERCIAL_CLIENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_COMERCIAL_CLIENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetNIF_CIF_AGENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetNIF_CIF_AGENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_AGENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNIF_CIF_AGENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldNIF_CIF_AGENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldNIF_CIF_AGENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNIF_CIF_AGENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteNIF_CIF_AGENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetNIF_CIF_AGENTEValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetNIF_CIF_AGENTEValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_AGENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNIF_CIF_AGENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetNOMBRE_AGENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetNOMBRE_AGENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_AGENTE];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_AGENTE];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldNOMBRE_AGENTEValue: String;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldNOMBRE_AGENTEValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNOMBRE_AGENTE];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteNOMBRE_AGENTE];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetNOMBRE_AGENTEValue(const aValue: String);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetNOMBRE_AGENTEValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_AGENTE] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteNOMBRE_AGENTE] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_NETO_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_NETO_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_PORTE_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_PORTE_ULT_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_NETO_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_NETO_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_PORTE_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_VENT];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_VENTValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_PORTE_PRO_VENTValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_VENT];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_VENT] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_UNIDAD_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_UNIDAD_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_UNIDAD_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_NETO_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_NETO_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_NETO_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_PORTE_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_PORTE_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_PORTE_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_NETO_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_NETO_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_PORTE_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_PORTE_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_UNIDAD_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_NETO_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_NETO_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_NETO_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_PORTE_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_PORTE_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_PORTE_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_COMPRA] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_ULT_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP] := aValue;
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP];
 end;
 
-function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+function TInfMargenPorClienteBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP];
 end;
 
-procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+procedure TInfMargenPorClienteBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP] := aValue;
+end;
+
+
+{ TInfMargenPorArticuloBusinessProcessorRules }
+constructor TInfMargenPorArticuloBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TInfMargenPorArticuloBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetID_EMPRESAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloID_EMPRESA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldID_EMPRESAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloID_EMPRESA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetID_EMPRESAValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloID_EMPRESA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetID_ARTICULOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloID_ARTICULO];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldID_ARTICULOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloID_ARTICULO];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetID_ARTICULOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloID_ARTICULO] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetFAMILIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloFAMILIA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldFAMILIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloFAMILIA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetFAMILIAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloFAMILIA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetREFERENCIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloREFERENCIA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldREFERENCIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloREFERENCIA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloREFERENCIA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetREFERENCIA_PROVValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloREFERENCIA_PROV];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldREFERENCIA_PROVValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloREFERENCIA_PROV];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetREFERENCIA_PROVValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloREFERENCIA_PROV] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetDESCRIPCIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloDESCRIPCION];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloDESCRIPCION];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloDESCRIPCION] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetCOMISIONABLEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloCOMISIONABLE];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldCOMISIONABLEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloCOMISIONABLE];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetCOMISIONABLEValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloCOMISIONABLE] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetINVENTARIABLEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloINVENTARIABLE];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldINVENTARIABLEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloINVENTARIABLE];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetINVENTARIABLEValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloINVENTARIABLE] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_NETO_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_NETO_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_VENT];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_VENTValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_VENT];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_VENT] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_UNIDAD_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_NETO_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_NETO_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_NETO_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_NETO_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_PORTE_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_PORTE_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_PORTE_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_PORTE_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_NETO_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_UNIDAD_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_NETO_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_NETO_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_PORTE_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_ULT_VENT_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_ULT_VENT_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_COMPRA] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_ULT_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloIMP_MARGEN_PRO_VENT_PRO_COMP] := aValue;
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP];
+end;
+
+function TInfMargenPorArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP];
+end;
+
+procedure TInfMargenPorArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenPorArticuloPOR_MARGEN_PRO_VENT_PRO_COMP] := aValue;
 end;
 
 
 initialization
-  RegisterBusinessProcessorRules(RID_InfMargenArticuloDelta, TInfMargenArticuloBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_InfMargenPorClienteDelta, TInfMargenPorClienteBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_InfMargenPorArticuloDelta, TInfMargenPorArticuloBusinessProcessorRules);
 
 end.
diff --git a/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas
index 6694b619..fc79f438 100644
--- a/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas	
+++ b/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas	
@@ -10,14 +10,14 @@ const
   BIZ_InfMargenArticulo = 'Client.InfMargenArticulo';
 
 type
-  IBizInfMargenArticulo = interface(IInfMargenArticulo)
+  IBizInfMargenArticulo = interface(IInfMargenPorCliente)
   ['{8E265668-0B6D-4475-9965-15B3EE251B24}']
     function GetVisibleColumns: String;
     procedure SetVisibleColumns(const Value: String);
     property VisibleColumns : String read GetVisibleColumns write SetVisibleColumns;
   end;
 
-  TBizInfMargenArticulo = class(TInfMargenArticuloDataTableRules, IBizInfMargenArticulo)
+  TBizInfMargenArticulo = class(TInfMargenPorClienteDataTableRules, IBizInfMargenArticulo)
   private
     FVisibleColumns : String;
     FDateParams : TDADatasetParamArray;
diff --git a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm
index 10317ff9..d48a2677 100644
--- a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm	
+++ b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm	
@@ -87,108 +87,108 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
               'COMPRAS.IMPORTE_NETO_PRO_COMP, COALESCE(ARTICULOS.PRECIO_NETO, 0' +
               ')) AS IMP_NETO_PRO_COMP,'#10'COALESCE(MARGEN_COMPRAS.IMPORTE_PORTE_P' +
               'RO_COMP, COALESCE(ARTICULOS.PRECIO_PORTE, 0)) AS IMP_PORTE_PRO_C' +
-              'OMP,'#10#10#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - ARTICULOS.PRECIO_' +
-              'NETO AS IMP_MARGEN_ULT_VENT_COMPRA,'#10'CASE'#10'WHEN  ARTICULOS.PRECIO_' +
-              'NETO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - AR' +
-              'TICULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_' +
-              'ULT_VENT - ARTICULOS.PRECIO_NETO) * 100) / MARGEN_VENTAS.IMPORTE' +
-              '_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_COMPRA,'#10#10'MARGEN' +
-              '_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_' +
-              'COMP AS IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.' +
-              'IMPORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_N' +
-              'ETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) > 0 THEN'#10'  ' +
-              '   ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORT' +
-              'E_NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'EL' +
-              'SE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_ULT_COMP,'#10#10'MARGEN_VENTAS.IMPORTE' +
-              '_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP AS IMP_MAR' +
-              'GEN_ULT_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_PR' +
-              'O_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - ' +
-              'MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 THEN'#10'     ((MARGEN_VEN' +
-              'TAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP' +
-              ') * 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR' +
-              '_MARGEN_ULT_VENT_PRO_COMP,'#10#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VEN' +
-              'T - ARTICULOS.PRECIO_NETO AS IMP_MARGEN_PRO_VENT_COMPRA,'#10'CASE'#10'WH' +
-              'EN  ARTICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPOR' +
-              'TE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN' +
-              '_VENTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) * 100) / ' +
-              'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO' +
-              '_VENT_COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMP' +
-              'RAS.IMPORTE_NETO_ULT_COMP AS IMP_MARGEN_PRO_VENT_ULT_COMP,'#10'CASE'#10 +
-              'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MA' +
-              'RGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_' +
-              'ULT_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - ' +
-              'MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMP' +
-              'ORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_ULT_COMP,'#10#10 +
-              'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NET' +
-              'O_PRO_COMP AS IMP_MARGEN_PRO_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_CO' +
-              'MPRAS.IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMP' +
-              'ORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 T' +
-              'HEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.' +
-              'IMPORTE_NETO_PRO_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_PRO_V' +
-              'ENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_PRO_COMP'#10#10'FROM'#10#10#10'(SELECT I' +
-              'D_EMPRESA, ID_CLIENTE, ID_ARTICULO, COALESCE(SUM(IMPORTE_UNIDAD_' +
-              'ULT_VENT),0) AS IMPORTE_UNIDAD_ULT_VENT,'#10'       COALESCE(SUM(IMP' +
-              'ORTE_NETO_ULT_VENT),0) AS IMPORTE_NETO_ULT_VENT, COALESCE(SUM(IM' +
-              'PORTE_PORTE_ULT_VENT),0) AS IMPORTE_PORTE_ULT_VENT,'#10'       COALE' +
-              'SCE(SUM(IMPORTE_UNIDAD_PRO_VENT),0) AS IMPORTE_UNIDAD_PRO_VENT, ' +
-              'COALESCE(SUM(IMPORTE_NETO_PRO_VENT),0) AS IMPORTE_NETO_PRO_VENT,' +
-              #10'       COALESCE(SUM(IMPORTE_PORTE_PRO_VENT),0) AS IMPORTE_PORTE' +
-              '_PRO_VENT'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ID_CLIENTE, ID_ART' +
-              'ICULO,'#10'      IMPORTE_UNIDAD_VENTA AS IMPORTE_UNIDAD_ULT_VENT, IM' +
-              'PORTE_NETO_VENTA AS IMPORTE_NETO_ULT_VENT, IMPORTE_PORTE_VENTA A' +
-              'S IMPORTE_PORTE_ULT_VENT,'#10'      NULL AS IMPORTE_UNIDAD_PRO_VENT,' +
-              ' NULL AS IMPORTE_NETO_PRO_VENT, NULL AS IMPORTE_PORTE_PRO_VENT'#10#10 +
-              '    FROM V_INF_ULTIMA_VENTA'#10#10'    UNION ALL'#10#10'    SELECT'#10'      FAC' +
-              'TURAS_CLIENTE.ID_EMPRESA,'#10'      FACTURAS_CLIENTE.ID_CLIENTE,'#10'   ' +
-              '   FACTURAS_CLIENTE_DETALLES.ID_ARTICULO,'#10'      NULL, NULL, NULL' +
-              ','#10'      AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD) AS IMPORTE' +
-              '_UNIDAD_PRO_VENT,'#10'      AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_UN' +
-              'IDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLI' +
-              'ENTE_DETALLES.DESCUENTO / 100))) AS IMPORTE_NETO_PRO_VENT,'#10'     ' +
-              ' AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_PORTE) AS IMPORTE_PORTE_P' +
-              'RO_VENT'#10#10'    FROM FACTURAS_CLIENTE_DETALLES'#10'    LEFT OUTER JOIN ' +
-              'FACTURAS_CLIENTE'#10'    ON (FACTURAS_CLIENTE.ID = FACTURAS_CLIENTE_' +
-              'DETALLES.ID_FACTURA)'#10#10'    WHERE (FACTURAS_CLIENTE_DETALLES.ID_AR' +
-              'TICULO IS NOT NULL) AND (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO >' +
-              ' 0)'#10'      AND (FACTURAS_CLIENTE_DETALLES.CANTIDAD > 0)'#10'      AND' +
-              ' (FACTURAS_CLIENTE.FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN' +
-              ')'#10'    GROUP BY 1, 2, 3)'#10#10' GROUP BY 1, 2, 3) MARGEN_VENTAS'#10#10#10'LEFT' +
-              ' JOIN'#10#10#10'(SELECT'#10'    ID_EMPRESA, ID_ARTICULO, COALESCE(SUM(IMPORT' +
-              'E_UNIDAD_ULT_COMP),0) AS IMPORTE_UNIDAD_ULT_COMP, COALESCE(SUM(I' +
-              'MPORTE_NETO_ULT_COMP),0) AS IMPORTE_NETO_ULT_COMP,'#10'    COALESCE(' +
-              'SUM(IMPORTE_PORTE_ULT_COMP),0) AS IMPORTE_PORTE_ULT_COMP, COALES' +
-              'CE(SUM(IMPORTE_UNIDAD_PRO_COMP),0) AS IMPORTE_UNIDAD_PRO_COMP,'#10' ' +
-              '   COALESCE(SUM(IMPORTE_NETO_PRO_COMP),0) AS IMPORTE_NETO_PRO_CO' +
-              'MP, COALESCE(SUM(IMPORTE_PORTE_PRO_COMP),0) AS IMPORTE_PORTE_PRO' +
-              '_COMP'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ID_ARTICULO,'#10'      IMP' +
-              'ORTE_UNIDAD_COMPRA AS IMPORTE_UNIDAD_ULT_COMP, IMPORTE_NETO_COMP' +
-              'RA AS IMPORTE_NETO_ULT_COMP, IMPORTE_PORTE_COMPRA AS IMPORTE_POR' +
-              'TE_ULT_COMP,'#10'      NULL AS IMPORTE_UNIDAD_PRO_COMP, NULL AS IMPO' +
-              'RTE_NETO_PRO_COMP, NULL AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM V_IN' +
-              'F_ULTIMA_COMPRA'#10#10'    UNION ALL'#10#10'    SELECT'#10'      FACTURAS_PROVEE' +
-              'DOR.ID_EMPRESA,'#10'      FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO,'#10' ' +
-              '     NULL, NULL, NULL,'#10'      AVG(FACTURAS_PROVEEDOR_DETALLES.IMP' +
-              'ORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO_COMP,'#10'      AVG(FACTURAS_PROV' +
-              'EEDOR_DETALLES.IMPORTE_UNIDAD - (FACTURAS_PROVEEDOR_DETALLES.IMP' +
-              'ORTE_UNIDAD * (FACTURAS_PROVEEDOR_DETALLES.DESCUENTO / 100))) AS' +
-              ' IMPORTE_NETO_PRO_COMP,'#10'      AVG(FACTURAS_PROVEEDOR_DETALLES.IM' +
-              'PORTE_PORTE) AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM FACTURAS_PROVEE' +
-              'DOR_DETALLES'#10'    LEFT OUTER JOIN FACTURAS_PROVEEDOR'#10'    ON (FACT' +
-              'URAS_PROVEEDOR.ID = FACTURAS_PROVEEDOR_DETALLES.ID_FACTURA)'#10#10'   ' +
-              ' WHERE (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO IS NOT NULL) AND' +
-              ' (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO > 0)'#10'      AND (FACTUR' +
-              'AS_PROVEEDOR_DETALLES.CANTIDAD > 0)'#10'      /*Las compras promedio' +
-              ' deben de calcularse desde el principio de los tiempos hasta aho' +
-              'ra*/'#10'      AND (FACTURAS_PROVEEDOR.FECHA_FACTURA BETWEEN '#39'12.12.' +
-              '2000'#39' AND current_date)'#10'    GROUP BY 1, 2)'#10#10'  GROUP BY 1, 2) MAR' +
-              'GEN_COMPRAS'#10#10#10'ON (MARGEN_COMPRAS.ID_EMPRESA = MARGEN_VENTAS.ID_E' +
-              'MPRESA)'#10'AND (MARGEN_COMPRAS.ID_ARTICULO = MARGEN_VENTAS.ID_ARTIC' +
-              'ULO)'#10#10#10'LEFT JOIN ARTICULOS ON (ARTICULOS.ID = MARGEN_VENTAS.ID_A' +
-              'RTICULO)'#10'LEFT JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = MARGEN_V' +
-              'ENTAS.ID_CLIENTE)'#10'LEFT JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID' +
-              '_CLIENTE = CLIENTES.ID)'#10'LEFT JOIN CONTACTOS AGENTES ON (AGENTES.' +
-              'ID = CLIENTES_DATOS.ID_AGENTE)'#10'WHERE ARTICULOS.INVENTARIABLE = 1' +
-              ') INF_MARGEN_ARTICULOS'
+              'OMP,'#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - ARTICULOS.PRECIO_NE' +
+              'TO AS IMP_MARGEN_ULT_VENT_COMPRA,'#10'CASE'#10'WHEN  ARTICULOS.PRECIO_NE' +
+              'TO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - ARTI' +
+              'CULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_UL' +
+              'T_VENT - ARTICULOS.PRECIO_NETO) * 100) / MARGEN_VENTAS.IMPORTE_N' +
+              'ETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_COMPRA,'#10#10'MARGEN_V' +
+              'ENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_CO' +
+              'MP AS IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.IM' +
+              'PORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NET' +
+              'O_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) > 0 THEN'#10'    ' +
+              ' ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_' +
+              'NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'ELSE' +
+              ' 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_ULT_COMP,'#10#10'MARGEN_VENTAS.IMPORTE_N' +
+              'ETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP AS IMP_MARGE' +
+              'N_ULT_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_PRO_' +
+              'COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MA' +
+              'RGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 THEN'#10'     ((MARGEN_VENTA' +
+              'S.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) ' +
+              '* 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_M' +
+              'ARGEN_ULT_VENT_PRO_COMP,'#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT -' +
+              ' ARTICULOS.PRECIO_NETO AS IMP_MARGEN_PRO_VENT_COMPRA,'#10'CASE'#10'WHEN ' +
+              ' ARTICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_' +
+              'NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN_VE' +
+              'NTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) * 100) / MAR' +
+              'GEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VE' +
+              'NT_COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS' +
+              '.IMPORTE_NETO_ULT_COMP AS IMP_MARGEN_PRO_VENT_ULT_COMP,'#10'CASE'#10'WHE' +
+              'N  MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MARGE' +
+              'N_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT' +
+              '_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MAR' +
+              'GEN_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMPORT' +
+              'E_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_ULT_COMP,'#10#10'MAR' +
+              'GEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_P' +
+              'RO_COMP AS IMP_MARGEN_PRO_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPR' +
+              'AS.IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORT' +
+              'E_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 THEN' +
+              #10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMP' +
+              'ORTE_NETO_PRO_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT' +
+              #10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_PRO_COMP'#10#10'FROM'#10#10#10'(SELECT ID_E' +
+              'MPRESA, ID_CLIENTE, ID_ARTICULO, COALESCE(SUM(IMPORTE_UNIDAD_ULT' +
+              '_VENT),0) AS IMPORTE_UNIDAD_ULT_VENT,'#10'       COALESCE(SUM(IMPORT' +
+              'E_NETO_ULT_VENT),0) AS IMPORTE_NETO_ULT_VENT, COALESCE(SUM(IMPOR' +
+              'TE_PORTE_ULT_VENT),0) AS IMPORTE_PORTE_ULT_VENT,'#10'       COALESCE' +
+              '(SUM(IMPORTE_UNIDAD_PRO_VENT),0) AS IMPORTE_UNIDAD_PRO_VENT, COA' +
+              'LESCE(SUM(IMPORTE_NETO_PRO_VENT),0) AS IMPORTE_NETO_PRO_VENT,'#10'  ' +
+              '     COALESCE(SUM(IMPORTE_PORTE_PRO_VENT),0) AS IMPORTE_PORTE_PR' +
+              'O_VENT'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ID_CLIENTE, ID_ARTICU' +
+              'LO,'#10'      IMPORTE_UNIDAD_VENTA AS IMPORTE_UNIDAD_ULT_VENT, IMPOR' +
+              'TE_NETO_VENTA AS IMPORTE_NETO_ULT_VENT, IMPORTE_PORTE_VENTA AS I' +
+              'MPORTE_PORTE_ULT_VENT,'#10'      NULL AS IMPORTE_UNIDAD_PRO_VENT, NU' +
+              'LL AS IMPORTE_NETO_PRO_VENT, NULL AS IMPORTE_PORTE_PRO_VENT'#10#10'   ' +
+              ' FROM V_INF_ULTVEN_PORCLIENTE'#10#10'    UNION ALL'#10#10'    SELECT'#10'      F' +
+              'ACTURAS_CLIENTE.ID_EMPRESA,'#10'      FACTURAS_CLIENTE.ID_CLIENTE,'#10' ' +
+              '     FACTURAS_CLIENTE_DETALLES.ID_ARTICULO,'#10'      NULL, NULL, NU' +
+              'LL,'#10'      AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD) AS IMPOR' +
+              'TE_UNIDAD_PRO_VENT,'#10'      AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_' +
+              'UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_C' +
+              'LIENTE_DETALLES.DESCUENTO / 100))) AS IMPORTE_NETO_PRO_VENT,'#10'   ' +
+              '   AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_PORTE) AS IMPORTE_PORTE' +
+              '_PRO_VENT'#10#10'    FROM FACTURAS_CLIENTE_DETALLES'#10'    LEFT OUTER JOI' +
+              'N FACTURAS_CLIENTE'#10'    ON (FACTURAS_CLIENTE.ID = FACTURAS_CLIENT' +
+              'E_DETALLES.ID_FACTURA)'#10#10'    WHERE (FACTURAS_CLIENTE_DETALLES.ID_' +
+              'ARTICULO IS NOT NULL) AND (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO' +
+              ' > 0)'#10'      AND (FACTURAS_CLIENTE_DETALLES.CANTIDAD > 0)'#10'      A' +
+              'ND (FACTURAS_CLIENTE.FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAF' +
+              'IN)'#10'    GROUP BY 1, 2, 3)'#10#10' GROUP BY 1, 2, 3) MARGEN_VENTAS'#10#10#10'LE' +
+              'FT JOIN'#10#10#10'(SELECT'#10'    ID_EMPRESA, ID_ARTICULO, COALESCE(SUM(IMPO' +
+              'RTE_UNIDAD_ULT_COMP),0) AS IMPORTE_UNIDAD_ULT_COMP, COALESCE(SUM' +
+              '(IMPORTE_NETO_ULT_COMP),0) AS IMPORTE_NETO_ULT_COMP,'#10'    COALESC' +
+              'E(SUM(IMPORTE_PORTE_ULT_COMP),0) AS IMPORTE_PORTE_ULT_COMP, COAL' +
+              'ESCE(SUM(IMPORTE_UNIDAD_PRO_COMP),0) AS IMPORTE_UNIDAD_PRO_COMP,' +
+              #10'    COALESCE(SUM(IMPORTE_NETO_PRO_COMP),0) AS IMPORTE_NETO_PRO_' +
+              'COMP, COALESCE(SUM(IMPORTE_PORTE_PRO_COMP),0) AS IMPORTE_PORTE_P' +
+              'RO_COMP'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ID_ARTICULO,'#10'      I' +
+              'MPORTE_UNIDAD_COMPRA AS IMPORTE_UNIDAD_ULT_COMP, IMPORTE_NETO_CO' +
+              'MPRA AS IMPORTE_NETO_ULT_COMP, IMPORTE_PORTE_COMPRA AS IMPORTE_P' +
+              'ORTE_ULT_COMP,'#10'      NULL AS IMPORTE_UNIDAD_PRO_COMP, NULL AS IM' +
+              'PORTE_NETO_PRO_COMP, NULL AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM V_' +
+              'INF_ULTCOM_PORARTICULO'#10#10'    UNION ALL'#10#10'    SELECT'#10'      FACTURAS' +
+              '_PROVEEDOR.ID_EMPRESA,'#10'      FACTURAS_PROVEEDOR_DETALLES.ID_ARTI' +
+              'CULO,'#10'      NULL, NULL, NULL,'#10'      AVG(FACTURAS_PROVEEDOR_DETAL' +
+              'LES.IMPORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO_COMP,'#10'      AVG(FACTUR' +
+              'AS_PROVEEDOR_DETALLES.IMPORTE_UNIDAD - (FACTURAS_PROVEEDOR_DETAL' +
+              'LES.IMPORTE_UNIDAD * (FACTURAS_PROVEEDOR_DETALLES.DESCUENTO / 10' +
+              '0))) AS IMPORTE_NETO_PRO_COMP,'#10'      AVG(FACTURAS_PROVEEDOR_DETA' +
+              'LLES.IMPORTE_PORTE) AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM FACTURAS' +
+              '_PROVEEDOR_DETALLES'#10'    LEFT OUTER JOIN FACTURAS_PROVEEDOR'#10'    O' +
+              'N (FACTURAS_PROVEEDOR.ID = FACTURAS_PROVEEDOR_DETALLES.ID_FACTUR' +
+              'A)'#10#10'    WHERE (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO IS NOT NU' +
+              'LL) AND (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO > 0)'#10'      AND ' +
+              '(FACTURAS_PROVEEDOR_DETALLES.CANTIDAD > 0)'#10'      /*Las compras p' +
+              'romedio deben de calcularse desde el principio de los tiempos ha' +
+              'sta ahora*/'#10'      AND (FACTURAS_PROVEEDOR.FECHA_FACTURA BETWEEN ' +
+              #39'12.12.2000'#39' AND current_date)'#10'    GROUP BY 1, 2)'#10#10'  GROUP BY 1,' +
+              ' 2) MARGEN_COMPRAS'#10#10#10'ON (MARGEN_COMPRAS.ID_EMPRESA = MARGEN_VENT' +
+              'AS.ID_EMPRESA)'#10'AND (MARGEN_COMPRAS.ID_ARTICULO = MARGEN_VENTAS.I' +
+              'D_ARTICULO)'#10#10#10'LEFT JOIN ARTICULOS ON (ARTICULOS.ID = MARGEN_VENT' +
+              'AS.ID_ARTICULO)'#10'LEFT JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = M' +
+              'ARGEN_VENTAS.ID_CLIENTE)'#10'LEFT JOIN CLIENTES_DATOS ON (CLIENTES_D' +
+              'ATOS.ID_CLIENTE = CLIENTES.ID)'#10'LEFT JOIN CONTACTOS AGENTES ON (A' +
+              'GENTES.ID = CLIENTES_DATOS.ID_AGENTE)'#10'WHERE ARTICULOS.INVENTARIA' +
+              'BLE = 1) INF_MARGEN_ARTICULOS'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -356,7 +356,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
                 TableField = 'POR_MARGEN_PRO_VENT_PRO_COMP'
               end>
           end>
-        Name = 'InfMargenArticulo'
+        Name = 'InfMargenPorCliente'
         Fields = <
           item
             Name = 'ID_EMPRESA'
@@ -372,8 +372,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'ID_CLIENTE'
             DataType = datInteger
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_ID_CLIENTE'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -512,8 +511,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_UNIDAD_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -523,8 +521,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_NETO_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -534,8 +531,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_PORTE_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -545,8 +541,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_UNIDAD_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -556,8 +551,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_NETO_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -567,8 +561,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_PORTE_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -578,8 +571,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_UNIDAD_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -589,8 +581,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_NETO_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -600,8 +591,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_PORTE_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -611,8 +601,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_UNIDAD_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -622,8 +611,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_NETO_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -633,8 +621,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_PORTE_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -644,8 +631,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_UNIDAD_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -655,8 +641,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_NETO_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -666,8 +651,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_PORTE_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -677,8 +661,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -688,8 +671,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -699,8 +681,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -710,8 +691,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -721,8 +701,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -732,8 +711,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -743,8 +721,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -754,8 +731,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -765,8 +741,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -776,8 +751,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -787,8 +761,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -798,8 +771,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -827,167 +799,156 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Connection = 'IBX'
             TargetTable = 'INF_MARGEN_ARTICULOS'
             SQL = 
-              'SELECT'#10#10'    INF_MARGEN_ARTICULOS.ID_EMPRESA,'#10'/*    INF_MARGEN_AR' +
-              'TICULOS.ID_CLIENTE,*/'#10'    INF_MARGEN_ARTICULOS.ID_ARTICULO,'#10'/*'#10' ' +
-              '   INF_MARGEN_ARTICULOS.NIF_CIF_CLIENTE,'#10'    INF_MARGEN_ARTICULO' +
-              'S.NOMBRE_CLIENTE,'#10'    INF_MARGEN_ARTICULOS.NOMBRE_COMERCIAL_CLIE' +
-              'NTE,'#10'    INF_MARGEN_ARTICULOS.NIF_CIF_AGENTE,'#10'    INF_MARGEN_ART' +
-              'ICULOS.NOMBRE_AGENTE,'#10'*/'#10'    INF_MARGEN_ARTICULOS.FAMILIA,'#10'    I' +
-              'NF_MARGEN_ARTICULOS.REFERENCIA,'#10'    INF_MARGEN_ARTICULOS.REFEREN' +
-              'CIA_PROV,'#10'    INF_MARGEN_ARTICULOS.DESCRIPCION,'#10'    INF_MARGEN_A' +
-              'RTICULOS.COMISIONABLE,'#10'    INF_MARGEN_ARTICULOS.INVENTARIABLE,'#10' ' +
-              '   INF_MARGEN_ARTICULOS.IMP_UNIDAD_ULT_VENT,'#10'    INF_MARGEN_ARTI' +
-              'CULOS.IMP_NETO_ULT_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_PORTE_ULT_' +
-              'VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_PRO_VENT,'#10'    INF_MARG' +
-              'EN_ARTICULOS.IMP_NETO_PRO_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_POR' +
-              'TE_PRO_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_COMPRA,'#10'    INF' +
-              '_MARGEN_ARTICULOS.IMP_NETO_COMPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_' +
-              'PORTE_COMPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_ULT_COMP,'#10'    ' +
-              'INF_MARGEN_ARTICULOS.IMP_NETO_ULT_COMP,'#10'    INF_MARGEN_ARTICULOS' +
-              '.IMP_PORTE_ULT_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_PRO_COM' +
-              'P,'#10'    INF_MARGEN_ARTICULOS.IMP_NETO_PRO_COMP,'#10'    INF_MARGEN_AR' +
-              'TICULOS.IMP_PORTE_PRO_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_' +
-              'ULT_VENT_COMPRA,'#10'    INF_MARGEN_ARTICULOS.POR_MARGEN_ULT_VENT_CO' +
-              'MPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'   ' +
-              ' INF_MARGEN_ARTICULOS.POR_MARGEN_ULT_VENT_ULT_COMP,'#10'    INF_MARG' +
-              'EN_ARTICULOS.IMP_MARGEN_ULT_VENT_PRO_COMP,'#10'    INF_MARGEN_ARTICU' +
-              'LOS.POR_MARGEN_ULT_VENT_PRO_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_M' +
-              'ARGEN_PRO_VENT_COMPRA,'#10'    INF_MARGEN_ARTICULOS.POR_MARGEN_PRO_V' +
-              'ENT_COMPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_PRO_VENT_ULT_COM' +
-              'P,'#10'    INF_MARGEN_ARTICULOS.POR_MARGEN_PRO_VENT_ULT_COMP,'#10'    IN' +
-              'F_MARGEN_ARTICULOS.IMP_MARGEN_PRO_VENT_PRO_COMP,'#10'    INF_MARGEN_' +
-              'ARTICULOS.POR_MARGEN_PRO_VENT_PRO_COMP'#10#10'FROM'#10#10'(SELECT'#10'MARGEN_VEN' +
-              'TAS.ID_EMPRESA AS ID_EMPRESA,'#10'/*MARGEN_VENTAS.ID_CLIENTE AS ID_C' +
-              'LIENTE,*/'#10'MARGEN_VENTAS.ID_ARTICULO AS ID_ARTICULO,'#10#10'/*'#10'CLIENTES' +
-              '.NIF_CIF AS NIF_CIF_CLIENTE,'#10'CLIENTES.NOMBRE AS NOMBRE_CLIENTE,'#10 +
-              'CLIENTES_DATOS.NOMBRE_COMERCIAL AS NOMBRE_COMERCIAL_CLIENTE,'#10#10'AG' +
-              'ENTES.NIF_CIF AS NIF_CIF_AGENTE,'#10'AGENTES.NOMBRE AS NOMBRE_AGENTE' +
-              ','#10'*/'#10#10'ARTICULOS.FAMILIA AS FAMILIA,'#10'ARTICULOS.REFERENCIA AS REFE' +
-              'RENCIA,'#10'ARTICULOS.REFERENCIA_PROV AS REFERENCIA_PROV,'#10'ARTICULOS.' +
-              'DESCRIPCION AS DESCRIPCION,'#10'ARTICULOS.COMISIONABLE AS COMISIONAB' +
-              'LE,'#10'ARTICULOS.INVENTARIABLE AS INVENTARIABLE,'#10#10'COALESCE(MARGEN_V' +
-              'ENTAS.IMPORTE_UNIDAD_ULT_VENT, 0) AS IMP_UNIDAD_ULT_VENT,'#10'COALES' +
-              'CE(MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT, 0) AS IMP_NETO_ULT_VENT,' +
-              #10'COALESCE(MARGEN_VENTAS.IMPORTE_PORTE_ULT_VENT, 0) AS IMP_PORTE_' +
-              'ULT_VENT,'#10#10'COALESCE(MARGEN_VENTAS.IMPORTE_UNIDAD_PRO_VENT, 0) AS' +
-              ' IMP_UNIDAD_PRO_VENT,'#10'COALESCE(MARGEN_VENTAS.IMPORTE_NETO_PRO_VE' +
-              'NT, 0) AS IMP_NETO_PRO_VENT,'#10'COALESCE(MARGEN_VENTAS.IMPORTE_PORT' +
-              'E_PRO_VENT, 0) AS IMP_PORTE_PRO_VENT,'#10#10'COALESCE(ARTICULOS.PRECIO' +
-              '_COSTE, 0) AS IMP_UNIDAD_COMPRA,'#10'COALESCE(ARTICULOS.PRECIO_NETO,' +
-              ' 0) AS IMP_NETO_COMPRA,'#10'COALESCE(ARTICULOS.PRECIO_PORTE, 0) AS I' +
-              'MP_PORTE_COMPRA,'#10#10'COALESCE(MARGEN_COMPRAS.IMPORTE_UNIDAD_ULT_COM' +
-              'P, COALESCE(ARTICULOS.PRECIO_COSTE, 0)) AS IMP_UNIDAD_ULT_COMP,'#10 +
-              'COALESCE(MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP, COALESCE(ARTICULO' +
-              'S.PRECIO_NETO, 0)) AS IMP_NETO_ULT_COMP,'#10'COALESCE(MARGEN_COMPRAS' +
-              '.IMPORTE_PORTE_ULT_COMP, COALESCE(ARTICULOS.PRECIO_PORTE, 0)) AS' +
-              ' IMP_PORTE_ULT_COMP,'#10#10'COALESCE(MARGEN_COMPRAS.IMPORTE_UNIDAD_PRO' +
-              '_COMP, COALESCE(ARTICULOS.PRECIO_COSTE, 0)) AS IMP_UNIDAD_PRO_CO' +
-              'MP,'#10'COALESCE(MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP, COALESCE(ARTI' +
-              'CULOS.PRECIO_NETO, 0)) AS IMP_NETO_PRO_COMP,'#10'COALESCE(MARGEN_COM' +
-              'PRAS.IMPORTE_PORTE_PRO_COMP, COALESCE(ARTICULOS.PRECIO_PORTE, 0)' +
-              ') AS IMP_PORTE_PRO_COMP,'#10#10#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT' +
-              ' - ARTICULOS.PRECIO_NETO AS IMP_MARGEN_ULT_VENT_COMPRA,'#10'CASE'#10'WHE' +
-              'N  ARTICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORT' +
-              'E_NETO_ULT_VENT - ARTICULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN_' +
-              'VENTAS.IMPORTE_NETO_ULT_VENT - ARTICULOS.PRECIO_NETO) * 100) / M' +
-              'ARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_' +
-              'VENT_COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPR' +
-              'AS.IMPORTE_NETO_ULT_COMP AS IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'CASE'#10'W' +
-              'HEN  MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MAR' +
-              'GEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_U' +
-              'LT_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - M' +
-              'ARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMPO' +
-              'RTE_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_ULT_COMP,'#10#10'M' +
-              'ARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO' +
-              '_PRO_COMP AS IMP_MARGEN_ULT_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_COM' +
-              'PRAS.IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPO' +
-              'RTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 TH' +
-              'EN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.I' +
-              'MPORTE_NETO_PRO_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VE' +
-              'NT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_PRO_COMP,'#10#10#10#10'MARGEN_VENTAS.' +
-              'IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO AS IMP_MARGEN_PRO_' +
-              'VENT_COMPRA,'#10'CASE'#10'WHEN  ARTICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN ' +
-              '(MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) > ' +
-              '0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PR' +
-              'ECIO_NETO) * 100) / MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'E' +
-              'ND'#10'AS POR_MARGEN_PRO_VENT_COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PR' +
-              'O_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP AS IMP_MARGEN_PRO_' +
-              'VENT_ULT_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP =' +
-              ' 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_C' +
-              'OMPRAS.IMPORTE_NETO_ULT_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPO' +
-              'RTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100)' +
-              ' / MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_' +
-              'PRO_VENT_ULT_COMP,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN' +
-              '_COMPRAS.IMPORTE_NETO_PRO_COMP AS IMP_MARGEN_PRO_VENT_PRO_COMP,'#10 +
-              'CASE'#10'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHE' +
-              'N (MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_' +
-              'NETO_PRO_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VE' +
-              'NT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) * 100) / MARGEN_VENTA' +
-              'S.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_PRO_CO' +
-              'MP'#10#10'FROM'#10#10#10'(SELECT ID_EMPRESA,'#10'/* ID_CLIENTE, */'#10'       ID_ARTIC' +
-              'ULO, COALESCE(SUM(IMPORTE_UNIDAD_ULT_VENT),0) AS IMPORTE_UNIDAD_' +
-              'ULT_VENT,'#10'       COALESCE(SUM(IMPORTE_NETO_ULT_VENT),0) AS IMPOR' +
-              'TE_NETO_ULT_VENT, COALESCE(SUM(IMPORTE_PORTE_ULT_VENT),0) AS IMP' +
-              'ORTE_PORTE_ULT_VENT,'#10'       COALESCE(SUM(IMPORTE_UNIDAD_PRO_VENT' +
-              '),0) AS IMPORTE_UNIDAD_PRO_VENT, COALESCE(SUM(IMPORTE_NETO_PRO_V' +
-              'ENT),0) AS IMPORTE_NETO_PRO_VENT,'#10'       COALESCE(SUM(IMPORTE_PO' +
-              'RTE_PRO_VENT),0) AS IMPORTE_PORTE_PRO_VENT'#10#10' FROM'#10'   (SELECT'#10'   ' +
-              '   ID_EMPRESA,'#10'      /*ID_CLIENTE,*/'#10'      ID_ARTICULO,'#10'      IM' +
-              'PORTE_UNIDAD_VENTA AS IMPORTE_UNIDAD_ULT_VENT, IMPORTE_NETO_VENT' +
-              'A AS IMPORTE_NETO_ULT_VENT, IMPORTE_PORTE_VENTA AS IMPORTE_PORTE' +
-              '_ULT_VENT,'#10'      NULL AS IMPORTE_UNIDAD_PRO_VENT, NULL AS IMPORT' +
-              'E_NETO_PRO_VENT, NULL AS IMPORTE_PORTE_PRO_VENT'#10#10'    FROM V_INF_' +
-              'ULTIMA_VENTA'#10#10'    UNION ALL'#10#10'    SELECT'#10'      FACTURAS_CLIENTE.I' +
-              'D_EMPRESA,'#10'/*      FACTURAS_CLIENTE.ID_CLIENTE,*/'#10'      FACTURAS' +
-              '_CLIENTE_DETALLES.ID_ARTICULO,'#10'      NULL, NULL, NULL,'#10'      AVG' +
-              '(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO' +
-              '_VENT,'#10'      AVG(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FAC' +
-              'TURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALL' +
-              'ES.DESCUENTO / 100))) AS IMPORTE_NETO_PRO_VENT,'#10'      AVG(FACTUR' +
-              'AS_CLIENTE_DETALLES.IMPORTE_PORTE) AS IMPORTE_PORTE_PRO_VENT'#10#10'  ' +
-              '  FROM FACTURAS_CLIENTE_DETALLES'#10'    LEFT OUTER JOIN FACTURAS_CL' +
-              'IENTE'#10'    ON (FACTURAS_CLIENTE.ID = FACTURAS_CLIENTE_DETALLES.ID' +
-              '_FACTURA)'#10#10'    WHERE (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO IS N' +
-              'OT NULL) AND (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO > 0)'#10'      A' +
-              'ND (FACTURAS_CLIENTE_DETALLES.CANTIDAD > 0)'#10'      AND (FACTURAS_' +
-              'CLIENTE.FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN)'#10'    GROUP' +
-              ' BY 1, 2) /*, 3)*/'#10#10' GROUP BY 1, 2)/*, 3)*/ MARGEN_VENTAS'#10#10#10'LEFT' +
-              ' JOIN'#10#10#10'(SELECT'#10'    ID_EMPRESA, ID_ARTICULO, COALESCE(SUM(IMPORT' +
-              'E_UNIDAD_ULT_COMP),0) AS IMPORTE_UNIDAD_ULT_COMP, COALESCE(SUM(I' +
-              'MPORTE_NETO_ULT_COMP),0) AS IMPORTE_NETO_ULT_COMP,'#10'    COALESCE(' +
-              'SUM(IMPORTE_PORTE_ULT_COMP),0) AS IMPORTE_PORTE_ULT_COMP, COALES' +
-              'CE(SUM(IMPORTE_UNIDAD_PRO_COMP),0) AS IMPORTE_UNIDAD_PRO_COMP,'#10' ' +
-              '   COALESCE(SUM(IMPORTE_NETO_PRO_COMP),0) AS IMPORTE_NETO_PRO_CO' +
-              'MP, COALESCE(SUM(IMPORTE_PORTE_PRO_COMP),0) AS IMPORTE_PORTE_PRO' +
-              '_COMP'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ID_ARTICULO,'#10'      IMP' +
-              'ORTE_UNIDAD_COMPRA AS IMPORTE_UNIDAD_ULT_COMP, IMPORTE_NETO_COMP' +
-              'RA AS IMPORTE_NETO_ULT_COMP, IMPORTE_PORTE_COMPRA AS IMPORTE_POR' +
-              'TE_ULT_COMP,'#10'      NULL AS IMPORTE_UNIDAD_PRO_COMP, NULL AS IMPO' +
-              'RTE_NETO_PRO_COMP, NULL AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM V_IN' +
-              'F_ULTIMA_COMPRA'#10#10'    UNION ALL'#10#10'    SELECT'#10'      FACTURAS_PROVEE' +
-              'DOR.ID_EMPRESA,'#10'      FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO,'#10' ' +
-              '     NULL, NULL, NULL,'#10'      AVG(FACTURAS_PROVEEDOR_DETALLES.IMP' +
-              'ORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO_COMP,'#10'      AVG(FACTURAS_PROV' +
-              'EEDOR_DETALLES.IMPORTE_UNIDAD - (FACTURAS_PROVEEDOR_DETALLES.IMP' +
-              'ORTE_UNIDAD * (FACTURAS_PROVEEDOR_DETALLES.DESCUENTO / 100))) AS' +
-              ' IMPORTE_NETO_PRO_COMP,'#10'      AVG(FACTURAS_PROVEEDOR_DETALLES.IM' +
-              'PORTE_PORTE) AS IMPORTE_PORTE_PRO_COMP'#10#10'    FROM FACTURAS_PROVEE' +
-              'DOR_DETALLES'#10'    LEFT OUTER JOIN FACTURAS_PROVEEDOR'#10'    ON (FACT' +
-              'URAS_PROVEEDOR.ID = FACTURAS_PROVEEDOR_DETALLES.ID_FACTURA)'#10#10'   ' +
-              ' WHERE (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO IS NOT NULL) AND' +
-              ' (FACTURAS_PROVEEDOR_DETALLES.ID_ARTICULO > 0)'#10'      AND (FACTUR' +
-              'AS_PROVEEDOR_DETALLES.CANTIDAD > 0)'#10'      /*Las compras promedio' +
-              ' deben de calcularse desde el principio de los tiempos hasta aho' +
-              'ra*/'#10'/*      AND (FACTURAS_PROVEEDOR.FECHA_FACTURA BETWEEN '#39'12.1' +
-              '2.2000'#39' AND current_date)           */'#10'    GROUP BY 1, 2)'#10#10'  GRO' +
-              'UP BY 1, 2) MARGEN_COMPRAS'#10#10#10'ON (MARGEN_COMPRAS.ID_EMPRESA = MAR' +
-              'GEN_VENTAS.ID_EMPRESA)'#10'AND (MARGEN_COMPRAS.ID_ARTICULO = MARGEN_' +
-              'VENTAS.ID_ARTICULO)'#10#10#10'LEFT JOIN ARTICULOS ON (ARTICULOS.ID = MAR' +
-              'GEN_VENTAS.ID_ARTICULO)'#10'/*LEFT JOIN CONTACTOS CLIENTES ON (CLIEN' +
-              'TES.ID = MARGEN_VENTAS.ID_CLIENTE)*/'#10'/*LEFT JOIN CLIENTES_DATOS ' +
-              'ON (CLIENTES_DATOS.ID_CLIENTE = CLIENTES.ID)*/'#10'/*LEFT JOIN CONTA' +
-              'CTOS AGENTES ON (AGENTES.ID = CLIENTES_DATOS.ID_AGENTE)*/'#10'WHERE ' +
-              'ARTICULOS.INVENTARIABLE = 1) INF_MARGEN_ARTICULOS'
+              'SELECT'#10#10'    INF_MARGEN_ARTICULOS.ID_EMPRESA,'#10'    INF_MARGEN_ARTI' +
+              'CULOS.ID_ARTICULO,'#10'    INF_MARGEN_ARTICULOS.FAMILIA,'#10'    INF_MAR' +
+              'GEN_ARTICULOS.REFERENCIA,'#10'    INF_MARGEN_ARTICULOS.REFERENCIA_PR' +
+              'OV,'#10'    INF_MARGEN_ARTICULOS.DESCRIPCION,'#10'    INF_MARGEN_ARTICUL' +
+              'OS.COMISIONABLE,'#10'    INF_MARGEN_ARTICULOS.INVENTARIABLE,'#10'    INF' +
+              '_MARGEN_ARTICULOS.IMP_UNIDAD_ULT_VENT,'#10'    INF_MARGEN_ARTICULOS.' +
+              'IMP_NETO_ULT_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_PORTE_ULT_VENT,'#10 +
+              '    INF_MARGEN_ARTICULOS.IMP_UNIDAD_PRO_VENT,'#10'    INF_MARGEN_ART' +
+              'ICULOS.IMP_NETO_PRO_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_PORTE_PRO' +
+              '_VENT,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_COMPRA,'#10'    INF_MARGE' +
+              'N_ARTICULOS.IMP_NETO_COMPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_PORTE_' +
+              'COMPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_ULT_COMP,'#10'    INF_MA' +
+              'RGEN_ARTICULOS.IMP_NETO_ULT_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_P' +
+              'ORTE_ULT_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_UNIDAD_PRO_COMP,'#10'   ' +
+              ' INF_MARGEN_ARTICULOS.IMP_NETO_PRO_COMP,'#10'    INF_MARGEN_ARTICULO' +
+              'S.IMP_PORTE_PRO_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_ULT_VE' +
+              'NT_COMPRA,'#10'    INF_MARGEN_ARTICULOS.POR_MARGEN_ULT_VENT_COMPRA,'#10 +
+              '    INF_MARGEN_ARTICULOS.IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'    INF_M' +
+              'ARGEN_ARTICULOS.POR_MARGEN_ULT_VENT_ULT_COMP,'#10'    INF_MARGEN_ART' +
+              'ICULOS.IMP_MARGEN_ULT_VENT_PRO_COMP,'#10'    INF_MARGEN_ARTICULOS.PO' +
+              'R_MARGEN_ULT_VENT_PRO_COMP,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_' +
+              'PRO_VENT_COMPRA,'#10'    INF_MARGEN_ARTICULOS.POR_MARGEN_PRO_VENT_CO' +
+              'MPRA,'#10'    INF_MARGEN_ARTICULOS.IMP_MARGEN_PRO_VENT_ULT_COMP,'#10'   ' +
+              ' INF_MARGEN_ARTICULOS.POR_MARGEN_PRO_VENT_ULT_COMP,'#10'    INF_MARG' +
+              'EN_ARTICULOS.IMP_MARGEN_PRO_VENT_PRO_COMP,'#10'    INF_MARGEN_ARTICU' +
+              'LOS.POR_MARGEN_PRO_VENT_PRO_COMP'#10#10'FROM'#10#10'(SELECT'#10'MARGEN_VENTAS.ID' +
+              '_EMPRESA AS ID_EMPRESA,'#10'MARGEN_VENTAS.ID_ARTICULO AS ID_ARTICULO' +
+              ','#10'ARTICULOS.FAMILIA AS FAMILIA,'#10'ARTICULOS.REFERENCIA AS REFERENC' +
+              'IA,'#10'ARTICULOS.REFERENCIA_PROV AS REFERENCIA_PROV,'#10'ARTICULOS.DESC' +
+              'RIPCION AS DESCRIPCION,'#10'ARTICULOS.COMISIONABLE AS COMISIONABLE,'#10 +
+              'ARTICULOS.INVENTARIABLE AS INVENTARIABLE,'#10#10'COALESCE(MARGEN_VENTA' +
+              'S.IMPORTE_UNIDAD_ULT_VENT, 0) AS IMP_UNIDAD_ULT_VENT,'#10'COALESCE(M' +
+              'ARGEN_VENTAS.IMPORTE_NETO_ULT_VENT, 0) AS IMP_NETO_ULT_VENT,'#10'COA' +
+              'LESCE(MARGEN_VENTAS.IMPORTE_PORTE_ULT_VENT, 0) AS IMP_PORTE_ULT_' +
+              'VENT,'#10#10'COALESCE(MARGEN_VENTAS.IMPORTE_UNIDAD_PRO_VENT, 0) AS IMP' +
+              '_UNIDAD_PRO_VENT,'#10'COALESCE(MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT, ' +
+              '0) AS IMP_NETO_PRO_VENT,'#10'COALESCE(MARGEN_VENTAS.IMPORTE_PORTE_PR' +
+              'O_VENT, 0) AS IMP_PORTE_PRO_VENT,'#10#10'COALESCE(ARTICULOS.PRECIO_COS' +
+              'TE, 0) AS IMP_UNIDAD_COMPRA,'#10'COALESCE(ARTICULOS.PRECIO_NETO, 0) ' +
+              'AS IMP_NETO_COMPRA,'#10'COALESCE(ARTICULOS.PRECIO_PORTE, 0) AS IMP_P' +
+              'ORTE_COMPRA,'#10#10'COALESCE(MARGEN_COMPRAS.IMPORTE_UNIDAD_ULT_COMP, C' +
+              'OALESCE(ARTICULOS.PRECIO_COSTE, 0)) AS IMP_UNIDAD_ULT_COMP,'#10'COAL' +
+              'ESCE(MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP, COALESCE(ARTICULOS.PR' +
+              'ECIO_NETO, 0)) AS IMP_NETO_ULT_COMP,'#10'COALESCE(MARGEN_COMPRAS.IMP' +
+              'ORTE_PORTE_ULT_COMP, COALESCE(ARTICULOS.PRECIO_PORTE, 0)) AS IMP' +
+              '_PORTE_ULT_COMP,'#10#10'COALESCE(MARGEN_COMPRAS.IMPORTE_UNIDAD_PRO_COM' +
+              'P, COALESCE(ARTICULOS.PRECIO_COSTE, 0)) AS IMP_UNIDAD_PRO_COMP,'#10 +
+              'COALESCE(MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP, COALESCE(ARTICULO' +
+              'S.PRECIO_NETO, 0)) AS IMP_NETO_PRO_COMP,'#10'COALESCE(MARGEN_COMPRAS' +
+              '.IMPORTE_PORTE_PRO_COMP, COALESCE(ARTICULOS.PRECIO_PORTE, 0)) AS' +
+              ' IMP_PORTE_PRO_COMP,'#10#10#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - AR' +
+              'TICULOS.PRECIO_NETO AS IMP_MARGEN_ULT_VENT_COMPRA,'#10'CASE'#10'WHEN  AR' +
+              'TICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NET' +
+              'O_ULT_VENT - ARTICULOS.PRECIO_NETO) > 0 THEN'#10'     ((MARGEN_VENTA' +
+              'S.IMPORTE_NETO_ULT_VENT - ARTICULOS.PRECIO_NETO) * 100) / MARGEN' +
+              '_VENTAS.IMPORTE_NETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_' +
+              'COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IM' +
+              'PORTE_NETO_ULT_COMP AS IMP_MARGEN_ULT_VENT_ULT_COMP,'#10'CASE'#10'WHEN  ' +
+              'MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP = 0 THEN 100'#10'WHEN (MARGEN_V' +
+              'ENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_CO' +
+              'MP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN' +
+              '_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100) / MARGEN_VENTAS.IMPORTE_N' +
+              'ETO_ULT_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_ULT_COMP,'#10#10'MARGEN' +
+              '_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_' +
+              'COMP AS IMP_MARGEN_ULT_VENT_PRO_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.' +
+              'IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_N' +
+              'ETO_ULT_VENT - MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) > 0 THEN'#10'  ' +
+              '   ((MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT - MARGEN_COMPRAS.IMPORT' +
+              'E_NETO_PRO_COMP) * 100) / MARGEN_VENTAS.IMPORTE_NETO_ULT_VENT'#10'EL' +
+              'SE 0'#10'END'#10'AS POR_MARGEN_ULT_VENT_PRO_COMP,'#10#10#10'MARGEN_VENTAS.IMPORT' +
+              'E_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO AS IMP_MARGEN_PRO_VENT_C' +
+              'OMPRA,'#10'CASE'#10'WHEN  ARTICULOS.PRECIO_NETO = 0 THEN 100'#10'WHEN (MARGE' +
+              'N_VENTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_NETO) > 0 THEN' +
+              #10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - ARTICULOS.PRECIO_N' +
+              'ETO) * 100) / MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS ' +
+              'POR_MARGEN_PRO_VENT_COMPRA,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT' +
+              ' - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP AS IMP_MARGEN_PRO_VENT_U' +
+              'LT_COMP,'#10'CASE'#10'WHEN  MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP = 0 THE' +
+              'N 100'#10'WHEN (MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS' +
+              '.IMPORTE_NETO_ULT_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NE' +
+              'TO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_ULT_COMP) * 100) / MAR' +
+              'GEN_VENTAS.IMPORTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VE' +
+              'NT_ULT_COMP,'#10#10'MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPR' +
+              'AS.IMPORTE_NETO_PRO_COMP AS IMP_MARGEN_PRO_VENT_PRO_COMP,'#10'CASE'#10'W' +
+              'HEN  MARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP = 0 THEN 100'#10'WHEN (MAR' +
+              'GEN_VENTAS.IMPORTE_NETO_PRO_VENT - MARGEN_COMPRAS.IMPORTE_NETO_P' +
+              'RO_COMP) > 0 THEN'#10'     ((MARGEN_VENTAS.IMPORTE_NETO_PRO_VENT - M' +
+              'ARGEN_COMPRAS.IMPORTE_NETO_PRO_COMP) * 100) / MARGEN_VENTAS.IMPO' +
+              'RTE_NETO_PRO_VENT'#10'ELSE 0'#10'END'#10'AS POR_MARGEN_PRO_VENT_PRO_COMP'#10#10'FR' +
+              'OM'#10#10#10'(SELECT ID_EMPRESA,'#10'       ID_ARTICULO, COALESCE(SUM(IMPORT' +
+              'E_UNIDAD_ULT_VENT),0) AS IMPORTE_UNIDAD_ULT_VENT,'#10'       COALESC' +
+              'E(SUM(IMPORTE_NETO_ULT_VENT),0) AS IMPORTE_NETO_ULT_VENT, COALES' +
+              'CE(SUM(IMPORTE_PORTE_ULT_VENT),0) AS IMPORTE_PORTE_ULT_VENT,'#10'   ' +
+              '    COALESCE(SUM(IMPORTE_UNIDAD_PRO_VENT),0) AS IMPORTE_UNIDAD_P' +
+              'RO_VENT, COALESCE(SUM(IMPORTE_NETO_PRO_VENT),0) AS IMPORTE_NETO_' +
+              'PRO_VENT,'#10'       COALESCE(SUM(IMPORTE_PORTE_PRO_VENT),0) AS IMPO' +
+              'RTE_PORTE_PRO_VENT'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA,'#10'      ID_' +
+              'ARTICULO,'#10'      IMPORTE_UNIDAD_VENTA AS IMPORTE_UNIDAD_ULT_VENT,' +
+              ' IMPORTE_NETO_VENTA AS IMPORTE_NETO_ULT_VENT, IMPORTE_PORTE_VENT' +
+              'A AS IMPORTE_PORTE_ULT_VENT,'#10'      NULL AS IMPORTE_UNIDAD_PRO_VE' +
+              'NT, NULL AS IMPORTE_NETO_PRO_VENT, NULL AS IMPORTE_PORTE_PRO_VEN' +
+              'T'#10#10'    FROM V_INF_ULTVEN_PORARTICULO'#10#10'    UNION ALL'#10#10'    SELECT'#10 +
+              '      FACTURAS_CLIENTE.ID_EMPRESA,'#10'      FACTURAS_CLIENTE_DETALL' +
+              'ES.ID_ARTICULO,'#10'      NULL, NULL, NULL,'#10'      AVG(FACTURAS_CLIEN' +
+              'TE_DETALLES.IMPORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO_VENT,'#10'      AV' +
+              'G(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_D' +
+              'ETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO / ' +
+              '100))) AS IMPORTE_NETO_PRO_VENT,'#10'      AVG(FACTURAS_CLIENTE_DETA' +
+              'LLES.IMPORTE_PORTE) AS IMPORTE_PORTE_PRO_VENT'#10#10'    FROM FACTURAS' +
+              '_CLIENTE_DETALLES'#10'    LEFT OUTER JOIN FACTURAS_CLIENTE'#10'    ON (F' +
+              'ACTURAS_CLIENTE.ID = FACTURAS_CLIENTE_DETALLES.ID_FACTURA)'#10#10'    ' +
+              'WHERE (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO IS NOT NULL) AND (F' +
+              'ACTURAS_CLIENTE_DETALLES.ID_ARTICULO > 0)'#10'      AND (FACTURAS_CL' +
+              'IENTE_DETALLES.CANTIDAD > 0)'#10'      AND (FACTURAS_CLIENTE.FECHA_F' +
+              'ACTURA BETWEEN :FECHAINI AND :FECHAFIN)'#10'    GROUP BY 1, 2)'#10#10' GRO' +
+              'UP BY 1, 2) MARGEN_VENTAS'#10#10#10'LEFT JOIN'#10#10#10'(SELECT'#10'    ID_EMPRESA, ' +
+              'ID_ARTICULO, COALESCE(SUM(IMPORTE_UNIDAD_ULT_COMP),0) AS IMPORTE' +
+              '_UNIDAD_ULT_COMP, COALESCE(SUM(IMPORTE_NETO_ULT_COMP),0) AS IMPO' +
+              'RTE_NETO_ULT_COMP,'#10'    COALESCE(SUM(IMPORTE_PORTE_ULT_COMP),0) A' +
+              'S IMPORTE_PORTE_ULT_COMP, COALESCE(SUM(IMPORTE_UNIDAD_PRO_COMP),' +
+              'COALESCE(SUM(IMPORTE_UNIDAD_ULT_COMP),0)) AS IMPORTE_UNIDAD_PRO_' +
+              'COMP,'#10'    COALESCE(SUM(IMPORTE_NETO_PRO_COMP),COALESCE(SUM(IMPOR' +
+              'TE_NETO_ULT_COMP),0)) AS IMPORTE_NETO_PRO_COMP,'#10'    COALESCE(SUM' +
+              '(IMPORTE_PORTE_PRO_COMP),COALESCE(SUM(IMPORTE_PORTE_ULT_COMP),0)' +
+              ') AS IMPORTE_PORTE_PRO_COMP'#10#10' FROM'#10'   (SELECT'#10'      ID_EMPRESA, ' +
+              'ID_ARTICULO,'#10'      IMPORTE_UNIDAD_COMPRA AS IMPORTE_UNIDAD_ULT_C' +
+              'OMP, IMPORTE_NETO_COMPRA AS IMPORTE_NETO_ULT_COMP, IMPORTE_PORTE' +
+              '_COMPRA AS IMPORTE_PORTE_ULT_COMP,'#10'      NULL AS IMPORTE_UNIDAD_' +
+              'PRO_COMP, NULL AS IMPORTE_NETO_PRO_COMP, NULL AS IMPORTE_PORTE_P' +
+              'RO_COMP'#10#10'    FROM V_INF_ULTCOM_PORARTICULO'#10#10'    UNION ALL'#10#10'    S' +
+              'ELECT'#10'      FACTURAS_PROVEEDOR.ID_EMPRESA,'#10'      FACTURAS_PROVEE' +
+              'DOR_DETALLES.ID_ARTICULO,'#10'      NULL, NULL, NULL,'#10'      AVG(FACT' +
+              'URAS_PROVEEDOR_DETALLES.IMPORTE_UNIDAD) AS IMPORTE_UNIDAD_PRO_CO' +
+              'MP,'#10'      AVG(FACTURAS_PROVEEDOR_DETALLES.IMPORTE_UNIDAD - (FACT' +
+              'URAS_PROVEEDOR_DETALLES.IMPORTE_UNIDAD * (FACTURAS_PROVEEDOR_DET' +
+              'ALLES.DESCUENTO / 100))) AS IMPORTE_NETO_PRO_COMP,'#10'      AVG(FAC' +
+              'TURAS_PROVEEDOR_DETALLES.IMPORTE_PORTE) AS IMPORTE_PORTE_PRO_COM' +
+              'P'#10#10'    FROM FACTURAS_PROVEEDOR_DETALLES'#10'    LEFT OUTER JOIN FACT' +
+              'URAS_PROVEEDOR'#10'    ON (FACTURAS_PROVEEDOR.ID = FACTURAS_PROVEEDO' +
+              'R_DETALLES.ID_FACTURA)'#10#10'    WHERE (FACTURAS_PROVEEDOR_DETALLES.I' +
+              'D_ARTICULO IS NOT NULL) AND (FACTURAS_PROVEEDOR_DETALLES.ID_ARTI' +
+              'CULO > 0)'#10'      AND (FACTURAS_PROVEEDOR_DETALLES.CANTIDAD > 0)'#10' ' +
+              '     /*Las compras promedio deben de calcularse desde el princip' +
+              'io de los tiempos hasta ahora*/'#10'      AND (FACTURAS_PROVEEDOR.FE' +
+              'CHA_FACTURA BETWEEN '#39'12.12.2000'#39' AND current_date)'#10'    GROUP BY ' +
+              '1, 2)'#10#10'  GROUP BY 1, 2) MARGEN_COMPRAS'#10#10#10'ON (MARGEN_COMPRAS.ID_E' +
+              'MPRESA = MARGEN_VENTAS.ID_EMPRESA)'#10'AND (MARGEN_COMPRAS.ID_ARTICU' +
+              'LO = MARGEN_VENTAS.ID_ARTICULO)'#10#10#10'LEFT JOIN ARTICULOS ON (ARTICU' +
+              'LOS.ID = MARGEN_VENTAS.ID_ARTICULO)'#10'WHERE ARTICULOS.INVENTARIABL' +
+              'E = 1) INF_MARGEN_ARTICULOS'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1131,7 +1092,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
                 TableField = 'POR_MARGEN_PRO_VENT_PRO_COMP'
               end>
           end>
-        Name = 'InfMargenArticulo2'
+        Name = 'InfMargenPorArticulo'
         Fields = <
           item
             Name = 'ID_EMPRESA'
@@ -1221,8 +1182,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_UNIDAD_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1232,8 +1192,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_NETO_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1243,8 +1202,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_ULT_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_PORTE_ULT_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1254,8 +1212,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_UNIDAD_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1265,8 +1222,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_NETO_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1276,8 +1232,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_PRO_VENT'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_PORTE_PRO_VENT'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1287,8 +1242,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_UNIDAD_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1298,8 +1252,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_NETO_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1309,8 +1262,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_PORTE_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1320,8 +1272,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_UNIDAD_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1331,8 +1282,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_NETO_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1342,8 +1292,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_PORTE_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1353,8 +1302,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_UNIDAD_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_UNIDAD_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1364,8 +1312,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_NETO_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_NETO_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1375,8 +1322,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_PORTE_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_PORTE_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1386,8 +1332,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1397,8 +1342,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1408,8 +1352,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1419,8 +1362,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1430,8 +1372,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_ULT_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1441,8 +1382,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_ULT_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1452,8 +1392,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1463,8 +1402,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_COMPRA'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_COMPRA'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1474,8 +1412,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1485,8 +1422,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_ULT_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_ULT_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1496,8 +1432,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'IMP_MARGEN_PRO_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1507,8 +1442,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
             Name = 'POR_MARGEN_PRO_VENT_PRO_COMP'
             DataType = datFloat
             BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
+            DictionaryEntry = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_PRO_COMP'
             InPrimaryKey = False
             Calculated = False
             Lookup = False
@@ -1529,53 +1463,12 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
   end
   object DataDictionary: TDADataDictionary
     Fields = <
-      item
-        Name = 'InfVentasArticulo_ID_FACTURA'
-        DataType = datInteger
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Id factura'
-        Alignment = taLeftJustify
-      end
       item
         Name = 'InfVentasArticulo_ID_EMPRESA'
         DataType = datInteger
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Id empresa'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_REFERENCIA_FACTURA'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Ref. factura'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_FECHA_FACTURA'
-        DataType = datDateTime
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Fecha factura'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_IMPORTE_TOTAL_FACTURA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Importe factura'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfVentasArticulo_ID_COMISION_FACTURA'
-        DataType = datInteger
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Id comision factura'
+        DisplayLabel = 'ID_EMPRESA'
         Alignment = taLeftJustify
       end
       item
@@ -1583,7 +1476,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         DataType = datInteger
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Id art'#237'culo'
+        DisplayLabel = 'ID_ARTICULO'
         Alignment = taLeftJustify
       end
       item
@@ -1592,7 +1485,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Familia'
+        DisplayLabel = 'FAMILIA'
         Alignment = taLeftJustify
       end
       item
@@ -1601,7 +1494,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Referencia'
+        DisplayLabel = 'REFERENCIA'
         Alignment = taLeftJustify
       end
       item
@@ -1610,7 +1503,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Ref. proveedor'
+        DisplayLabel = 'REFERENCIA_PROV'
         Alignment = taLeftJustify
       end
       item
@@ -1619,7 +1512,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Descripci'#243'n'
+        DisplayLabel = 'DESCRIPCION'
         Alignment = taLeftJustify
       end
       item
@@ -1627,7 +1520,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         DataType = datInteger
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Comisionable'
+        DisplayLabel = 'COMISIONABLE'
         Alignment = taLeftJustify
       end
       item
@@ -1635,116 +1528,231 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         DataType = datInteger
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Inventariable'
+        DisplayLabel = 'INVENTARIABLE'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_PRECIO_COSTE'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio coste'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfVentasArticulo_DESCUENTO_PROVEEDOR'
+        Name = 'InfMargenPorArticulo_IMP_UNIDAD_ULT_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Descuento prov.'
+        DisplayLabel = 'IMP_UNIDAD_ULT_VENT'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_PRECIO_NETO'
-        DataType = datCurrency
+        Name = 'InfMargenPorArticulo_IMP_NETO_ULT_VENT'
+        DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Precio neto'
-        Alignment = taRightJustify
+        DisplayLabel = 'IMP_NETO_ULT_VENT'
+        Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_PRECIO_PORTE'
-        DataType = datCurrency
+        Name = 'InfMargenPorArticulo_IMP_PORTE_ULT_VENT'
+        DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Precio porte'
-        Alignment = taRightJustify
+        DisplayLabel = 'IMP_PORTE_ULT_VENT'
+        Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_CANTIDAD'
+        Name = 'InfMargenPorArticulo_IMP_UNIDAD_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_PRO_VENT'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_NETO_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_PRO_VENT'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_PORTE_PRO_VENT'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_PRO_VENT'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_UNIDAD_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_NETO_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_PORTE_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_UNIDAD_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_NETO_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_PORTE_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_UNIDAD_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_NETO_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_PORTE_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_IMP_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorArticulo_POR_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_ID_CLIENTE'
         DataType = datInteger
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Cantidad'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_IMPORTE_UNIDAD'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Importe unidad'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfVentasArticulo_DESCUENTO_CLIENTE'
-        DataType = datFloat
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Descuento cli.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_IMPORTE_TOTAL'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Importe total'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfVentasArticulo_NIF_CIF_PROVEEDOR'
-        DataType = datString
-        Size = 15
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'NIF/CIF prov.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_NOMBRE_PROVEEDOR'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Proveedor'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_CALLE_PROVEEDOR'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Calle prov.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_POBLACION_PROVEEDOR'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Poblaci'#243'n prov.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_PROVINCIA_PROVEEDOR'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Provincia prov.'
+        DisplayLabel = 'ID_CLIENTE'
         Alignment = taLeftJustify
       end
       item
@@ -1753,7 +1761,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 15
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'NIF/CIF cli.'
+        DisplayLabel = 'NIF_CIF_CLIENTE'
         Alignment = taLeftJustify
       end
       item
@@ -1762,7 +1770,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Cliente'
+        DisplayLabel = 'NOMBRE_CLIENTE'
         Alignment = taLeftJustify
       end
       item
@@ -1771,34 +1779,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Nombre comercial'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_CALLE_CLIENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Calle cli.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_POBLACION_CLIENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Poblaci'#243'n cli.'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_PROVINCIA_CLIENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Provincia cli.'
+        DisplayLabel = 'NOMBRE_COMERCIAL_CLIENTE'
         Alignment = taLeftJustify
       end
       item
@@ -1807,7 +1788,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 15
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'NIF/CIF agente'
+        DisplayLabel = 'NIF_CIF_AGENTE'
         Alignment = taLeftJustify
       end
       item
@@ -1816,179 +1797,224 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo
         Size = 255
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Agente'
+        DisplayLabel = 'NOMBRE_AGENTE'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_CALLE_AGENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Calle agente'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_POBLACION_AGENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Poblaci'#243'n agente'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_PROVINCIA_AGENTE'
-        DataType = datString
-        Size = 255
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Provincia agente'
-        Alignment = taLeftJustify
-      end
-      item
-        Name = 'InfVentasArticulo_COMISION_AGENTE'
+        Name = 'InfMargenPorCliente_IMP_UNIDAD_ULT_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'Comisi'#243'n'
+        DisplayLabel = 'IMP_UNIDAD_ULT_VENT'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_IMPORTE_COMISION_AGENTE'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Importe comisi'#243'n'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfVentasArticulo_IMPORTE_NETO_VENTA'
+        Name = 'InfMargenPorCliente_IMP_NETO_ULT_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'IMPORTE_NETO_VENTA'
+        DisplayLabel = 'IMP_NETO_ULT_VENT'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_IMPORTE_PORTE_VENTA'
+        Name = 'InfMargenPorCliente_IMP_PORTE_ULT_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'IMPORTE_PORTE_VENTA'
+        DisplayLabel = 'IMP_PORTE_ULT_VENT'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfVentasArticulo_IMPORTE_TOTAL_VENTA'
+        Name = 'InfMargenPorCliente_IMP_UNIDAD_PRO_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'IMPORTE_TOTAL_VENTA'
+        DisplayLabel = 'IMP_UNIDAD_PRO_VENT'
         Alignment = taLeftJustify
       end
       item
-        Name = 'InfMargenArticulo_IMPORTE_UNIDAD_ULTIMA_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio coste '#250'ltima compra'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_NETO_ULTIMA_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio neto ultima compra'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_PORTE_ULTIMA_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio porte '#250'ltima compra'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_UNIDAD_PROMEDIO_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio coste promedio'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_NETO_PROMEDIO_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio neto promedio'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_PORTE_PROMEDIO_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Precio porte promedio'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_NETO_VENTA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Importe neto venta'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_IMPORTE_MARGEN_COSTE'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Margen coste'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_PORCENTAJE_MARGEN_COSTE'
+        Name = 'InfMargenPorCliente_IMP_NETO_PRO_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = '% margen coste'
-        Alignment = taRightJustify
+        DisplayLabel = 'IMP_NETO_PRO_VENT'
+        Alignment = taLeftJustify
       end
       item
-        Name = 'InfMargenArticulo_IMPORTE_MARGEN_ULT_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Margen '#250'ltima compra'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_PORCENTAJE_MARGEN_ULT_COMPRA'
+        Name = 'InfMargenPorCliente_IMP_PORTE_PRO_VENT'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = '% '#250'ltima compra'
-        Alignment = taRightJustify
+        DisplayLabel = 'IMP_PORTE_PRO_VENT'
+        Alignment = taLeftJustify
       end
       item
-        Name = 'InfMargenArticulo_IMPORTE_MARGEN_PROM_COMPRA'
-        DataType = datCurrency
-        BlobType = dabtUnknown
-        DisplayWidth = 0
-        DisplayLabel = 'Margen promedio'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'InfMargenArticulo_PORCENTAJE_MARGEN_PROM_COMPRA'
+        Name = 'InfMargenPorCliente_IMP_UNIDAD_COMPRA'
         DataType = datFloat
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = '% margen promedio'
-        Alignment = taRightJustify
+        DisplayLabel = 'IMP_UNIDAD_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_NETO_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_PORTE_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_UNIDAD_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_NETO_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_PORTE_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_UNIDAD_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_UNIDAD_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_NETO_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_NETO_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_PORTE_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_PORTE_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_ULT_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_ULT_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_ULT_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_COMPRA'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_COMPRA'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_ULT_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_ULT_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_IMP_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'IMP_MARGEN_PRO_VENT_PRO_COMP'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'InfMargenPorCliente_POR_MARGEN_PRO_VENT_PRO_COMP'
+        DataType = datFloat
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'POR_MARGEN_PRO_VENT_PRO_COMP'
+        Alignment = taLeftJustify
       end>
     Left = 54
     Top = 158
diff --git a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.bdsproj b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.bdsproj
index f016b2e4..a7d2b8ba 100644
--- a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.bdsproj	
+++ b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.bdsproj	
@@ -170,7 +170,8 @@
 			<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-		</VersionInfoKeys>  <Excluded_Packages>
+		</VersionInfoKeys>  
+    <Excluded_Packages>
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages>
   </Delphi.Personality>
diff --git a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.res b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.res and b/Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.res differ
diff --git a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm
index 271b1fbd..84a446ba 100644
--- a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm	
+++ b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm	
@@ -7,7 +7,7 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo
   OnCreate = CustomEditorCreate
   OnGetModified = CustomEditorGetModified
   ExplicitWidth = 687
-  ExplicitHeight = 607
+  ExplicitHeight = 600
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -200,27 +200,27 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo
       inherited pnlParametros: TTBXDockablePanel
         ExplicitHeight = 158
         inherited pcParametros: TPageControl
-          Height = 69
-          ExplicitHeight = 69
+          Height = 71
+          ExplicitHeight = 71
           inherited TabSheet5: TTabSheet
-            ExplicitHeight = 29
+            ExplicitHeight = 31
           end
           inherited tsColumnas: TTabSheet
-            ExplicitHeight = 59
+            ExplicitHeight = 61
             inherited frViewColumnas1: TfrViewColumnas
-              Height = 59
-              ExplicitHeight = 59
+              Height = 61
+              ExplicitHeight = 61
               inherited lbColumnas: TcxCheckListBox
-                Height = 30
-                ExplicitHeight = 30
+                Height = 32
+                ExplicitHeight = 32
               end
             end
           end
           inherited tsAgrupacion: TTabSheet
-            ExplicitHeight = 29
+            ExplicitHeight = 31
             inherited frViewAgrupaciones1: TfrViewAgrupaciones
-              Height = 29
-              ExplicitHeight = 29
+              Height = 31
+              ExplicitHeight = 31
             end
           end
         end
@@ -231,34 +231,34 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo
         ExplicitTop = 158
         ExplicitHeight = 173
         inherited TBXPageScroller1: TTBXPageScroller
-          Height = 151
-          ExplicitHeight = 151
+          Height = 153
+          ExplicitHeight = 153
           inherited pcTareas: TPageControl
-            Height = 103
-            ExplicitHeight = 103
+            Height = 105
+            ExplicitHeight = 105
             inherited tsSumarios: TTabSheet
-              ExplicitHeight = 48
+              ExplicitHeight = 50
               inherited frViewSumarios1: TfrViewSumarios
-                Height = 48
-                ExplicitHeight = 48
+                Height = 50
+                ExplicitHeight = 50
                 inherited vgSumarios: TcxVerticalGrid
-                  Height = 19
-                  ExplicitHeight = 19
+                  Height = 21
+                  ExplicitHeight = 21
                 end
               end
             end
             inherited tsFiltros: TTabSheet
-              ExplicitHeight = 93
+              ExplicitHeight = 95
               inherited frViewFiltros1: TfrViewFiltros
-                Height = 93
-                ExplicitHeight = 93
+                Height = 95
+                ExplicitHeight = 95
                 inherited cxFilterControl1: TcxFilterControl
-                  Height = 34
-                  ExplicitHeight = 34
+                  Height = 36
+                  ExplicitHeight = 36
                 end
                 inherited TBXAlignmentPanel3: TTBXAlignmentPanel
-                  Top = 63
-                  ExplicitTop = 63
+                  Top = 65
+                  ExplicitTop = 65
                 end
               end
             end
diff --git a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas
index ce567edd..eaa35e1c 100644
--- a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas	
+++ b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas	
@@ -52,7 +52,7 @@ type
     procedure RellenarCabeceraInforme; override;
 
     procedure RestaurarConfiguracion; override;
-    
+
     function GetController : IInfMargenArticuloController;
     procedure SetController (const Value : IInfMargenArticuloController);
 
@@ -85,7 +85,7 @@ procedure TfEditorInfMargenArticulo.SetController(const Value: IInfMargenArticul
 begin
   FController := Value;
 //  if Assigned(FController) then
-//    (ViewArticulo as IViewArticulo).Controller := (FController as IArticulosController);
+//    (FViewInforme as IViewInfMargenArticulo).Controller := (FController as IInfMargenArticuloController);
 end;
 
 procedure TfEditorInfMargenArticulo.SetDatos(const Value: IBizInfMargenArticulo);
diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm
index 5511c977..f7632e10 100644
--- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm	
+++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm	
@@ -1,28 +1,31 @@
 inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
-  Width = 834
-  Height = 448
-  ExplicitWidth = 834
-  ExplicitHeight = 448
+  Width = 800
+  Height = 567
+  ExplicitWidth = 800
+  ExplicitHeight = 567
   inherited TBXMultiDock1: TTBXMultiDock
     Top = 105
-    Height = 343
+    Height = 462
     ExplicitTop = 105
     ExplicitHeight = 343
     inherited pnlParametros: TTBXDockablePanel
-      ExplicitHeight = 156
+      ExplicitHeight = 215
       inherited pcParametros: TPageControl
-        Height = 69
+        Height = 128
         ExplicitHeight = 69
         inherited TabSheet5: TTabSheet
-          ExplicitHeight = 57
+          ExplicitLeft = 4
+          ExplicitTop = 6
+          ExplicitWidth = 210
+          ExplicitHeight = 59
         end
         inherited tsColumnas: TTabSheet
           ExplicitHeight = 59
           inherited frViewColumnas1: TfrViewColumnas
-            Height = 59
+            Height = 118
             ExplicitHeight = 59
             inherited lbColumnas: TcxCheckListBox
-              Height = 30
+              Height = 89
               ExplicitHeight = 30
             end
           end
@@ -30,45 +33,45 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
         inherited tsAgrupacion: TTabSheet
           ExplicitHeight = 59
           inherited frViewAgrupaciones1: TfrViewAgrupaciones
-            Height = 59
+            Height = 118
             ExplicitHeight = 59
           end
         end
       end
     end
     inherited pnlTareas: TTBXDockablePanel
-      Top = 156
-      DockPos = 156
-      ExplicitTop = 156
-      ExplicitHeight = 171
+      Top = 215
+      DockPos = 215
+      ExplicitTop = 215
+      ExplicitHeight = 231
       inherited TBXPageScroller1: TTBXPageScroller
-        Height = 151
+        Height = 211
         ExplicitHeight = 151
         inherited pcTareas: TPageControl
-          Height = 103
+          Height = 163
           ExplicitHeight = 103
           inherited tsSumarios: TTabSheet
             ExplicitHeight = 93
             inherited frViewSumarios1: TfrViewSumarios
-              Height = 93
+              Height = 153
               ExplicitHeight = 93
               inherited vgSumarios: TcxVerticalGrid
-                Height = 64
-                ExplicitHeight = 62
+                Height = 124
+                ExplicitHeight = 64
               end
             end
           end
           inherited tsFiltros: TTabSheet
             ExplicitHeight = 93
             inherited frViewFiltros1: TfrViewFiltros
-              Height = 93
+              Height = 153
               ExplicitHeight = 93
               inherited cxFilterControl1: TcxFilterControl
-                Height = 34
+                Height = 94
                 ExplicitHeight = 34
               end
               inherited TBXAlignmentPanel3: TTBXAlignmentPanel
-                Top = 63
+                Top = 123
                 ExplicitTop = 63
               end
             end
@@ -78,7 +81,7 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
     end
   end
   inherited TBXMultiDock2: TTBXMultiDock
-    Width = 834
+    Width = 800
     Height = 105
     ExplicitWidth = 834
     ExplicitHeight = 105
@@ -86,18 +89,18 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
       DockedHeight = 101
       ShowCaption = False
       ShowCaptionWhenDocked = False
-      ExplicitWidth = 818
+      ExplicitWidth = 784
       ExplicitHeight = 105
       inherited TBXAlignmentPanel3: TTBXAlignmentPanel
         Top = 71
-        Width = 814
+        Width = 780
         ExplicitTop = 71
         ExplicitWidth = 814
       end
       inline frViewPeriodoFechas1: TfrViewPeriodoFechas
         Left = 0
         Top = 0
-        Width = 814
+        Width = 780
         Height = 71
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
@@ -114,12 +117,12 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
           ExplicitWidth = 814
           ExplicitHeight = 71
           inherited dxLayoutControl1: TdxLayoutControl
-            Width = 814
+            Width = 780
             Height = 71
             ExplicitWidth = 814
             ExplicitHeight = 71
             DesignSize = (
-              814
+              780
               71)
             inherited cbPeriodo: TcxComboBox
               Left = 54
@@ -141,8 +144,8 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
   inline frViewInfMargenArticuloGrid1: TfrViewInfMargenArticuloGrid [2]
     Left = 222
     Top = 105
-    Width = 612
-    Height = 343
+    Width = 578
+    Height = 462
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -157,11 +160,12 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
     ExplicitWidth = 612
     ExplicitHeight = 343
     inherited cxGrid: TcxGrid
-      Width = 612
-      Height = 343
+      Width = 578
+      Height = 462
       ExplicitWidth = 612
       ExplicitHeight = 343
       inherited cxGridView: TcxGridDBTableView
+        DataController.DataSource = dmInfMargenArticulo.ds_InfMargenArticulo21
         DataController.Summary.DefaultGroupSummaryItems = <
           item
             Format = ',0.00 %;-,0.00 %'
@@ -242,6 +246,129 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
             Format = ',0.00 %;-,0.00 %'
             Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP
           end>
+        inherited cxGridViewID_EMPRESA: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewID_CLIENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewID_ARTICULO: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewNOMBRE_AGENTE: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewFAMILIA: TcxGridDBColumn
+          Width = 54
+        end
+        inherited cxGridViewREFERENCIA: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewREFERENCIA_PROV: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewDESCRIPCION: TcxGridDBColumn
+          Width = 44
+        end
+        inherited cxGridViewCOMISIONABLE: TcxGridDBColumn
+          Width = 29
+        end
+        inherited cxGridViewINVENTARIABLE: TcxGridDBColumn
+          Width = 29
+        end
+        inherited cxGridViewIMP_UNIDAD_ULT_VENT: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewIMP_NETO_ULT_VENT: TcxGridDBColumn
+          Width = 20
+        end
+        inherited cxGridViewIMP_PORTE_ULT_VENT: TcxGridDBColumn
+          Width = 23
+        end
+        inherited cxGridViewIMP_UNIDAD_PRO_VENT: TcxGridDBColumn
+          Width = 26
+        end
+        inherited cxGridViewIMP_NETO_PRO_VENT: TcxGridDBColumn
+          Width = 26
+        end
+        inherited cxGridViewIMP_PORTE_PRO_VENT: TcxGridDBColumn
+          Width = 30
+        end
+        inherited cxGridViewIMP_UNIDAD_COMPRA: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewIMP_NETO_COMPRA: TcxGridDBColumn
+          Width = 30
+        end
+        inherited cxGridViewIMP_PORTE_COMPRA: TcxGridDBColumn
+          Width = 29
+        end
+        inherited cxGridViewIMP_UNIDAD_ULT_COMP: TcxGridDBColumn
+          Width = 31
+        end
+        inherited cxGridViewIMP_NETO_ULT_COMP: TcxGridDBColumn
+          Width = 33
+        end
+        inherited cxGridViewIMP_PORTE_ULT_COMP: TcxGridDBColumn
+          Width = 24
+        end
+        inherited cxGridViewIMP_UNIDAD_PRO_COMP: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewIMP_NETO_PRO_COMP: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewIMP_PORTE_PRO_COMP: TcxGridDBColumn
+          Width = 31
+        end
+        inherited cxGridViewIMP_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn
+          Width = 24
+        end
+        inherited cxGridViewPOR_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewIMP_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn
+          Width = 33
+        end
+        inherited cxGridViewIMP_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn
+          Width = 32
+        end
+        inherited cxGridViewPOR_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn
+          Width = 33
+        end
+        inherited cxGridViewIMP_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn
+          Width = 30
+        end
+        inherited cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn
+          Width = 33
+        end
+        inherited cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn
+          Width = 31
+        end
+        inherited cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn
+          Width = 33
+        end
       end
     end
     inherited dxPrintStyleManager1: TdxPrintStyleManager
diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas
index 81a001d5..ea597dfc 100644
--- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas	
+++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas	
@@ -13,7 +13,7 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid,
   cxTextEdit, uViewFiltros, uBizInfMargenArticulo,
   uViewPeriodoFechas, uViewInfMargenArticuloGrid, cxContainer, uViewFiltroBase,
-  uDADataTable;
+  uDADataTable, uInfMargenArticuloController;
 
 type
   IViewInfMargenArticulo = interface(IViewInformeBase)
@@ -29,6 +29,7 @@ type
     frViewPeriodoFechas1: TfrViewPeriodoFechas;
     procedure actRefrescarExecute(Sender: TObject);
     procedure actPeriodoFechasExecute(Sender: TObject);
+
   protected
     FDatos : IBizInfMargenArticulo;
     FModificado : Boolean;
@@ -66,6 +67,7 @@ begin
   pcParametros.ActivePage := TabSheet5;
 end;
 
+
 function TfrViewInfMargenArticulo.GetDatos: IBizInfMargenArticulo;
 begin
   Result := FDatos;
@@ -84,6 +86,7 @@ var
 begin
   inherited;
   ShowHourglassCursor;
+
   actRefrescar.Enabled := False;
 
   frViewInfMargenArticuloGrid1.OnViewChanged := nil;
@@ -101,11 +104,6 @@ begin
       AColumns.Add((frViewInfMargenArticuloGrid1 as IViewInformeBaseGrid).GetColumnByCaption(AColumnsGroup.Strings[i]).DataBinding.FieldName);
 
 
-   //PRUEBA
-   Datos.DataTable.Active := False;
-
-
-
    FDatos.VisibleColumns := AColumns.CommaText;
 
     with Datos.DataTable do
diff --git a/Source/Modulos/Informes base/Data/uDataModuleInformes.dfm b/Source/Modulos/Informes base/Data/uDataModuleInformes.dfm
index a693c9b6..5c0e2f24 100644
--- a/Source/Modulos/Informes base/Data/uDataModuleInformes.dfm	
+++ b/Source/Modulos/Informes base/Data/uDataModuleInformes.dfm	
@@ -66,7 +66,7 @@ object dmInformes: TdmInformes
     ProbeServers = False
     ProbeFrequency = 60000
     UserAgent = 'RemObjects SDK'
-    TargetURL = 'http://localhost:8090/bin'
+    TargetURL = 'http://localhost:8099/bin'
     Left = 48
     Top = 272
   end
@@ -201,6 +201,17 @@ object dmInformes: TdmInformes
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'TIPO_AGRUPACION'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest
diff --git a/Source/Modulos/Informes base/Model/schInformesClient_Intf.pas b/Source/Modulos/Informes base/Model/schInformesClient_Intf.pas
index eca6c20b..241383e5 100644
--- a/Source/Modulos/Informes base/Model/schInformesClient_Intf.pas	
+++ b/Source/Modulos/Informes base/Model/schInformesClient_Intf.pas	
@@ -9,7 +9,7 @@ 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_Informes = '{E7928EEC-E1CA-4117-AD71-651081CE43B0}';
+  RID_Informes = '{5395357F-3002-48E5-9BBB-814B0DCDA995}';
 
   { Data table names }
   nme_Informes = 'Informes';
@@ -25,6 +25,7 @@ const
   fld_InformesDESCRIPCION = 'DESCRIPCION';
   fld_InformesORDEN = 'ORDEN';
   fld_InformesVISTA = 'VISTA';
+  fld_InformesTIPO_AGRUPACION = 'TIPO_AGRUPACION';
 
   { Informes field indexes }
   idx_InformesID = 0;
@@ -37,11 +38,12 @@ const
   idx_InformesDESCRIPCION = 7;
   idx_InformesORDEN = 8;
   idx_InformesVISTA = 9;
+  idx_InformesTIPO_AGRUPACION = 10;
 
 type
   { IInformes }
   IInformes = interface(IDAStronglyTypedDataTable)
-  ['{FDC16F5A-3D0D-4100-BFD2-B28C537E5513}']
+  ['{0C481E09-15DC-4433-8212-CEE3CA681EBC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -63,6 +65,8 @@ type
     procedure SetORDENValue(const aValue: Integer);
     function GetVISTAValue: IROStrings;
     procedure SetVISTAValue(const aValue: IROStrings);
+    function GetTIPO_AGRUPACIONValue: Integer;
+    procedure SetTIPO_AGRUPACIONValue(const aValue: Integer);
 
 
     { Properties }
@@ -76,6 +80,7 @@ type
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property ORDEN: Integer read GetORDENValue write SetORDENValue;
     property VISTA: IROStrings read GetVISTAValue write SetVISTAValue;
+    property TIPO_AGRUPACION: Integer read GetTIPO_AGRUPACIONValue write SetTIPO_AGRUPACIONValue;
   end;
 
   { TInformesDataTableRules }
@@ -103,6 +108,8 @@ type
     procedure SetORDENValue(const aValue: Integer); virtual;
     function GetVISTAValue: IROStrings; virtual;
     procedure SetVISTAValue(const aValue: IROStrings); virtual;
+    function GetTIPO_AGRUPACIONValue: Integer; virtual;
+    procedure SetTIPO_AGRUPACIONValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -115,6 +122,7 @@ type
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property ORDEN: Integer read GetORDENValue write SetORDENValue;
     property VISTA: IROStrings read GetVISTAValue write SetVISTAValue;
+    property TIPO_AGRUPACION: Integer read GetTIPO_AGRUPACIONValue write SetTIPO_AGRUPACIONValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -238,6 +246,16 @@ begin
   DataTable.Fields[idx_InformesVISTA].AsString := aValue.Text;
 end;
 
+function TInformesDataTableRules.GetTIPO_AGRUPACIONValue: Integer;
+begin
+  result := DataTable.Fields[idx_InformesTIPO_AGRUPACION].AsInteger;
+end;
+
+procedure TInformesDataTableRules.SetTIPO_AGRUPACIONValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_InformesTIPO_AGRUPACION].AsInteger := aValue;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_Informes, TInformesDataTableRules);
diff --git a/Source/Modulos/Informes base/Model/schInformesServer_Intf.pas b/Source/Modulos/Informes base/Model/schInformesServer_Intf.pas
index c7910571..3a7b268e 100644
--- a/Source/Modulos/Informes base/Model/schInformesServer_Intf.pas	
+++ b/Source/Modulos/Informes base/Model/schInformesServer_Intf.pas	
@@ -9,12 +9,12 @@ 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_InformesDelta = '{74CF2C20-601C-4EE4-BD37-D5BC5FA42F31}';
+  RID_InformesDelta = '{5493356F-BD0D-4517-83BC-DE697B7F2093}';
 
 type
   { IInformesDelta }
   IInformesDelta = interface(IInformes)
-  ['{74CF2C20-601C-4EE4-BD37-D5BC5FA42F31}']
+  ['{5493356F-BD0D-4517-83BC-DE697B7F2093}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -26,6 +26,7 @@ type
     function GetOldDESCRIPCIONValue : String;
     function GetOldORDENValue : Integer;
     function GetOldVISTAValue : IROStrings;
+    function GetOldTIPO_AGRUPACIONValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -38,6 +39,7 @@ type
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
     property OldORDEN : Integer read GetOldORDENValue;
     property OldVISTA : IROStrings read GetOldVISTAValue;
+    property OldTIPO_AGRUPACION : Integer read GetOldTIPO_AGRUPACIONValue;
   end;
 
   { TInformesBusinessProcessorRules }
@@ -75,6 +77,9 @@ type
     function GetVISTAValue: IROStrings; virtual;
     function GetOldVISTAValue: IROStrings; virtual;
     procedure SetVISTAValue(const aValue: IROStrings); virtual;
+    function GetTIPO_AGRUPACIONValue: Integer; virtual;
+    function GetOldTIPO_AGRUPACIONValue: Integer; virtual;
+    procedure SetTIPO_AGRUPACIONValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -97,6 +102,8 @@ type
     property OldORDEN : Integer read GetOldORDENValue;
     property VISTA : IROStrings read GetVISTAValue write SetVISTAValue;
     property OldVISTA : IROStrings read GetOldVISTAValue;
+    property TIPO_AGRUPACION : Integer read GetTIPO_AGRUPACIONValue write SetTIPO_AGRUPACIONValue;
+    property OldTIPO_AGRUPACION : Integer read GetOldTIPO_AGRUPACIONValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -272,6 +279,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_InformesVISTA] := aValue.Text;
 end;
 
+function TInformesBusinessProcessorRules.GetTIPO_AGRUPACIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_InformesTIPO_AGRUPACION];
+end;
+
+function TInformesBusinessProcessorRules.GetOldTIPO_AGRUPACIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_InformesTIPO_AGRUPACION];
+end;
+
+procedure TInformesBusinessProcessorRules.SetTIPO_AGRUPACIONValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_InformesTIPO_AGRUPACION] := aValue;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_InformesDelta, TInformesBusinessProcessorRules);
diff --git a/Source/Modulos/Informes base/Servidor/srvInformes_Impl.dfm b/Source/Modulos/Informes base/Servidor/srvInformes_Impl.dfm
index c5f2bce8..51372e70 100644
--- a/Source/Modulos/Informes base/Servidor/srvInformes_Impl.dfm	
+++ b/Source/Modulos/Informes base/Servidor/srvInformes_Impl.dfm	
@@ -18,8 +18,8 @@ object srvInformes: TsrvInformes
             TargetTable = 'INFORMES'
             SQL = 
               'SELECT '#10'    ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ' +
-              'ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA'#10'  FROM'#10'    INFORMES'#10'ORD' +
-              'ER BY CATEGORIA, ID'
+              'ICONO, NOMBRE,'#10'    DESCRIPCION, ORDEN, VISTA, TIPO_AGRUPACION'#10'  ' +
+              'FROM'#10'    INFORMES'#10'ORDER BY CATEGORIA, ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -61,6 +61,10 @@ object srvInformes: TsrvInformes
               item
                 DatasetField = 'VISTA'
                 TableField = 'VISTA'
+              end
+              item
+                DatasetField = 'TIPO_AGRUPACION'
+                TableField = 'TIPO_AGRUPACION'
               end>
           end>
         Name = 'Informes'
@@ -169,6 +173,17 @@ object srvInformes: TsrvInformes
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'TIPO_AGRUPACION'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -246,7 +261,14 @@ object srvInformes: TsrvInformes
           end
           item
             Name = 'VISTA'
-            DataType = datMemo
+            DataType = datBlob
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end
+          item
+            Name = 'TIPO_AGRUPACION'
+            DataType = datInteger
             BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
@@ -257,9 +279,10 @@ object srvInformes: TsrvInformes
             TargetTable = 'INFORMES'
             SQL = 
               'INSERT'#10'  INTO INFORMES'#10'    (ID, ID_EMPRESA, CATEGORIA, CONTROLLE' +
-              'R, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA)'#10'  VALU' +
-              'ES'#10'    (:ID, :ID_EMPRESA, :CATEGORIA, :CONTROLLER, :MODIFICABLE,' +
-              ' :ICONO, :NOMBRE, :DESCRIPCION, :ORDEN,'#10'     :VISTA)'
+              'R, MODIFICABLE, ICONO, NOMBRE,'#10'    DESCRIPCION, ORDEN, VISTA, TI' +
+              'PO_AGRUPACION)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :CATEGORIA, :CONT' +
+              'ROLLER, :MODIFICABLE, :ICONO, :NOMBRE,'#10'    :DESCRIPCION, :ORDEN,' +
+              ' :VISTA, :TIPO_AGRUPACION)'
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -330,7 +353,14 @@ object srvInformes: TsrvInformes
           end
           item
             Name = 'VISTA'
-            DataType = datMemo
+            DataType = datBlob
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end
+          item
+            Name = 'TIPO_AGRUPACION'
+            DataType = datInteger
             BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
@@ -351,7 +381,8 @@ object srvInformes: TsrvInformes
               'IA = :CATEGORIA, '#10'    CONTROLLER = :CONTROLLER,'#10'    MODIFICABLE ' +
               '= :MODIFICABLE,'#10'    ICONO = :ICONO, '#10'    NOMBRE = :NOMBRE, '#10'    ' +
               'DESCRIPCION = :DESCRIPCION, '#10'    ORDEN = :ORDEN, '#10'    VISTA = :V' +
-              'ISTA'#10'  WHERE'#10'    (ID = :OLD_ID)'
+              'ISTA,'#10'    TIPO_AGRUPACION = :TIPO_AGRUPACION'#10'  WHERE'#10'    (ID = :' +
+              'OLD_ID)'
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj
index c004c5f4..c618e8ca 100644
--- a/Source/Servidor/FactuGES_Server.bdsproj
+++ b/Source/Servidor/FactuGES_Server.bdsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<PersonalityInfo>
 		<Option>
@@ -175,11 +175,12 @@
 			<VersionInfoKeys Name="ProductName">FactuGES Server</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">2.4.0.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">miércoles, 05 de marzo de 2008 17:35</VersionInfoKeys></VersionInfoKeys>
-		<Excluded_Packages>
-			<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-		</Excluded_Packages>
-	</Delphi.Personality>
+			<VersionInfoKeys Name="CompileDate">miércoles, 05 de marzo de 2008 17:35</VersionInfoKeys></VersionInfoKeys>  
+    
+    <Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+    </Excluded_Packages>
+  </Delphi.Personality>
 	<ModelSupport>False</ModelSupport>
 	<!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 7ccf2f0e..0fc87a19 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -108,8 +108,6 @@ uses
   schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
   schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
   schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
-  schInformesClient_Intf in '..\Modulos\Informes base\Model\schInformesClient_Intf.pas',
-  schInformesServer_Intf in '..\Modulos\Informes base\Model\schInformesServer_Intf.pas',
   schRemesasProveedorClient_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas',
   schRemesasProveedorServer_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas',
   schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas',
@@ -124,14 +122,16 @@ uses
   uRptEtiquetasContactos_Server in '..\Modulos\Contactos\Reports\uRptEtiquetasContactos_Server.pas' {RptEtiquetasContactos: TDataModule},
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
   schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
-  schInfMargenArticuloClient_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloClient_Intf.pas',
-  schInfMargenArticuloServer_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloServer_Intf.pas',
   schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
   schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
   schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
   schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
-  schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas';
+  schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
+  schInfMargenArticuloClient_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloClient_Intf.pas',
+  schInfMargenArticuloServer_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloServer_Intf.pas',
+  schInformesClient_Intf in '..\Modulos\Informes base\Model\schInformesClient_Intf.pas',
+  schInformesServer_Intf in '..\Modulos\Informes base\Model\schInformesServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.drc b/Source/Servidor/FactuGES_Server.drc
index 3fcf4000..2ecdbbd1 100644
--- a/Source/Servidor/FactuGES_Server.drc
+++ b/Source/Servidor/FactuGES_Server.drc
@@ -908,9 +908,9 @@
 #define IdResourceStrings_RSStatusConnecting 65181
 #define IdResourceStrings_RSStatusConnected 65182
 #define IdResourceStrings_RSStatusDisconnecting 65183
-#define uRODECConst_sFMT_XX 65184
-#define uRODECConst_sInvalidKeySize 65185
-#define uRODECConst_sNotInitialized 65186
+#define ComConst_SNoMethod 65184
+#define ComConst_SVarNotObject 65185
+#define ComConst_STooManyParams 65186
 #define IdResourceStrings_RSCannotAllocateSocket 65187
 #define IdResourceStrings_RSConnectionClosedGracefully 65188
 #define IdResourceStrings_RSCouldNotBindSocket 65189
@@ -924,70 +924,70 @@
 #define IdResourceStrings_RSNotConnected 65197
 #define IdResourceStrings_RSObjectTypeNotSupported 65198
 #define IdResourceStrings_RSTerminateThreadTimeout 65199
-#define uRORes_err_VariantIsNotArray 65200
-#define uRORes_err_InvalidVarArrayDimCount 65201
-#define uRORes_err_MessageNotAssigned 65202
-#define ComConst_SOleError 65203
-#define ComConst_SNoMethod 65204
-#define ComConst_SVarNotObject 65205
-#define ComConst_STooManyParams 65206
-#define uRODECConst_sProtectionCircular 65207
-#define uRODECConst_sStringFormatExists 65208
-#define uRODECConst_sInvalidStringFormat 65209
-#define uRODECConst_sInvalidFormatString 65210
-#define uRODECConst_sFMT_COPY 65211
-#define uRODECConst_sFMT_HEX 65212
-#define uRODECConst_sFMT_HEXL 65213
-#define uRODECConst_sFMT_MIME64 65214
-#define uRODECConst_sFMT_UU 65215
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65216
-#define uRORes_err_UnhandledException 65217
-#define uRORes_err_ChannelBusy 65218
-#define uRORes_err_ArrayIndexOutOfBounds 65219
-#define uRORes_err_InvalidHeader 65220
-#define uRORes_err_UnknownClassInStream 65221
-#define uRORes_err_UnexpectedClassInStream 65222
-#define uRORes_err_SessionNotFound 65223
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65224
-#define uRORes_err_TooManySessions 65225
-#define uRORes_err_DOMElementIsNIL 65226
-#define uRORes_err_CannotLoadXMLDocument 65227
-#define uRORes_err_ErrorCreatingMsXmlDoc 65228
-#define uRORes_err_NoXMLParsersAvailable 65229
-#define uRORes_err_IDispatchMarshalingNotSupported 65230
-#define uRORes_err_UnsupportedVariantType 65231
-#define uRORes_str_ExceptionOnServer 65232
-#define uRORes_str_ExceptionReraisedFromServer 65233
-#define uRORes_err_AssignError 65234
-#define uRORes_err_InvalidRequestStream 65235
-#define uRORes_err_NILMessage 65236
-#define uRORes_err_UnspecifiedInterface 65237
-#define uRORes_err_UnspecifiedMessage 65238
-#define uRORes_err_UnknownMethod 65239
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65240
-#define uRORes_err_TypeNotSupported 65241
-#define uRORes_err_ClassFactoryNotFound 65242
-#define uRORes_err_IROMessageNotSupported 65243
-#define uRORes_err_ClassAlreadyRegistered 65244
-#define uRORes_err_UnknownProxyInterface 65245
-#define uRORes_err_DispatcherAlreadyAssigned 65246
-#define uRORes_err_CannotFindMessageDispatcher 65247
-#define uRORes_err_InvalidIndex 65248
-#define uRORes_err_InvalidType 65249
-#define uRORes_err_InvalidStream 65250
-#define uRORes_err_InvalidParamFlag 65251
-#define uRORes_err_InvalidStringLength 65252
-#define uRORes_str_InvalidClassTypeInStream 65253
-#define uRORes_err_UnexpectedEndOfStream 65254
-#define uRORes_err_RodlDuplicateName 65255
-#define uRORes_err_RodlNoDataTypeSpecified 65256
-#define uRORes_err_RodlNoEnumValues 65257
-#define uRORes_err_RodlNoStructElementsDefined 65258
-#define uRORes_err_RodlNoOperationsDefined 65259
-#define uRORes_err_RodlUsedFileDoesNotExist 65260
-#define uRORes_err_RodlInvalidDataType 65261
-#define uRORes_err_RodlStructCannotBeNested 65262
-#define uRORes_err_RodlInvalidAncestorType 65263
+#define uRORes_err_InvalidHeader 65200
+#define uRORes_err_UnknownClassInStream 65201
+#define uRORes_err_UnexpectedClassInStream 65202
+#define uRORes_err_SessionNotFound 65203
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65204
+#define uRORes_err_TooManySessions 65205
+#define uRORes_err_DOMElementIsNIL 65206
+#define uRORes_err_CannotLoadXMLDocument 65207
+#define uRORes_err_ErrorCreatingMsXmlDoc 65208
+#define uRORes_err_NoXMLParsersAvailable 65209
+#define uRORes_err_IDispatchMarshalingNotSupported 65210
+#define uRORes_err_UnsupportedVariantType 65211
+#define uRORes_err_VariantIsNotArray 65212
+#define uRORes_err_InvalidVarArrayDimCount 65213
+#define uRORes_err_MessageNotAssigned 65214
+#define ComConst_SOleError 65215
+#define uRORes_err_NILMessage 65216
+#define uRORes_err_UnspecifiedInterface 65217
+#define uRORes_err_UnspecifiedMessage 65218
+#define uRORes_err_UnknownMethod 65219
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65220
+#define uRORes_err_TypeNotSupported 65221
+#define uRORes_err_ClassFactoryNotFound 65222
+#define uRORes_err_IROMessageNotSupported 65223
+#define uRORes_err_ClassAlreadyRegistered 65224
+#define uRORes_err_UnknownProxyInterface 65225
+#define uRORes_err_DispatcherAlreadyAssigned 65226
+#define uRORes_err_CannotFindMessageDispatcher 65227
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65228
+#define uRORes_err_UnhandledException 65229
+#define uRORes_err_ChannelBusy 65230
+#define uRORes_err_ArrayIndexOutOfBounds 65231
+#define uRORes_err_InvalidStringLength 65232
+#define uRORes_str_InvalidClassTypeInStream 65233
+#define uRORes_err_UnexpectedEndOfStream 65234
+#define uRORes_err_RodlDuplicateName 65235
+#define uRORes_err_RodlNoDataTypeSpecified 65236
+#define uRORes_err_RodlNoEnumValues 65237
+#define uRORes_err_RodlNoStructElementsDefined 65238
+#define uRORes_err_RodlNoOperationsDefined 65239
+#define uRORes_err_RodlUsedFileDoesNotExist 65240
+#define uRORes_err_RodlInvalidDataType 65241
+#define uRORes_err_RodlStructCannotBeNested 65242
+#define uRORes_err_RodlInvalidAncestorType 65243
+#define uRORes_str_ExceptionOnServer 65244
+#define uRORes_str_ExceptionReraisedFromServer 65245
+#define uRORes_err_AssignError 65246
+#define uRORes_err_InvalidRequestStream 65247
+#define uRODECConst_sProtectionCircular 65248
+#define uRODECConst_sStringFormatExists 65249
+#define uRODECConst_sInvalidStringFormat 65250
+#define uRODECConst_sInvalidFormatString 65251
+#define uRODECConst_sFMT_COPY 65252
+#define uRODECConst_sFMT_HEX 65253
+#define uRODECConst_sFMT_HEXL 65254
+#define uRODECConst_sFMT_MIME64 65255
+#define uRODECConst_sFMT_UU 65256
+#define uRODECConst_sFMT_XX 65257
+#define uRODECConst_sInvalidKeySize 65258
+#define uRODECConst_sNotInitialized 65259
+#define uRORes_err_InvalidIndex 65260
+#define uRORes_err_InvalidType 65261
+#define uRORes_err_InvalidStream 65262
+#define uRORes_err_InvalidParamFlag 65263
 #define Consts_SDockedCtlNeedsName 65264
 #define Consts_SDockTreeRemoveError 65265
 #define Consts_SDockZoneNotFound 65266
@@ -2162,9 +2162,9 @@ BEGIN
 	IdResourceStrings_RSStatusConnecting,	"Connecting to %s."
 	IdResourceStrings_RSStatusConnected,	"Connected."
 	IdResourceStrings_RSStatusDisconnecting,	"Disconnecting."
-	uRODECConst_sFMT_XX,	"XX Coding"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be to %d-%d bytes"
-	uRODECConst_sNotInitialized,	"%s is not initialized call Init() or InitKey() before."
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
+	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
 	IdResourceStrings_RSCannotAllocateSocket,	"Cannot allocate socket."
 	IdResourceStrings_RSConnectionClosedGracefully,	"Connection Closed Gracefully."
 	IdResourceStrings_RSCouldNotBindSocket,	"Could not bind socket. Address and port are already in use."
@@ -2178,26 +2178,6 @@ BEGIN
 	IdResourceStrings_RSNotConnected,	"Not Connected"
 	IdResourceStrings_RSObjectTypeNotSupported,	"Object type not supported."
 	IdResourceStrings_RSTerminateThreadTimeout,	"Terminate Thread Timeout"
-	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
-	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
-	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	ComConst_SOleError,	"OLE error %.8x"
-	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
-	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
-	uRODECConst_sStringFormatExists,	"String Format \"%d\" not exists."
-	uRODECConst_sInvalidStringFormat,	"Input is not an valid %s Format."
-	uRODECConst_sInvalidFormatString,	"Input can not be convert to %s Format."
-	uRODECConst_sFMT_COPY,	"copy Input to Output"
-	uRODECConst_sFMT_HEX,	"Hexadecimal"
-	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
-	uRODECConst_sFMT_MIME64,	"MIME Base 64"
-	uRODECConst_sFMT_UU,	"UU Coding"
-	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
-	uRORes_err_UnhandledException,	"Unhandled exception"
-	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
-	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
 	uRORes_err_InvalidHeader,	"Invalid binary header. Either incompatible or not a binary message."
 	uRORes_err_UnknownClassInStream,	"Unknown class \"%s\" found in stream."
 	uRORes_err_UnexpectedClassInStream,	"Unexpected class found in stream; class \"%s\" does not descend from \"%s\"."
@@ -2210,10 +2190,10 @@ BEGIN
 	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
 	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
 	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
-	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
-	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
-	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
+	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
+	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
+	uRORes_err_MessageNotAssigned,	"Message is NIL"
+	ComConst_SOleError,	"OLE error %.8x"
 	uRORes_err_NILMessage,	"Message is NIL"
 	uRORes_err_UnspecifiedInterface,	"The message does not have an interface name"
 	uRORes_err_UnspecifiedMessage,	"The message does not have a name"
@@ -2226,10 +2206,10 @@ BEGIN
 	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
 	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
 	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for  for the requested path?"
-	uRORes_err_InvalidIndex,	"Invalid index %d"
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
-	uRORes_err_InvalidStream,	"Invalid stream"
-	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
+	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
+	uRORes_err_UnhandledException,	"Unhandled exception"
+	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
+	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
 	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
 	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
 	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
@@ -2242,6 +2222,26 @@ BEGIN
 	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
 	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
 	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
+	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
+	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
+	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
+	uRODECConst_sStringFormatExists,	"String Format \"%d\" not exists."
+	uRODECConst_sInvalidStringFormat,	"Input is not an valid %s Format."
+	uRODECConst_sInvalidFormatString,	"Input can not be convert to %s Format."
+	uRODECConst_sFMT_COPY,	"copy Input to Output"
+	uRODECConst_sFMT_HEX,	"Hexadecimal"
+	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
+	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRODECConst_sFMT_UU,	"UU Coding"
+	uRODECConst_sFMT_XX,	"XX Coding"
+	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be to %d-%d bytes"
+	uRODECConst_sNotInitialized,	"%s is not initialized call Init() or InitKey() before."
+	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
+	uRORes_err_InvalidStream,	"Invalid stream"
+	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
 	Consts_SDockedCtlNeedsName,	"Docked control must have a name"
 	Consts_SDockTreeRemoveError,	"Error removing control from dock tree"
 	Consts_SDockZoneNotFound,	" - Dock zone not found"