Pedidos de cliente repaso y adaptación

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@6 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2

Source/ApplicationBase/uPlugins_Intf.pas

@@ -4,6 +4,7 @@ interface
 
 const
   MODULENAME_PRESUPUESTOS_CLIENTE = 'PresupuestosCliente_plugin.bpl';
+  MODULENAME_PEDIDOS_CLIENTE = 'PedidosCliente_plugin.bpl';  
   MODULENAME_ALBARANES_CLIENTE = 'AlbaranesCliente_plugin.bpl';
   MODULENAME_FACTURAS_CLIENTE = 'FacturasCliente_plugin.bpl';
   MODULENAME_RECIBOS_CLIENTE = 'RecibosCliente_plugin.bpl';
@@ -21,6 +22,12 @@ type
       const ANombreCliente : String = '');
   end;
 
+  IMCPedidosCliente = interface(IInterface)
+ ['{983DA6AB-C138-49BF-AB01-2C94C2284619}']
+    procedure VerPedidos(const ID_Cliente: Integer;
+      const ANombreCliente : String = '');
+  end;
+
   IMCAlbaranesCliente = interface(IInterface)
     ['{0B9DD25A-3E76-446A-9EA6-D43131634A1E}']
     procedure VerAlbaranes(const ID_Cliente: Integer;

Source/Cliente/uBootStrap.pas

@@ -30,10 +30,11 @@ begin
     LoadModule('Contactos_plugin.bpl');
 
     LoadModule('Almacenes_plugin.bpl');
-    LoadModule('Obras_plugin.bpl');    
+//    LoadModule('Obras_plugin.bpl');    
     LoadModule('Articulos_plugin.bpl');
 
-    LoadModule(MODULENAME_PRESUPUESTOS_CLIENTE);
+//    LoadModule(MODULENAME_PRESUPUESTOS_CLIENTE);
+    LoadModule(MODULENAME_PEDIDOS_CLIENTE);
     LoadModule(MODULENAME_ALBARANES_CLIENTE);
 
     LoadModule('RecibosCliente_plugin.bpl');

Source/GUIBase/GUIBase.dproj

@@ -59,26 +59,30 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\Base.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\cxLibraryD11.dcp" />
-    <DCCReference Include="cxTreeListD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\cxTreeListD11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dbrtl.dcp" />
-    <DCCReference Include="dxBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxBarD11.dcp" />
-    <DCCReference Include="dxBarExtItemsD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxBarExtItemsD11.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxComnD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxPSCoreD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\dxThemeD11.dcp" />
-    <DCCReference Include="frx11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\frx11.dcp" />
-    <DCCReference Include="frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\frxe11.dcp" />
-    <DCCReference Include="fs11.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\fs11.dcp" />
-    <DCCReference Include="JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\JvAppFrmD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\JvCtrlsD11R.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Articulos\Views\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
@@ -86,7 +90,7 @@
       <Form>fDialogElegirEMail</Form>
     </DCCReference>
     <DCCReference Include="uDialogListaEnvioEMail.pas">
-      <Form>fEditorBase</Form>
+      <Form>fDialogListaEnvioEMail</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorBase.pas">
@@ -180,10 +184,6 @@
       <Form>frViewTotales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/GUIBase/GUIBase.drc

@@ -39,4 +39,4 @@ END
 /* C:\Codigo\Source\GUIBase\uViewDocumentos.dfm */
 /* C:\Codigo\Source\GUIBase\uDialogListaEnvioEMail.dfm */
 /* C:\Codigo\Source\GUIBase\GUIBase.res */
-/* C:\Codigo\Source\GUIBase\GUIBase.drf */
+/* c:\temp\dtf575.tmp */

Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
-/* c:\temp\dtf1A1.tmp */
+/* c:\temp\dtf5FF.tmp */

Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas

@@ -155,7 +155,8 @@ begin
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
   if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
      if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+//       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
      else
        ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
-/* c:\temp\dtf19F.tmp */
+/* c:\temp\dtf5FD.tmp */

Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
-/* c:\temp\dtf19D.tmp */
+/* c:\temp\dtf5FB.tmp */

Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
-/* c:\temp\dtf1F7.tmp */
+/* c:\temp\dtf647.tmp */

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc

@@ -28,4 +28,4 @@ END
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
-/* c:\temp\dtf1F5.tmp */
+/* c:\temp\dtf645.tmp */

Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.res */
-/* c:\temp\dtf1CB.tmp */
+/* c:\temp\dtf629.tmp */

Source/Modulos/Albaranes de proveedor/Controller/uDetallesAlbaranProveedorController.pas

@@ -141,19 +141,11 @@ begin
   //Validamos la existencia de todos los campos necesarios
   AField := AArticulos.DataTable.FindField(CAMPO_ID_ARTICULOS);
   if Assigned(AField) then
-  begin
-//     if not ADetalles.DataTable.Editing then
-//        ADetalles.DataTable.Edit;
      ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
-  end;
 
-  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
+//  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
-  if Assigned(AField) then
+//  if Assigned(AField) then
-  begin
+//     ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
-//     if not ADetalles.DataTable.Editing then
-//        ADetalles.DataTable.Edit;
-     ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
-  end;
 end;
 
 procedure TDetallesAlbaranProveedorController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);

Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Data\uDataModuleAlbaranesProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Data\AlbaranesProveedor_data.res */
-/* c:\temp\dtf1C9.tmp */
+/* c:\temp\dtf627.tmp */

Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Model\AlbaranesProveedor_model.res */
-/* c:\temp\dtf1C7.tmp */
+/* c:\temp\dtf625.tmp */

Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Plugin\uPluginAlbaranesProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.res */
-/* c:\temp\dtf20B.tmp */
+/* c:\temp\dtf65B.tmp */

Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc

@@ -30,4 +30,4 @@ END
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranDevProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedorReport.dfm */
 /* C:\Codigo\Source\Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.res */
-/* c:\temp\dtf209.tmp */
+/* c:\temp\dtf659.tmp */

Source/Modulos/Almacenes/Controller/uAlmacenesController.pas

@@ -121,7 +121,7 @@ function TAlmacenesController.BuscarTodos: IBizAlmacen;
 begin
   Result := FDataModule.GetItems;
 //Los almacenes serán comunes para todas las empresas.
-//  FiltrarEmpresa(Result);
+  FiltrarEmpresa(Result);
 end;
 
 constructor TAlmacenesController.Create;

Source/Modulos/Articulos/Controller/uArticulosController.pas

@@ -247,7 +247,8 @@ end;
 
 function TArticulosController.BuscarTodos(ACliente: Integer): IBizArticulo;
 begin
-  Result := FDataModule.GetItems(txArticulo); //ACliente);
+  Result := FDataModule.GetItems(ACliente);
+//  Result := FDataModule.GetItems(txArticulo);
 //Los articulos serán comunes para todas las empresas.
 //  FiltrarEmpresa(Result);
 end;
@@ -258,7 +259,7 @@ begin
 //  if not Assigned(ACliente) then
 //     raise Exception.Create('Falta ACliente: BuscarTodos');
 
-  Result := BuscarTodos; //(ACliente.ID);
+  Result := BuscarTodos(ACliente.ID);
 end;
 
 function TArticulosController.BuscarTodos(AProveedor: IBizProveedor): IBizArticulo;
@@ -360,8 +361,8 @@ begin
   try
     with Result do
     begin
-      Add(CurrToStr(AArticulo.PRECIO_PVP_TOTAL));
+//      Add(CurrToStr(AArticulo.PRECIO_PVP_TOTAL));
-      Add(CurrToStr(AArticulo.PRECIO_PVP_VENTA));
+//      Add(CurrToStr(AArticulo.PRECIO_PVP_VENTA));
     end;
   finally
     AArticulo := NIL;

Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas

@@ -375,7 +375,7 @@ begin
     ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA).AsVariant := AArticulos.REFERENCIA;
     ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_PROVEEDOR).AsVariant := AArticulos.REFERENCIA_PROV;
     ADetalles.DataTable.FieldByName(CAMPO_CONCEPTO).AsVariant := AArticulos.DESCRIPCION;
-    ADetalles.DataTable.FieldByName(CAMPO_UNIDADMEDIDA).AsVariant := AArticulos.UNIDAD_MEDIDA;
+//    ADetalles.DataTable.FieldByName(CAMPO_UNIDADMEDIDA).AsVariant := AArticulos.UNIDAD_MEDIDA;
   end;
 end;
 

Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm

@@ -14,12 +14,12 @@ inherited DataModuleArticulos: TDataModuleArticulos
     Top = 84
   end
   object rda_Articulos: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 51
     Top = 151
   end
@@ -54,13 +54,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DisplayLabel = 'Descripci'#243'n'
         DictionaryEntry = 'Articulos_DESCRIPCION'
       end
-      item
-        Name = 'UNIDAD_MEDIDA'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'Unidad de medida'
-        DictionaryEntry = 'Articulos_UNIDAD_MEDIDA'
-      end
       item
         Name = 'FAMILIA'
         DataType = datString
@@ -135,6 +128,15 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DisplayLabel = 'Inventariable'
         DictionaryEntry = 'Articulos_INVENTARIABLE'
       end
+      item
+        Name = 'ID_PROVEEDOR'
+        DataType = datInteger
+      end
+      item
+        Name = 'NOMBRE_PROVEEDOR'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'ELIMINADO'
         DataType = datSmallInt
@@ -142,62 +144,12 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DictionaryEntry = 'Articulos_ELIMINADO'
       end
       item
-        Name = 'FABRICANTE'
+        Name = 'TIENDA_WEB'
-        DataType = datString
+        DataType = datSmallInt
-        Size = 255
-        DisplayLabel = 'Fabricante'
-        DictionaryEntry = 'Articulos_FABRICANTE'
-      end
-      item
-        Name = 'REFERENCIA_FABR'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'Ref. fabricante'
-        DictionaryEntry = 'Articulos_REFERENCIA_FABR'
-      end
-      item
-        Name = 'PARAM_MARGEN'
-        DataType = datFloat
-      end
-      item
-        Name = 'PRECIO_PVP_VENTA'
-        DataType = datCurrency
-        DisplayLabel = 'Precio PVP (Solo suministro)'
-        Alignment = taRightJustify
-        ServerAutoRefresh = True
-        DictionaryEntry = 'Articulos_PRECIO_PVP_VENTA'
-      end
-      item
-        Name = 'TIEMPO'
-        DataType = datInteger
-      end
-      item
-        Name = 'PARAM_TIEMPO'
-        DataType = datFloat
-        DisplayLabel = 'Precio min'
-        Alignment = taRightJustify
-        DictionaryEntry = 'Articulos_PARAM_TIEMPO'
-      end
-      item
-        Name = 'MANO_OBRA'
-        DataType = datCurrency
-        DisplayLabel = 'Mano de obra'
-        Alignment = taRightJustify
-        DictionaryEntry = 'Articulos_MANO_OBRA'
-      end
-      item
-        Name = 'PRECIO_PVP_TOTAL'
-        DataType = datCurrency
-        DisplayLabel = 'Precio P.V.P (Total)'
-        Alignment = taRightJustify
-        ServerAutoRefresh = True
-        DictionaryEntry = 'Articulos_PRECIO_PVP_TOTAL'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Articulos
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Articulos'
     IndexDefs = <>
     Left = 232
@@ -229,8 +181,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
       end>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Articulos
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'ProveedoresConArticulos'
     IndexDefs = <>
     Left = 232
@@ -313,8 +263,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
     MasterSource = ds_Articulos
     MasterFields = 'ID'
     DetailFields = 'ID_ARTICULO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Articulos_Proveedores'
     IndexDefs = <>
     Left = 368
@@ -512,8 +460,6 @@ inherited DataModuleArticulos: TDataModuleArticulos
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Articulos
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'ArticulosParaCompra'
     IndexDefs = <>
     Left = 416
@@ -525,4 +471,111 @@ inherited DataModuleArticulos: TDataModuleArticulos
     Left = 416
     Top = 192
   end
+  object tbl_ArticulosParaCliente: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datInteger
+      end
+      item
+        Name = 'ID_EMPRESA'
+        DataType = datInteger
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'DESCRIPCION'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'FAMILIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'IMAGEN'
+        DataType = datBlob
+      end
+      item
+        Name = 'COMISIONABLE'
+        DataType = datSmallInt
+      end
+      item
+        Name = 'FECHA_ALTA'
+        DataType = datDateTime
+      end
+      item
+        Name = 'FECHA_MODIFICACION'
+        DataType = datDateTime
+      end
+      item
+        Name = 'USUARIO'
+        DataType = datString
+        Size = 30
+      end
+      item
+        Name = 'REFERENCIA_PROV'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'PRECIO_COSTE'
+        DataType = datCurrency
+      end
+      item
+        Name = 'PRECIO_PORTE'
+        DataType = datCurrency
+      end
+      item
+        Name = 'DESCUENTO'
+        DataType = datFloat
+      end
+      item
+        Name = 'PRECIO_NETO'
+        DataType = datCurrency
+      end
+      item
+        Name = 'INVENTARIABLE'
+        DataType = datSmallInt
+      end
+      item
+        Name = 'ID_PROVEEDOR'
+        DataType = datInteger
+      end
+      item
+        Name = 'NOMBRE_PROVEEDOR'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'ELIMINADO'
+        DataType = datSmallInt
+      end
+      item
+        Name = 'TIENDA_WEB'
+        DataType = datSmallInt
+      end>
+    Params = <
+      item
+        Name = 'ID_CLIENTE'
+        Value = ''
+      end>
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteDataAdapter = rda_Articulos
+    LogicalName = 'ArticulosParaCliente'
+    IndexDefs = <>
+    Left = 424
+    Top = 368
+  end
+  object ds_ArticulosParaCliente: TDADataSource
+    DataSet = tbl_ArticulosParaCliente.Dataset
+    DataTable = tbl_ArticulosParaCliente
+    Left = 424
+    Top = 304
+  end
 end

Source/Modulos/Articulos/Data/uDataModuleArticulos.pas

@@ -24,6 +24,8 @@ type
     ds_Articulos_Proveedores: TDADataSource;
     tbl_ArticulosParaCompra: TDAMemDataTable;
     ds_ArticulosParaCompra: TDADataSource;
+    tbl_ArticulosParaCliente: TDAMemDataTable;
+    ds_ArticulosParaCliente: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
   private
     function _GetProveedores : IBizArticulosProveedores;
@@ -32,7 +34,8 @@ type
     procedure AsignarClaseNegocio(AArticulo: TDADataTable); virtual;
 
   public
-    function GetItems (const Tipo: TEnumArticulos) : IBizArticulo;
+    function GetItems (const Tipo: TEnumArticulos) : IBizArticulo; overload;
+    function GetItems (IDCliente: Integer) : IBizArticulo; overload;
     function GetItem(const ID : Integer) : IBizArticulo;
     function NewItem : IBizArticulo;
     function DarListaProveedoresConArticulos(const IDEmpresa: Integer) : TStringList;
@@ -113,6 +116,23 @@ begin
   end;
 end;
 
+function TDataModuleArticulos.GetItems(IDCliente: Integer): IBizArticulo;
+var
+  AArticulo : TDAMemDataTable;
+begin
+
+  ShowHourglassCursor;
+  try
+    AArticulo := CloneDataTable(tbl_ArticulosParaCliente);
+    AsignarClaseNegocio(AArticulo);
+    AArticulo.ParamByName('ID_CLIENTE').AsInteger := IdCliente;
+    Result := (AArticulo as IBizArticulo);
+
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleArticulos.GetItems(const Tipo: TEnumArticulos): IBizArticulo;
 var
   AArticulo : TDAMemDataTable;

Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas

@@ -10,7 +10,8 @@ type
   
   IDataModuleArticulos = interface
     ['{9047C468-78DE-404E-9047-1125B382FE3B}']
-    function GetItems (const Tipo: TEnumArticulos) : IBizArticulo;
+    function GetItems (const Tipo: TEnumArticulos) : IBizArticulo; overload;
+    function GetItems (IDCliente: Integer) : IBizArticulo; overload;
     function GetItem(const ID : Integer) : IBizArticulo;
     function NewItem : IBizArticulo;
     function DarListaProveedoresConArticulos(const IDEmpresa: Integer) : TStringList;    

Source/Modulos/Articulos/Model/uBizArticulos.pas

@@ -68,9 +68,9 @@ begin
 
   with aDataTable do
   begin
-    FieldByName(fld_ArticulosTIEMPO).OnChange := PARAMETROSPRECIOOnChange;
+//    FieldByName('TIEMPO').OnChange := PARAMETROSPRECIOOnChange;
-    FieldByName(fld_ArticulosPARAM_TIEMPO).OnChange := PARAMETROSPRECIOOnChange;
+//    FieldByName('PARAM_TIEMPO').OnChange := PARAMETROSPRECIOOnChange;
-    FieldByName(fld_ArticulosPARAM_MARGEN).OnChange := PARAMETROSPRECIOOnChange;
+//    FieldByName('PARAM_MARGEN').OnChange := PARAMETROSPRECIOOnChange;
   end;
 
   FProveedoresLink := TDADataSource.Create(NIL);
@@ -118,8 +118,8 @@ procedure TBizArticulo.IniciarValoresArticuloNuevo;
 begin
   ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
   USUARIO := AppFactuGES.UsuarioActivo.UserName;
-  PARAM_TIEMPO := AppFactuGES.EmpresaActiva.PARAM_TIEMPO;
+//  PARAM_TIEMPO := AppFactuGES.EmpresaActiva.PARAM_TIEMPO;
-  PARAM_MARGEN := AppFactuGES.EmpresaActiva.PARAM_MARGEN;
+//  PARAM_MARGEN := AppFactuGES.EmpresaActiva.PARAM_MARGEN;
   INVENTARIABLE := 1;
   COMISIONABLE := 1;
   ELIMINADO := 0;
@@ -136,7 +136,7 @@ begin
   if not Self.DataTable.Editing then
     Edit;
 
-  MANO_OBRA := TIEMPO * PARAM_TIEMPO;
+//  MANO_OBRA := TIEMPO * PARAM_TIEMPO;
       
   if Assigned(Self.Proveedores) then
   begin

Source/Modulos/Articulos/Model/uBizArticulosProveedores.pas

@@ -88,9 +88,9 @@ begin
      //OJO SI ALGUNA VEZ ESTO CAMBIA TAMBIEN HAY QUE CAMBIAR EL PROCEDIMIENTO ALMACENADO PRO_ART_RECALCULAR_PVP
      Self.PRECIO_NETO := Self.PRECIO_COSTE - (Self.PRECIO_COSTE * (Self.DESCUENTO / 100));
 
-     Self.PRECIO_PVP_VENTA := (Self.PRECIO_NETO + Self.PRECIO_PORTE) * ((MasterSource.DataTable.FieldByName(fld_ArticulosPARAM_MARGEN).AsFloat / 100) + 1);
+//     Self.PRECIO_PVP_VENTA := (Self.PRECIO_NETO + Self.PRECIO_PORTE) * ((MasterSource.DataTable.FieldByName('PARAM_MARGEN').AsFloat / 100) + 1);
 
-     Self.PRECIO_PVP_TOTAL := Self.PRECIO_PVP_VENTA + MasterSource.DataTable.FieldByName(fld_ArticulosMANO_OBRA).AsFloat;
+//     Self.PRECIO_PVP_TOTAL := Self.PRECIO_PVP_VENTA + MasterSource.DataTable.FieldByName('MANO_OBRA').AsFloat;
   end;
 end;
 

Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm

@@ -441,9 +441,13 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'PRECIO_PVP_TOTAL'
                 TableField = 'PRECIO_PVP_TOTAL'
+              end
+              item
+                DatasetField = 'TIENDA_WEB'
+                TableField = 'TIENDA_WEB'
               end>
           end>
-        Name = 'Articulos'
+        Name = 'Articulos_ParaVariosProveedores'
         Fields = <
           item
             Name = 'ID'
@@ -558,6 +562,11 @@ object srvArticulos: TsrvArticulos
             Size = 255
             DictionaryEntry = 'Articulos_REFERENCIA_FABR'
           end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'PARAM_MARGEN'
             DataType = datFloat
@@ -875,6 +884,402 @@ object srvArticulos: TsrvArticulos
             Name = 'ID_ARTICULO'
             DataType = datInteger
           end>
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_CLIENTE'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            Name = 'IBX'
+            SQL = 
+              'SELECT V_ARTICULOS.ID, V_ARTICULOS.ID_EMPRESA, V_ARTICULOS.REFER' +
+              'ENCIA, V_ARTICULOS.DESCRIPCION,'#10'V_ARTICULOS.FAMILIA, V_ARTICULOS' +
+              '.IMAGEN, V_ARTICULOS.COMISIONABLE, V_ARTICULOS.FECHA_ALTA,'#10'V_ART' +
+              'ICULOS.FECHA_MODIFICACION, V_ARTICULOS.USUARIO, V_ARTICULOS.REFE' +
+              'RENCIA_PROV,'#10'V_ARTICULOS.PRECIO_COSTE, V_ARTICULOS.PRECIO_PORTE,' +
+              ' CLIENTES_DTOS_PROVEEDORES.DESCUENTO,'#10'V_ARTICULOS.PRECIO_NETO, V' +
+              '_ARTICULOS.INVENTARIABLE, V_ARTICULOS.ID_PROVEEDOR,'#10'V_ARTICULOS.' +
+              'NOMBRE_PROVEEDOR, V_ARTICULOS.ELIMINADO, V_ARTICULOS.TIENDA_WEB'#10 +
+              'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10'ON ((' +
+              'CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDO' +
+              'R)'#10'AND (CLIENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = 'DESCRIPCION'
+              end
+              item
+                DatasetField = 'FAMILIA'
+                TableField = 'FAMILIA'
+              end
+              item
+                DatasetField = 'COMISIONABLE'
+                TableField = 'COMISIONABLE'
+              end
+              item
+                DatasetField = 'FECHA_ALTA'
+                TableField = 'FECHA_ALTA'
+              end
+              item
+                DatasetField = 'FECHA_MODIFICACION'
+                TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'USUARIO'
+                TableField = 'USUARIO'
+              end
+              item
+                DatasetField = 'REFERENCIA_PROV'
+                TableField = 'REFERENCIA_PROV'
+              end
+              item
+                DatasetField = 'PRECIO_COSTE'
+                TableField = 'PRECIO_COSTE'
+              end
+              item
+                DatasetField = 'PRECIO_PORTE'
+                TableField = 'PRECIO_PORTE'
+              end
+              item
+                DatasetField = 'DESCUENTO'
+                TableField = 'DESCUENTO'
+              end
+              item
+                DatasetField = 'PRECIO_NETO'
+                TableField = 'PRECIO_NETO'
+              end
+              item
+                DatasetField = 'INVENTARIABLE'
+                TableField = 'INVENTARIABLE'
+              end
+              item
+                DatasetField = 'ID_PROVEEDOR'
+                TableField = 'ID_PROVEEDOR'
+              end
+              item
+                DatasetField = 'NOMBRE_PROVEEDOR'
+                TableField = 'NOMBRE_PROVEEDOR'
+              end
+              item
+                DatasetField = 'ELIMINADO'
+                TableField = 'ELIMINADO'
+              end
+              item
+                DatasetField = 'TIENDA_WEB'
+                TableField = 'TIENDA_WEB'
+              end
+              item
+                DatasetField = 'IMAGEN'
+                TableField = 'IMAGEN'
+              end>
+          end>
+        Name = 'ArticulosParaCliente'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'IMAGEN'
+            DataType = datBlob
+          end
+          item
+            Name = 'COMISIONABLE'
+            DataType = datSmallInt
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+          end
+          item
+            Name = 'REFERENCIA_PROV'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'PRECIO_COSTE'
+            DataType = datCurrency
+          end
+          item
+            Name = 'PRECIO_PORTE'
+            DataType = datCurrency
+          end
+          item
+            Name = 'DESCUENTO'
+            DataType = datFloat
+          end
+          item
+            Name = 'PRECIO_NETO'
+            DataType = datCurrency
+          end
+          item
+            Name = 'INVENTARIABLE'
+            DataType = datSmallInt
+          end
+          item
+            Name = 'ID_PROVEEDOR'
+            DataType = datInteger
+          end
+          item
+            Name = 'NOMBRE_PROVEEDOR'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'ELIMINADO'
+            DataType = datSmallInt
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
+          end>
+      end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'V_ARTICULOS'
+            StatementType = stAutoSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = 'DESCRIPCION'
+              end
+              item
+                DatasetField = 'FAMILIA'
+                TableField = 'FAMILIA'
+              end
+              item
+                DatasetField = 'IMAGEN'
+                TableField = 'IMAGEN'
+              end
+              item
+                DatasetField = 'COMISIONABLE'
+                TableField = 'COMISIONABLE'
+              end
+              item
+                DatasetField = 'FECHA_ALTA'
+                TableField = 'FECHA_ALTA'
+              end
+              item
+                DatasetField = 'FECHA_MODIFICACION'
+                TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'USUARIO'
+                TableField = 'USUARIO'
+              end
+              item
+                DatasetField = 'REFERENCIA_PROV'
+                TableField = 'REFERENCIA_PROV'
+              end
+              item
+                DatasetField = 'PRECIO_COSTE'
+                TableField = 'PRECIO_COSTE'
+              end
+              item
+                DatasetField = 'PRECIO_PORTE'
+                TableField = 'PRECIO_PORTE'
+              end
+              item
+                DatasetField = 'DESCUENTO'
+                TableField = 'DESCUENTO'
+              end
+              item
+                DatasetField = 'PRECIO_NETO'
+                TableField = 'PRECIO_NETO'
+              end
+              item
+                DatasetField = 'INVENTARIABLE'
+                TableField = 'INVENTARIABLE'
+              end
+              item
+                DatasetField = 'ELIMINADO'
+                TableField = 'ELIMINADO'
+              end
+              item
+                DatasetField = 'TIENDA_WEB'
+                TableField = 'TIENDA_WEB'
+              end
+              item
+                DatasetField = 'ID_PROVEEDOR'
+                TableField = 'ID_PROVEEDOR'
+              end
+              item
+                DatasetField = 'NOMBRE_PROVEEDOR'
+                TableField = 'NOMBRE_PROVEEDOR'
+              end>
+          end>
+        Name = 'Articulos'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_ARTICULOS_ID'
+            ServerAutoRefresh = True
+            DictionaryEntry = 'Articulos_ID'
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+            DictionaryEntry = 'Articulos_ID_EMPRESA'
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Articulos_REFERENCIA'
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Articulos_DESCRIPCION'
+          end
+          item
+            Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Articulos_FAMILIA'
+          end
+          item
+            Name = 'IMAGEN'
+            DataType = datBlob
+            DictionaryEntry = 'Articulos_IMAGEN'
+          end
+          item
+            Name = 'COMISIONABLE'
+            DataType = datInteger
+            DictionaryEntry = 'Articulos_COMISIONABLE'
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+            DictionaryEntry = 'Articulos_FECHA_ALTA'
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+            DictionaryEntry = 'Articulos_FECHA_MODIFICACION'
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 20
+            DictionaryEntry = 'Articulos_USUARIO'
+          end
+          item
+            Name = 'REFERENCIA_PROV'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Articulos_REFERENCIA_PROVEEDOR'
+          end
+          item
+            Name = 'PRECIO_COSTE'
+            DataType = datCurrency
+            DictionaryEntry = 'Articulos_PRECIO_COSTE'
+          end
+          item
+            Name = 'PRECIO_PORTE'
+            DataType = datCurrency
+            DictionaryEntry = 'Articulos_PRECIO_PORTE'
+          end
+          item
+            Name = 'DESCUENTO'
+            DataType = datFloat
+            DictionaryEntry = 'Articulos_DESCUENTO'
+          end
+          item
+            Name = 'PRECIO_NETO'
+            DataType = datCurrency
+            DecimalPrecision = 2
+            DecimalScale = 2
+            DictionaryEntry = 'Articulos_PRECIO_NETO'
+          end
+          item
+            Name = 'INVENTARIABLE'
+            DataType = datSmallInt
+            DictionaryEntry = 'Articulos_INVENTARIABLE'
+          end
+          item
+            Name = 'ID_PROVEEDOR'
+            DataType = datInteger
+          end
+          item
+            Name = 'NOMBRE_PROVEEDOR'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'ELIMINADO'
+            DataType = datSmallInt
+            DictionaryEntry = 'Articulos_ELIMINADO'
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -889,74 +1294,104 @@ object srvArticulos: TsrvArticulos
           end
           item
             Name = 'ID_EMPRESA'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'UNIDAD_MEDIDA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'IMAGEN'
+            DataType = datBlob
             Value = ''
           end
           item
             Name = 'COMISIONABLE'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'FECHA_ALTA'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'USUARIO'
+            DataType = datString
+            Size = 30
             Value = ''
           end
           item
             Name = 'INVENTARIABLE'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'ELIMINADO'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'FABRICANTE'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'REFERENCIA_FABR'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'PARAM_MARGEN'
+            DataType = datFloat
             Value = ''
           end
           item
             Name = 'TIEMPO'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'PARAM_TIEMPO'
+            DataType = datFloat
             Value = ''
           end
           item
             Name = 'MANO_OBRA'
+            DataType = datCurrency
             Value = ''
           end>
         Statements = <
@@ -967,16 +1402,17 @@ object srvArticulos: TsrvArticulos
               'INSERT'#10'  INTO ARTICULOS'#10'    (ID, ID_EMPRESA, REFERENCIA, DESCRIP' +
               'CION, UNIDAD_MEDIDA, FAMILIA, IMAGEN,'#10'     COMISIONABLE, FECHA_A' +
               'LTA, FECHA_MODIFICACION, USUARIO, '#10'     INVENTARIABLE, ELIMINADO' +
-              ', FABRICANTE, REFERENCIA_FABR, PARAM_MARGEN, TIEMPO,'#10'     PARAM_' +
+              ', FABRICANTE, REFERENCIA_FABR, TIENDA_WEB, PARAM_MARGEN, TIEMPO,' +
-              'TIEMPO, MANO_OBRA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, ' +
+              #10'     PARAM_TIEMPO, MANO_OBRA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :' +
-              ':DESCRIPCION, :UNIDAD_MEDIDA, :FAMILIA,'#10'     :IMAGEN, :COMISIONA' +
+              'REFERENCIA, :DESCRIPCION, :UNIDAD_MEDIDA, :FAMILIA,'#10'     :IMAGEN' +
-              'BLE, :FECHA_ALTA, :FECHA_MODIFICACION, '#10'     :USUARIO, :INVENTAR' +
+              ', :COMISIONABLE, :FECHA_ALTA, :FECHA_MODIFICACION, '#10'     :USUARI' +
-              'IABLE, :ELIMINADO, :FABRICANTE, :REFERENCIA_FABR, :PARAM_MARGEN,' +
+              'O, :INVENTARIABLE, :ELIMINADO, :FABRICANTE, :REFERENCIA_FABR, :T' +
-              #10'     :TIEMPO, :PARAM_TIEMPO, :MANO_OBRA)'#10
+              'IENDA_WEB, :PARAM_MARGEN,'#10'     :TIEMPO, :PARAM_TIEMPO, :MANO_OBR' +
+              'A)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
-        Name = 'Insert_Articulos'
+        Name = 'Insert_Articulos_ParaVariosProveedores'
       end
       item
         Params = <
@@ -994,80 +1430,110 @@ object srvArticulos: TsrvArticulos
             StatementType = stSQL
             ColumnMappings = <>
           end>
-        Name = 'Delete_Articulos'
+        Name = 'Delete_Articulos_ParaVariosProveedores'
       end
       item
         Params = <
           item
             Name = 'ID_EMPRESA'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'UNIDAD_MEDIDA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'IMAGEN'
+            DataType = datBlob
             Value = ''
           end
           item
             Name = 'COMISIONABLE'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'FECHA_ALTA'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'USUARIO'
+            DataType = datString
+            Size = 30
             Value = ''
           end
           item
             Name = 'INVENTARIABLE'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'ELIMINADO'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'FABRICANTE'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'REFERENCIA_FABR'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'PARAM_MARGEN'
+            DataType = datFloat
             Value = ''
           end
           item
             Name = 'TIEMPO'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'PARAM_TIEMPO'
+            DataType = datFloat
             Value = ''
           end
           item
             Name = 'MANO_OBRA'
+            DataType = datCurrency
             Value = ''
           end
           item
@@ -1086,13 +1552,14 @@ object srvArticulos: TsrvArticulos
               'ECHA_ALTA, '#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION, '#10'    U' +
               'SUARIO = :USUARIO, '#10'    INVENTARIABLE = :INVENTARIABLE,'#10'    ELIM' +
               'INADO = :ELIMINADO,'#10'    FABRICANTE = :FABRICANTE,'#10'    REFERENCIA' +
-              '_FABR = :REFERENCIA_FABR,'#10'    PARAM_MARGEN = :PARAM_MARGEN,'#10'    ' +
+              '_FABR = :REFERENCIA_FABR,'#10'    TIENDA_WEB = :TIENDA_WEB,'#10'    PARA' +
-              'TIEMPO = :TIEMPO,'#10'    PARAM_TIEMPO = :PARAM_TIEMPO,'#10'    MANO_OBR' +
+              'M_MARGEN = :PARAM_MARGEN,'#10'    TIEMPO = :TIEMPO,'#10'    PARAM_TIEMPO' +
-              'A = :MANO_OBRA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              ' = :PARAM_TIEMPO,'#10'    MANO_OBRA = :MANO_OBRA'#10'  WHERE'#10'    (ID = :' +
+              'OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
-        Name = 'Update_Articulos'
+        Name = 'Update_Articulos_ParaVariosProveedores'
       end
       item
         Params = <
@@ -1237,6 +1704,257 @@ object srvArticulos: TsrvArticulos
             ColumnMappings = <>
           end>
         Name = 'Update_Articulos_Proveedores'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_ARTICULOS_ID'
+            Value = ''
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'COMISIONABLE'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_COSTE'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_PORTE'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'ID_PROVEEDOR'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_NETO'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'REFERENCIA_PROV'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'INVENTARIABLE'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'ELIMINADO'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'ARTICULOS'
+            SQL = 
+              'INSERT'#10'  INTO ARTICULOS'#10'    (ID, ID_EMPRESA, REFERENCIA, DESCRIP' +
+              'CION, FAMILIA, COMISIONABLE, FECHA_ALTA,'#10'     FECHA_MODIFICACION' +
+              ', USUARIO, PRECIO_COSTE, PRECIO_PORTE, DESCUENTO, ID_PROVEEDOR,'#10 +
+              '     PRECIO_NETO, REFERENCIA_PROV, INVENTARIABLE, ELIMINADO,'#10'   ' +
+              '  TIENDA_WEB)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, :DESC' +
+              'RIPCION, :FAMILIA, :COMISIONABLE, :FECHA_ALTA,'#10'     :FECHA_MODIF' +
+              'ICACION, :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :DESCUENTO, :ID' +
+              '_PROVEEDOR,'#10'     :PRECIO_NETO, :REFERENCIA_PROV, :INVENTARIABLE,' +
+              ' :ELIMINADO,'#10'     :TIENDA_WEB)'#10'     '#10'     '#10#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Insert_Articulos'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'FAMILIA'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'COMISIONABLE'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_COSTE'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_PORTE'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'ID_PROVEEDOR'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'PRECIO_NETO'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'REFERENCIA_PROV'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'INVENTARIABLE'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'ELIMINADO'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'TIENDA_WEB'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'OLD_ID'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'ARTICULOS'
+            SQL = 
+              'UPDATE ARTICULOS'#10'  SET '#10'    ID_EMPRESA = :ID_EMPRESA,'#10'    REFERE' +
+              'NCIA = :REFERENCIA, '#10'    DESCRIPCION = :DESCRIPCION, '#10'    FAMILI' +
+              'A = :FAMILIA,'#10'    COMISIONABLE = :COMISIONABLE,'#10'    FECHA_ALTA =' +
+              ' :FECHA_ALTA,'#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION, '#10'   ' +
+              ' USUARIO = :USUARIO, '#10'    PRECIO_COSTE = :PRECIO_COSTE,'#10'    PREC' +
+              'IO_PORTE = :PRECIO_PORTE,'#10'    DESCUENTO = :DESCUENTO,'#10'    ID_PRO' +
+              'VEEDOR = :ID_PROVEEDOR,'#10'    PRECIO_NETO = :PRECIO_NETO,'#10'    REFE' +
+              'RENCIA_PROV = :REFERENCIA_PROV,'#10'    INVENTARIABLE = :INVENTARIAB' +
+              'LE,'#10'    ELIMINADO = :ELIMINADO,'#10'    TIENDA_WEB = :TIENDA_WEB'#10#10'  ' +
+              'WHERE'#10'    (ID = :OLD_ID)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Update_Articulos'
+      end
+      item
+        Params = <
+          item
+            Name = 'OLD_ID'
+            DataType = datInteger
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'ARTICULOS'
+            SQL = 'UPDATE ARTICULOS'#10'SET ELIMINADO = 1'#10'WHERE (ID = :OLD_ID)'
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Delete_Articulos'
       end>
     RelationShips = <
       item

Source/Modulos/Articulos/Views/Articulos_view.dpk

@@ -32,7 +32,26 @@ requires
   UnidadesMedida_controller,
   Contactos_view,
   Fabricantes_controller,
-  GUISDK_D11R;
+  GUISDK_D11R,
+  rtl,
+  vcl,
+  dbrtl,
+  cxLibraryD11,
+  dxThemeD11,
+  dxGDIPlusD11,
+  dxCoreD11,
+  vclx,
+  cxEditorsD11,
+  cxDataD11,
+  vcljpg,
+  vcldb,
+  DataAbstract_Core_D11,
+  dsnap,
+  adortl,
+  RemObjects_Core_D11,
+  dxLayoutControlD11,
+  dxComnD11,
+  Contactos_model;
 
 contains
   uViewArticulos in 'uViewArticulos.pas' {frViewArticulos: TFrame},
@@ -41,9 +60,11 @@ contains
   uEditorElegirArticulos in 'uEditorElegirArticulos.pas' {fEditorElegirArticulos: TfEditorElegirArticulos},
   uViewArticulo in 'uViewArticulo.pas' {frViewArticulo: TFrame},
   uViewDetallesArticulos in 'uViewDetallesArticulos.pas' {frViewDetallesArticulos: TFrame},
-  uViewArticulosProveedores in 'uViewArticulosProveedores.pas' {frViewArticulosProveedores: TFrame},
+  uViewProveedoresArticulo in 'uViewProveedoresArticulo.pas' {frViewProveedoresArticulo: TFrame},
   uViewArticulosPorProveedor in 'uViewArticulosPorProveedor.pas' {frViewArticulosPorProveedor: TFrame},
   uViewDetallesArticulosParaVenta in 'uViewDetallesArticulosParaVenta.pas' {frViewDetallesArticulosParaVenta: TCustomView},
-  uEditorArticulos in 'uEditorArticulos.pas' {fEditorArticulos: TfEditorArticulo};
+  uEditorArticulos in 'uEditorArticulos.pas' {fEditorArticulos: TfEditorArticulo},
+  uViewProveedorArticulo in 'uViewProveedorArticulo.pas' {frViewProveedorArticulo: TFrame},
+  uViewParametrosPrecio in 'uViewParametrosPrecio.pas' {frViewParametrosPrecio: TFrame};
 
 end.

Source/Modulos/Articulos/Views/Articulos_view.dproj

@@ -55,14 +55,33 @@
     <DelphiCompile Include="Articulos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Servidor\Articulos_controller.dcp" />
+    <DCCReference Include="..\..\Lib\adortl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Articulos_model.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Contactos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Fabricantes_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Familias_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
-    <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\cxDataD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\UnidadesMedida_controller.dcp" />
+    <DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Lib\dbrtl.dcp" />
+    <DCCReference Include="..\..\Lib\dsnap.dcp" />
+    <DCCReference Include="..\..\Lib\dxComnD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxCoreD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Lib\Fabricantes_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Familias_controller.dcp" />
+    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Lib\rtl.dcp" />
+    <DCCReference Include="..\..\Lib\UnidadesMedida_controller.dcp" />
+    <DCCReference Include="..\..\Lib\vcl.dcp" />
+    <DCCReference Include="..\..\Lib\vcldb.dcp" />
+    <DCCReference Include="..\..\Lib\vcljpg.dcp" />
+    <DCCReference Include="..\..\Lib\vclx.dcp" />
     <DCCReference Include="uArticulosViewRegister.pas" />
     <DCCReference Include="uEditorArticulo.pas">
       <Form>fEditorArticulo</Form>
@@ -88,10 +107,6 @@
       <Form>frViewArticulosPorProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="uViewArticulosProveedores.pas">
-      <Form>frViewArticulosProveedores</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
     <DCCReference Include="uViewDetallesArticulos.pas">
       <Form>frViewDetallesArticulos</Form>
       <DesignClass>TFrame</DesignClass>
@@ -100,6 +115,18 @@
       <Form>frViewDetallesArticulosParaVenta</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="uViewParametrosPrecio.pas">
+      <Form>frViewParametrosPrecio</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewProveedorArticulo.pas">
+      <Form>frViewProveedorArticulo</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewProveedoresArticulo.pas">
+      <Form>frViewProveedoresArticulo</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Articulos/Views/uEditorArticulo.dfm

@@ -34,6 +34,12 @@ inherited fEditorArticulo: TfEditorArticulo
         4495BD38333E3DC0F0B71000FEC966E74A55381F0000000049454E44AE426082}
       ExplicitLeft = 607
     end
+    inherited lblDesbloquear: TcxLabel
+      Left = 780
+      ExplicitLeft = 780
+      AnchorX = 825
+      AnchorY = 14
+    end
   end
   inherited TBXDock: TTBXDock
     Width = 905
@@ -110,12 +116,12 @@ inherited fEditorArticulo: TfEditorArticulo
     object TabSheet1: TTabSheet
       Caption = 'Precios'
       ImageIndex = 1
-      inline frViewArticulosProveedores1: TfrViewArticulosProveedores
+      inline frViewProveedorArticulo1: TfrViewProveedorArticulo
         Left = 0
-        Top = 97
+        Top = 0
         Width = 891
-        Height = 279
+        Height = 234
-        Align = alClient
+        Align = alTop
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -11
@@ -124,217 +130,52 @@ inherited fEditorArticulo: TfEditorArticulo
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitTop = 97
         ExplicitWidth = 891
-        ExplicitHeight = 279
+        inherited dxLayoutControlArticulo: TdxLayoutControl
-        inherited cxGrid: TcxGrid
           Width = 891
-          Height = 254
           ExplicitWidth = 891
-          ExplicitHeight = 254
+          inherited eReferenciaProv: TcxDBTextEdit
-          inherited cxGridView: TcxGridDBTableView
+            DataBinding.DataSource = dsDataTable
-            inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
+            Style.LookAndFeel.SkinName = ''
-              PropertiesClassName = 'TcxCurrencyEditProperties'
+            StyleDisabled.LookAndFeel.SkinName = ''
-              Properties.Alignment.Horz = taRightJustify
+            StyleFocused.LookAndFeel.SkinName = ''
-              FooterAlignmentHorz = taRightJustify
+            StyleHot.LookAndFeel.SkinName = ''
-              GroupSummaryAlignment = taRightJustify
+            ExplicitWidth = 290
-              HeaderAlignmentHorz = taRightJustify
+            Width = 290
-            end
-            inherited cxGridViewDESCUENTO: TcxGridDBColumn
-              Properties.Alignment.Horz = taRightJustify
-              GroupSummaryAlignment = taRightJustify
-            end
-            inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
-              PropertiesClassName = 'TcxCurrencyEditProperties'
-              Properties.Alignment.Horz = taRightJustify
-              FooterAlignmentHorz = taRightJustify
-              GroupSummaryAlignment = taRightJustify
-              HeaderAlignmentHorz = taRightJustify
-            end
-            inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn
-              PropertiesClassName = 'TcxCurrencyEditProperties'
-              Properties.Alignment.Horz = taRightJustify
-              FooterAlignmentHorz = taRightJustify
-              GroupSummaryAlignment = taRightJustify
-              HeaderAlignmentHorz = taRightJustify
-            end
-            inherited cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn
-              PropertiesClassName = 'TcxCurrencyEditProperties'
-              Properties.Alignment.Horz = taRightJustify
-              FooterAlignmentHorz = taRightJustify
-              GroupSummaryAlignment = taRightJustify
-              HeaderAlignmentHorz = taRightJustify
-            end
-            inherited cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn
-              PropertiesClassName = 'TcxCurrencyEditProperties'
-              Properties.Alignment.Horz = taRightJustify
-              FooterAlignmentHorz = taRightJustify
-              GroupSummaryAlignment = taRightJustify
-              HeaderAlignmentHorz = taRightJustify
-            end
           end
-        end
+          inherited eProveedor: TcxDBLookupComboBox
-        inherited ToolBar1: TToolBar
+            DataBinding.DataSource = dsDataTable
-          Width = 891
+            ExplicitWidth = 304
-          ExplicitWidth = 891
+            Width = 304
-        end
+          end
-      end
+          inherited ePrecioCoste: TcxDBCurrencyEdit
-      object dxLayoutControl1: TdxLayoutControl
+            DataBinding.DataSource = dsDataTable
-        Left = 0
+            ExplicitWidth = 200
-        Top = 0
+            Width = 200
-        Width = 891
+          end
-        Height = 97
+          inherited eDescuento: TcxDBSpinEdit
-        Align = alTop
+            DataBinding.DataSource = dsDataTable
-        TabOrder = 1
+            ExplicitWidth = 200
-        TabStop = False
+            Width = 200
-        AutoContentSizes = [acsWidth, acsHeight]
+          end
-        LookAndFeel = dxLayoutOfficeLookAndFeel1
+          inherited ePrecioNeto: TcxDBCurrencyEdit
-        object eParamMargen: TcxDBSpinEdit
+            DataBinding.DataSource = dsDataTable
-          Left = 118
+            ExplicitWidth = 200
-          Top = 30
+            Width = 200
-          DataBinding.DataField = 'PARAM_MARGEN'
+          end
-          DataBinding.DataSource = dsDataTable
+          inherited ePrecioPorte: TcxDBCurrencyEdit
-          Properties.Alignment.Horz = taRightJustify
+            DataBinding.DataSource = dsDataTable
-          Properties.AssignedValues.EditFormat = True
+            ExplicitWidth = 200
-          Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+            Width = 200
-          Properties.ImmediatePost = True
+          end
-          Properties.MaxValue = 100.000000000000000000
+          inherited cbTiendaWeb: TcxDBCheckBox
-          Style.BorderColor = clWindowFrame
+            DataBinding.DataSource = dsDataTable
-          Style.BorderStyle = ebs3D
+            Style.LookAndFeel.SkinName = ''
-          Style.HotTrack = False
+            StyleDisabled.LookAndFeel.SkinName = ''
-          Style.LookAndFeel.Kind = lfStandard
+            StyleFocused.LookAndFeel.SkinName = ''
-          Style.LookAndFeel.NativeStyle = True
+            StyleHot.LookAndFeel.SkinName = ''
-          Style.LookAndFeel.SkinName = ''
+            ExplicitWidth = 290
-          Style.ButtonStyle = bts3D
+            Width = 290
-          StyleDisabled.LookAndFeel.Kind = lfStandard
-          StyleDisabled.LookAndFeel.NativeStyle = True
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.Kind = lfStandard
-          StyleFocused.LookAndFeel.NativeStyle = True
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.Kind = lfStandard
-          StyleHot.LookAndFeel.NativeStyle = True
-          StyleHot.LookAndFeel.SkinName = ''
-          TabOrder = 0
-          Width = 100
-        end
-        object eTiempo: TcxDBSpinEdit
-          Left = 118
-          Top = 57
-          DataBinding.DataField = 'TIEMPO'
-          DataBinding.DataSource = dsDataTable
-          Properties.Alignment.Horz = taRightJustify
-          Properties.ImmediatePost = True
-          Properties.MaxValue = 100000.000000000000000000
-          Style.BorderColor = clWindowFrame
-          Style.BorderStyle = ebs3D
-          Style.HotTrack = False
-          Style.LookAndFeel.Kind = lfStandard
-          Style.LookAndFeel.NativeStyle = True
-          Style.LookAndFeel.SkinName = ''
-          Style.ButtonStyle = bts3D
-          StyleDisabled.LookAndFeel.Kind = lfStandard
-          StyleDisabled.LookAndFeel.NativeStyle = True
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.Kind = lfStandard
-          StyleFocused.LookAndFeel.NativeStyle = True
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.Kind = lfStandard
-          StyleHot.LookAndFeel.NativeStyle = True
-          StyleHot.LookAndFeel.SkinName = ''
-          TabOrder = 1
-          Width = 100
-        end
-        object eParamTiempo: TcxDBCurrencyEdit
-          Left = 300
-          Top = 57
-          DataBinding.DataField = 'PARAM_TIEMPO'
-          DataBinding.DataSource = dsDataTable
-          Properties.Alignment.Horz = taRightJustify
-          Style.BorderColor = clWindowFrame
-          Style.BorderStyle = ebs3D
-          Style.HotTrack = False
-          Style.LookAndFeel.Kind = lfStandard
-          Style.LookAndFeel.NativeStyle = True
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.Kind = lfStandard
-          StyleDisabled.LookAndFeel.NativeStyle = True
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.Kind = lfStandard
-          StyleFocused.LookAndFeel.NativeStyle = True
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.Kind = lfStandard
-          StyleHot.LookAndFeel.NativeStyle = True
-          StyleHot.LookAndFeel.SkinName = ''
-          TabOrder = 2
-          Width = 150
-        end
-        object eManoObra: TcxDBSpinEdit
-          Left = 545
-          Top = 57
-          DataBinding.DataField = 'MANO_OBRA'
-          DataBinding.DataSource = dsDataTable
-          Enabled = False
-          Properties.Alignment.Horz = taRightJustify
-          Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
-          Properties.ImmediatePost = True
-          Properties.MaxValue = 100.000000000000000000
-          Properties.SpinButtons.Visible = False
-          Style.BorderColor = clWindowFrame
-          Style.BorderStyle = ebs3D
-          Style.HotTrack = False
-          Style.LookAndFeel.Kind = lfStandard
-          Style.LookAndFeel.NativeStyle = True
-          Style.LookAndFeel.SkinName = ''
-          Style.ButtonStyle = bts3D
-          StyleDisabled.LookAndFeel.Kind = lfStandard
-          StyleDisabled.LookAndFeel.NativeStyle = True
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.Kind = lfStandard
-          StyleFocused.LookAndFeel.NativeStyle = True
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.Kind = lfStandard
-          StyleHot.LookAndFeel.NativeStyle = True
-          StyleHot.LookAndFeel.SkinName = ''
-          TabOrder = 3
-          Width = 200
-        end
-        object dxLayoutControl1Group_Root: TdxLayoutGroup
-          ShowCaption = False
-          Hidden = True
-          LayoutDirection = ldHorizontal
-          ShowBorder = False
-          object dxLayoutControl1Group1: TdxLayoutGroup
-            AutoAligns = []
-            AlignHorz = ahClient
-            Caption = 'Par'#225'metros de precio'
-            object dxLayoutControl1Item1: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              Caption = 'Margen coste (%):'
-              Control = eParamMargen
-              ControlOptions.ShowBorder = False
-            end
-            object dxLayoutControl1Group3: TdxLayoutGroup
-              ShowCaption = False
-              Hidden = True
-              LayoutDirection = ldHorizontal
-              ShowBorder = False
-              object dxLayoutControl1Item2: TdxLayoutItem
-                Caption = 'Tiempo min.:'
-                Control = eTiempo
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item3: TdxLayoutItem
-                Caption = '     Precio min.:'
-                Control = eParamTiempo
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item4: TdxLayoutItem
-                Caption = '      Mano de obra'
-                Control = eManoObra
-                ControlOptions.ShowBorder = False
-              end
-            end
           end
         end
       end

Source/Modulos/Articulos/Views/uEditorArticulo.pas

@@ -18,7 +18,9 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel,
   cxClasses, cxControls, cxGridCustomView, cxGrid, uViewDetallesGenerico,
   uViewArticulosProveedores,  dxLayoutControl, cxContainer,
-  cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit;
+  cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit,
+  uViewProveedoresArticulo, uViewParametrosPrecio, cxLabel,
+  uViewProveedorArticulo;
 
 type
   TfEditorArticulo = class(TfEditorDBItem, IEditorArticulo)
@@ -28,19 +30,7 @@ type
     actFamilias: TAction;
     TBXSeparatorItem6: TTBXSeparatorItem;
     TabSheet1: TTabSheet;
-    frViewArticulosProveedores1: TfrViewArticulosProveedores;
+    frViewProveedorArticulo1: TfrViewProveedorArticulo;
-    dxLayoutControl1Group_Root: TdxLayoutGroup;
-    dxLayoutControl1: TdxLayoutControl;
-    dxLayoutControl1Item1: TdxLayoutItem;
-    eParamMargen: TcxDBSpinEdit;
-    dxLayoutControl1Item2: TdxLayoutItem;
-    eTiempo: TcxDBSpinEdit;
-    dxLayoutControl1Item3: TdxLayoutItem;
-    eParamTiempo: TcxDBCurrencyEdit;
-    dxLayoutControl1Item4: TdxLayoutItem;
-    eManoObra: TcxDBSpinEdit;
-    dxLayoutControl1Group1: TdxLayoutGroup;
-    dxLayoutControl1Group3: TdxLayoutGroup;
     procedure FormShow(Sender: TObject);
     procedure dsDataTableDataChange(Sender: TObject; Field: TField);
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
@@ -131,7 +121,7 @@ begin
   if Assigned(FViewArticulo) and Assigned(Articulo) then
   begin
      FViewArticulo.Articulo := Articulo;
-     frViewArticulosProveedores1.Articulo := Articulo;
+//     frViewProveedoresArticulo1.Articulo := Articulo;
   end;
 end;
 
@@ -141,7 +131,7 @@ begin
   if Assigned(FController) then
   begin
     (ViewArticulo as IViewArticulo).Controller := (FController as IArticulosController);
-    frViewArticulosProveedores1.Controller := FController;
+//    frViewProveedoresArticulo1.Controller := FController;
   end;
 end;
 

Source/Modulos/Articulos/Views/uEditorArticulos.dfm

@@ -114,18 +114,26 @@ inherited fEditorArticulos: TfEditorArticulos
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 166
+                Width = 166
               end
               inherited edtFechaFinFiltro: TcxDateEdit
+                Left = 353
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 353
+                ExplicitWidth = 150
+                Width = 150
               end
               inherited eLista: TcxComboBox
+                Left = 595
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 595
                 ExplicitWidth = 20
                 Width = 20
               end
@@ -172,6 +180,7 @@ inherited fEditorArticulos: TfEditorArticulos
     object pagArticulosPorProveedor: TTabSheet
       Caption = 'Art'#237'culos por proveedor'
       ImageIndex = 1
+      TabVisible = False
       inline frViewArticulosPorProveedor1: TfrViewArticulosPorProveedor
         Left = 0
         Top = 0
@@ -223,18 +232,26 @@ inherited fEditorArticulos: TfEditorArticulos
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 166
+                Width = 166
               end
               inherited edtFechaFinFiltro: TcxDateEdit
+                Left = 353
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 353
+                ExplicitWidth = 150
+                Width = 150
               end
               inherited eLista: TcxComboBox
+                Left = 595
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 595
                 ExplicitWidth = 20
                 Width = 20
               end

Source/Modulos/Articulos/Views/uViewArticulo.dfm

@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 614
+  Width = 451
-  Height = 376
+  Height = 304
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,20 +9,18 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 614
+    Width = 451
-    Height = 376
+    Height = 304
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
-    ExplicitWidth = 451
-    ExplicitHeight = 304
     DesignSize = (
-      614
+      451
-      376)
+      304)
     object PngSpeedButton2: TPngSpeedButton
-      Left = 552
+      Left = 389
       Top = 304
       Width = 23
       Height = 22
@@ -49,7 +47,7 @@ inherited frViewArticulo: TfrViewArticulo
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object PngSpeedButton1: TPngSpeedButton
-      Left = 552
+      Left = 389
       Top = 332
       Width = 23
       Height = 22
@@ -219,7 +217,6 @@ inherited frViewArticulo: TfrViewArticulo
     object cbUnidadMedida: TcxDBComboBox
       Left = 122
       Top = 109
-      DataBinding.DataField = 'UNIDAD_MEDIDA'
       DataBinding.DataSource = dsViewArticulo
       Properties.DropDownRows = 16
       Properties.ImmediatePost = True
@@ -247,7 +244,6 @@ inherited frViewArticulo: TfrViewArticulo
     object cbFabricante: TcxDBComboBox
       Left = 122
       Top = 220
-      DataBinding.DataField = 'FABRICANTE'
       DataBinding.DataSource = dsViewArticulo
       Properties.DropDownRows = 16
       Properties.ImmediatePost = True
@@ -276,7 +272,6 @@ inherited frViewArticulo: TfrViewArticulo
       Left = 122
       Top = 247
       Anchors = [akLeft, akTop, akRight]
-      DataBinding.DataField = 'REFERENCIA_FABR'
       DataBinding.DataSource = dsViewArticulo
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
@@ -349,6 +344,7 @@ inherited frViewArticulo: TfrViewArticulo
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
               Caption = 'Unidad de medida:'
+              Visible = False
               Control = cbUnidadMedida
               ControlOptions.ShowBorder = False
             end
@@ -367,7 +363,6 @@ inherited frViewArticulo: TfrViewArticulo
                 AutoAligns = [aaVertical]
                 AlignHorz = ahClient
                 Caption = ' '
-                Visible = False
                 Control = eNoComisionable
                 ControlOptions.ShowBorder = False
               end
@@ -376,6 +371,7 @@ inherited frViewArticulo: TfrViewArticulo
         end
         object dxLayoutControlArticuloGroup10: TdxLayoutGroup
           Caption = 'Datos del fabricante'
+          Visible = False
           object dxLayoutControlArticuloItem10: TdxLayoutItem
             Caption = 'Fabricante:'
             Control = cbFabricante

Source/Modulos/Articulos/Views/uViewArticulos.dfm

@@ -21,6 +21,59 @@ inherited frViewArticulos: TfrViewArticulos
       OptionsBehavior.PullFocusing = True
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
+      inherited cxGridViewICONO: TcxGridDBColumn
+        Visible = False
+        VisibleForCustomization = False
+      end
+      object cxGridViewINVENTARIABLE: TcxGridDBColumn
+        Caption = #191'Inventariable?'
+        DataBinding.FieldName = 'INVENTARIABLE'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.Images = GridPNGImageList
+        Properties.Items = <
+          item
+            Value = 0
+          end
+          item
+            ImageIndex = 1
+            Value = 1
+          end>
+        MinWidth = 22
+        Width = 22
+      end
+      object cxGridViewCOMISIONABLE: TcxGridDBColumn
+        DataBinding.FieldName = 'COMISIONABLE'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.Images = GridPNGImageList
+        Properties.Items = <
+          item
+          end
+          item
+            Value = 0
+          end
+          item
+            ImageIndex = 2
+            Value = 1
+          end>
+        MinWidth = 22
+        Width = 22
+      end
+      object cxGridViewTIENDA_WEB: TcxGridDBColumn
+        Caption = 'Acceso a tienda web'
+        DataBinding.FieldName = 'TIENDA_WEB'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.Images = GridPNGImageList
+        Properties.Items = <
+          item
+            Value = 0
+          end
+          item
+            ImageIndex = 4
+            Value = 1
+          end>
+        MinWidth = 22
+        Width = 22
+      end
       object cxGridViewRecID: TcxGridDBColumn
         DataBinding.FieldName = 'RecID'
         Visible = False
@@ -44,23 +97,32 @@ inherited frViewArticulos: TfrViewArticulos
       object cxGridViewDESCRIPCION: TcxGridDBColumn
         DataBinding.FieldName = 'DESCRIPCION'
       end
-      object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
-        DataBinding.FieldName = 'UNIDAD_MEDIDA'
-      end
       object cxGridViewFAMILIA: TcxGridDBColumn
         DataBinding.FieldName = 'FAMILIA'
       end
-      object cxGridViewFABRICANTE: TcxGridDBColumn
+      object cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn
-        DataBinding.FieldName = 'FABRICANTE'
+        Caption = 'Proveedor'
+        DataBinding.FieldName = 'NOMBRE_PROVEEDOR'
       end
-      object cxGridViewREFERENCIA_FABR: TcxGridDBColumn
+      object cxGridViewREFERENCIA_PROV: TcxGridDBColumn
-        DataBinding.FieldName = 'REFERENCIA_FABR'
+        DataBinding.FieldName = 'REFERENCIA_PROV'
       end
-      object cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn
+      object cxGridViewPRECIO_COSTE: TcxGridDBColumn
-        DataBinding.FieldName = 'PRECIO_PVP_VENTA'
+        DataBinding.FieldName = 'PRECIO_COSTE'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
       end
-      object cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn
+      object cxGridViewDESCUENTO: TcxGridDBColumn
-        DataBinding.FieldName = 'PRECIO_PVP_TOTAL'
+        DataBinding.FieldName = 'DESCUENTO'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      end
+      object cxGridViewPRECIO_NETO: TcxGridDBColumn
+        DataBinding.FieldName = 'PRECIO_NETO'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+      end
+      object cxGridViewPRECIO_PORTE: TcxGridDBColumn
+        DataBinding.FieldName = 'PRECIO_PORTE'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
       end
     end
     inherited cxGridLevel: TcxGridLevel
@@ -88,20 +150,28 @@ inherited frViewArticulos: TfrViewArticulos
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 272
+          Width = 272
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Left = 376
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 376
+          ExplicitWidth = 221
+          Width = 221
         end
         inherited eLista: TcxComboBox
+          Left = 634
           Properties.DropDownRows = 20
           Properties.OnChange = frViewFiltroBase1eListaPropertiesChange
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 634
           ExplicitWidth = 71
           Width = 71
         end
@@ -150,7 +220,7 @@ inherited frViewArticulos: TfrViewArticulos
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
         object TBXItem4: TTBXItem
-          Action = actFabricante
+          Action = actProveedor
         end
       end
     end
@@ -169,10 +239,10 @@ inherited frViewArticulos: TfrViewArticulos
       OnExecute = actFamiliaExecute
       OnUpdate = actFamiliaUpdate
     end
-    object actFabricante: TAction
+    object actProveedor: TAction
-      Caption = 'Fabricante'
+      Caption = 'Proveedor'
-      OnExecute = actFabricanteExecute
+      OnExecute = actProveedorExecute
-      OnUpdate = actFabricanteUpdate
+      OnUpdate = actProveedorUpdate
     end
   end
   inherited GridPNGImageList: TPngImageList
@@ -321,6 +391,42 @@ inherited frViewArticulos: TfrViewArticulos
           B969BE09F8ABEE007001C1D97F1131BF40440000000049454E44AE426082}
         Name = 'PngImage3'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000B1300000B1301009A9C18000003734944415478DA
+          5D536D685B55187ECEBDB99FB9371F26CB92ACADE9D66E75DDA6D356A6881B82
+          6C32904DA63074B66EEA90CDFDEC3EF0D7500A4357D18A286D6163A820289BCC
+          0A83EE872875FB51964E6AD79936ED9A6459BE939B9BDCE4DEEBA1B2317DE1E1
+          1C78CFFB9CE77DCE7909FE17472F7ED6EEF0048E36D5F8FE464509A5EACBD0ED
+          DB497DE9E0B71E73FBF04FEF4AF30F9F27F7375F5DBA244795F90F798FF350C8
+          25A8204D52327E455ABB89997B69CC2C1EB3513958DEE81646BB4CF183AF0F93
+          EA03826D9FBC2AADEFDE7CCE15C8EF0BAB3D64B5732B54BE84941647AC30821B
+          A934A6E2A750486E876054EC8857FFDEBB5CEE9F1C7A565F21D83DBE635075E5
+          06DABD9DCCA3AE67D04A21D18C6ECAB8BA78067FDC791A7F67A7908C1F875D8E
+          81E3BEB4D6284367164E6C3849768D7DD1BB208C4F74866795764F184165275A
+          DDCF839851F8A55770FD6E0197E782984EA4A06573407314D0AEC04DF6547A5A
+          4EBF403A07EF8D2CE84B879E78EA30DABC15F8652F9C9C8FEA62B04AFE18B17C
+          04130B04F3E93C6CBD9F220E946F8194FDE80A7E33420283E94CBA58F2B56F7A
+          072DBE3928BC0889E321B2AF51834E60BEE0403449FD2B14815A3FD0B806948A
+          60AA1236C8C359221C9BB6EB848510FE19ABDB4E83C536B0CC2A18D647D08C16
+          54AA26EAC51250BD492DEFA32B07520C436E5610300E8084DF9CB4133207A880
+          103A0F8BB3C092000813815EDB4D9DB4695181DEFC2325380ED44DB055111EAB
+          036AE92D9035AF4FDACBA60EB85C802C03920628BF81F0E760D75F048A8F5382
+          C7A879598A8B609A0978B95904C94658ECFE1CF1EF9918CF98DA2EA8EABF04A2
+          08B8AF52A201C034687100C89C070C9A2B95C19ACB5817BC8247ECB53095BDA3
+          6473DF54FF5CECAFB19A53249024DA070F7035C07792BEC46D20F73255F10695
+          5E072A1A78AB82273B0A10A52D0D67CF8EE748C7FBB70423BE185DCA26D6DBA2
+          408BB91510FF59DAB7053B71844A6F50050618D3845BE2B135E2B36AFEAE0BBF
+          9F5DD7B7F2137B07FEEC4ECEDEB99CCFA4DAEAB64D2C16F0847F41F9EE26587A
+          081C6120700E04A84F1EA76AF3A2F707D3E73B3039D4A63F18A6EEF7AEB53A74
+          32ACE5F22FD51A794E76C5A16522B4230E0A55E6969CB620AB5A4351C6F219F5
+          54F44248FBCF34DE8FDE23333B19ADFAB683AFED330A26388103E371A6ACAAF5
+          5D59653E9FFE744BECE1F3FF00F7B9639E6BE4CA2D0000000049454E44AE4260
+          82}
+        Name = 'PngImage4'
+        Background = clWindow
       end>
     Bitmap = {}
   end

Source/Modulos/Articulos/Views/uViewArticulos.pas

@@ -15,7 +15,7 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox,
   cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels,
   TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces,  
-  uArticulosController;
+  uArticulosController, uCustomView, uViewBase;
 
 type
   IViewArticulos = interface(IViewGrid)
@@ -35,22 +35,26 @@ type
     TBXSeparatorItem1: TTBXSeparatorItem;
     TBXSeparatorItem2: TTBXSeparatorItem;
     TBXItem4: TTBXItem;
-    actFabricante: TAction;
+    actProveedor: TAction;
     cxGridViewRecID: TcxGridDBColumn;
     cxGridViewID: TcxGridDBColumn;
     cxGridViewID_EMPRESA: TcxGridDBColumn;
     cxGridViewREFERENCIA: TcxGridDBColumn;
     cxGridViewDESCRIPCION: TcxGridDBColumn;
-    cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
     cxGridViewFAMILIA: TcxGridDBColumn;
-    cxGridViewFABRICANTE: TcxGridDBColumn;
+    cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn;
-    cxGridViewREFERENCIA_FABR: TcxGridDBColumn;
+    cxGridViewREFERENCIA_PROV: TcxGridDBColumn;
-    cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn;
+    cxGridViewPRECIO_COSTE: TcxGridDBColumn;
-    cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn;
+    cxGridViewPRECIO_NETO: TcxGridDBColumn;
+    cxGridViewCOMISIONABLE: TcxGridDBColumn;
+    cxGridViewTIENDA_WEB: TcxGridDBColumn;
+    cxGridViewDESCUENTO: TcxGridDBColumn;
+    cxGridViewPRECIO_PORTE: TcxGridDBColumn;
+    cxGridViewINVENTARIABLE: TcxGridDBColumn;
     procedure actFamiliaExecute(Sender: TObject);
     procedure actFamiliaUpdate(Sender: TObject);
-    procedure actFabricanteExecute(Sender: TObject);
+    procedure actProveedorExecute(Sender: TObject);
-    procedure actFabricanteUpdate(Sender: TObject);
+    procedure actProveedorUpdate(Sender: TObject);
     procedure cxGridView2DataControllerCompare(ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
       AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
     procedure frViewFiltroBase1eListaPropertiesChange(Sender: TObject);
@@ -109,24 +113,24 @@ begin
   FController := Value;
 end;
 
-procedure TfrViewArticulos.actFabricanteExecute(Sender: TObject);
+procedure TfrViewArticulos.actProveedorExecute(Sender: TObject);
 begin
-  if (cxGridViewFABRICANTE.GroupIndex < 0) then
+  if (cxGridViewNOMBRE_PROVEEDOR.GroupIndex < 0) then
   begin
-    cxGridViewFABRICANTE.GroupIndex := cxGridView.GroupedColumnCount;
+    cxGridViewNOMBRE_PROVEEDOR.GroupIndex := cxGridView.GroupedColumnCount;
-    cxGridViewFABRICANTE.Visible := False;
+    cxGridViewNOMBRE_PROVEEDOR.Visible := False;
   end
   else
   begin
-    cxGridViewFABRICANTE.GroupIndex := -1;
+    cxGridViewNOMBRE_PROVEEDOR.GroupIndex := -1;
-    cxGridViewFABRICANTE.Visible := True;
+    cxGridViewNOMBRE_PROVEEDOR.Visible := True;
   end;
 end;
 
-procedure TfrViewArticulos.actFabricanteUpdate(Sender: TObject);
+procedure TfrViewArticulos.actProveedorUpdate(Sender: TObject);
 begin
   inherited;
-  (Sender as TAction).Checked := not (cxGridViewFABRICANTE.GroupIndex < 0);
+  (Sender as TAction).Checked := not (cxGridViewNOMBRE_PROVEEDOR.GroupIndex < 0);
 end;
 
 procedure TfrViewArticulos.actFamiliaExecute(Sender: TObject);

Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas

@@ -15,7 +15,7 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox,
   cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels,
   TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces,  
-  uArticulosController, uViewArticulos;
+  uArticulosController, uViewArticulos, uCustomView, uViewBase;
 
 type
   TfrViewArticulosPorProveedor = class(TfrViewGrid, IViewArticulos)

Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm

@@ -2,34 +2,95 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
   ParentBiDiMode = False
   OnShow = CustomViewShow
   inherited ToolBar1: TToolBar
+    Height = 73
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
+      Top = 22
+      ExplicitTop = 22
+    end
     inherited FontSize: TEdit
+      Top = 22
       Width = 42
+      ExplicitTop = 22
       ExplicitWidth = 42
     end
     inherited UpDown1: TUpDown
       Left = 187
+      Top = 22
       Width = 17
       ExplicitLeft = 187
+      ExplicitTop = 22
       ExplicitWidth = 17
     end
     inherited ToolButton13: TToolButton
       Left = 204
+      Top = 22
       ExplicitLeft = 204
+      ExplicitTop = 22
     end
     inherited ToolButton6: TToolButton
       Left = 212
+      Top = 22
       ExplicitLeft = 212
+      ExplicitTop = 22
     end
     inherited ToolButton7: TToolButton
       Left = 278
+      Top = 22
       ExplicitLeft = 278
+      ExplicitTop = 22
     end
     inherited ToolButton8: TToolButton
       Left = 345
+      Top = 22
       ExplicitLeft = 345
+      ExplicitTop = 22
+    end
+    inherited ToolButton12: TToolButton
+      Left = 0
+      Top = 22
+      Wrap = True
+      ExplicitLeft = 0
+      ExplicitTop = 22
+      ExplicitHeight = 27
+    end
+    inherited ToolButton9: TToolButton
+      Left = 0
+      Top = 49
+      ExplicitLeft = 0
+      ExplicitTop = 49
+    end
+    inherited ToolButton10: TToolButton
+      Left = 145
+      Top = 49
+      ExplicitLeft = 145
+      ExplicitTop = 49
+    end
+    inherited ToolButton11: TToolButton
+      Left = 270
+      Top = 49
+      ExplicitLeft = 270
+      ExplicitTop = 49
     end
   end
   inherited cxGrid: TcxGrid
+    Top = 99
+    Height = 205
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
         MinWidth = 69
@@ -101,11 +162,13 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         Width = 80
       end
       inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Visible = True
         BestFitMaxWidth = 50
         HeaderAlignmentHorz = taRightJustify
         Width = 25
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+        Visible = True
         BestFitMaxWidth = 50
       end
       inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
@@ -118,6 +181,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
     end
   end
   inherited TBXDock1: TTBXDock
+    Top = 73
     inherited TBXToolbar1: TTBXToolbar
       inherited TBXSubmenuItem1: TTBXSubmenuItem
         object TBXSeparatorItem8: TTBXSeparatorItem [4]
@@ -130,6 +194,34 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
     end
   end
   inherited ActionListContenido: TActionList
+    inherited RichEditBold1: TRichEditBold
+      Enabled = False
+      Visible = False
+    end
+    inherited RichEditItalic1: TRichEditItalic
+      Enabled = False
+      Visible = False
+    end
+    inherited RichEditUnderline1: TRichEditUnderline
+      Enabled = False
+      Visible = False
+    end
+    inherited RichEditAlignLeft1: TRichEditAlignLeft
+      Enabled = False
+      Visible = False
+    end
+    inherited RichEditAlignCenter1: TRichEditAlignCenter
+      Enabled = False
+      Visible = False
+    end
+    inherited RichEditAlignRight1: TRichEditAlignRight
+      Enabled = False
+      Visible = False
+    end
+    inherited FontEdit1: TFontEdit
+      Enabled = False
+      Visible = False
+    end
     object actAnadirArticulos: TAction [12]
       Category = 'Operaciones'
       Caption = 'Art'#237'culos del cat'#225'logo'

Source/Modulos/Contactos/Controller/Contactos_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Contactos\Controller\Contactos_controller.res */
-/* C:\Codigo\Source\Modulos\Contactos\Controller\Contactos_controller.drf */
+/* c:\temp\dtf5A5.tmp */

Source/Modulos/Contactos/Data/Contactos_data.drc

@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleContactos.DFM */
+/* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleContactos.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleClientes.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleProveedores.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleEmpleados.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Data\uDataModuleAgentes.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Data\Contactos_data.res */
-/* C:\Codigo\Source\Modulos\Contactos\Data\Contactos_data.drf */
+/* c:\temp\dtf5A3.tmp */

Source/Modulos/Contactos/Model/Contactos_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Contactos\Model\Contactos_model.res */
-/* C:\Codigo\Source\Modulos\Contactos\Model\Contactos_model.drf */
+/* c:\temp\dtf5A1.tmp */

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -3,7 +3,7 @@ unit schContactosClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -730,7 +730,7 @@ type
   end;
 
   { TContactosDataTableRules }
-  TContactosDataTableRules = class(TDADataTableRules, IContactos)
+  TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -904,7 +904,7 @@ type
   end;
 
   { TGruposClienteDataTableRules }
-  TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
+  TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
   private
   protected
     { Property getters and setters }
@@ -993,7 +993,7 @@ type
   end;
 
   { TDatosBancariosDataTableRules }
-  TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
+  TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
   private
   protected
     { Property getters and setters }
@@ -1321,7 +1321,7 @@ type
   end;
 
   { TClientesDataTableRules }
-  TClientesDataTableRules = class(TDADataTableRules, IClientes)
+  TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -1824,7 +1824,7 @@ type
   end;
 
   { TProveedoresDataTableRules }
-  TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
+  TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2275,7 +2275,7 @@ type
   end;
 
   { TEmpleadosDataTableRules }
-  TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
+  TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
   private
     f_NOTAS: IROStrings;
     f_FORMACION_BASE: IROStrings;
@@ -2602,7 +2602,7 @@ type
   end;
 
   { TDireccionesContactoDataTableRules }
-  TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
+  TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2752,7 +2752,7 @@ type
   end;
 
   { TClientesDescuentosDataTableRules }
-  TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
+  TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
   private
   protected
     { Property getters and setters }
@@ -2817,7 +2817,7 @@ type
   end;
 
   { TGruposProveedorDataTableRules }
-  TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
+  TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
   private
   protected
     { Property getters and setters }
@@ -2864,7 +2864,7 @@ type
   end;
 
   { TGruposEmpleadoDataTableRules }
-  TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
+  TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
   private
   protected
     { Property getters and setters }
@@ -3024,7 +3024,7 @@ type
   end;
 
   { TContactos_RefreshDataTableRules }
-  TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
+  TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -3180,7 +3180,7 @@ type
   end;
 
   { TContratosEmpleadosDataTableRules }
-  TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados)
+  TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados)
   private
   protected
     { Property getters and setters }
@@ -3215,7 +3215,7 @@ type
   end;
 
   { TDescripcionesProveedoresDataTableRules }
-  TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores)
+  TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores)
   private
   protected
     { Property getters and setters }
@@ -3304,7 +3304,7 @@ type
   end;
 
   { TPersonalContactoDataTableRules }
-  TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto)
+  TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto)
   private
   protected
     { Property getters and setters }
@@ -3417,7 +3417,7 @@ type
   end;
 
   { TAgentes_ComisionesDataTableRules }
-  TAgentes_ComisionesDataTableRules = class(TDADataTableRules, IAgentes_Comisiones)
+  TAgentes_ComisionesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Comisiones)
   private
   protected
     { Property getters and setters }
@@ -3625,7 +3625,7 @@ type
   end;
 
   { TAgentesDataTableRules }
-  TAgentesDataTableRules = class(TDADataTableRules, IAgentes)
+  TAgentesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);

Source/Modulos/Contactos/Plugin/Contactos_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Contactos\Plugin\uPluginContactos.dfm */
 /* C:\Codigo\Source\Modulos\Contactos\Plugin\Contactos_plugin.res */
-/* C:\Codigo\Source\Modulos\Contactos\Plugin\Contactos_plugin.drf */
+/* c:\temp\dtf5A9.tmp */

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -49,57 +49,64 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="bdertl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
-    <DCCReference Include="ccpackD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
-    <DCCReference Include="cfpack_d11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cfpack_d11.dcp" />
-    <DCCReference Include="Contactos_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
-    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="dclcxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD11.dcp" />
-    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD11.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPSLnksD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="FormasPago_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
-    <DCCReference Include="FormasPago_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="JvGlobusD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
-    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="tb2k_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
-    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="TiposIVA_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
-    <DCCReference Include="TiposIVA_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorAgente.pas">
       <Form>fEditorAgente</Form>
@@ -205,7 +212,7 @@
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewClienteDatosComerciales.pas">
-      <Form>frViewAgenteComisiones</Form>
+      <Form>frViewClienteDatosComerciales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewClienteDescuentos.pas">
@@ -272,13 +279,6 @@
       <Form>frViewProveedores</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclactnband.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclshlctrls.dcp" />
-    <DCCReference Include="vclx.dcp" />
-    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contactos/Views/Contactos_view.drc

@@ -12,48 +12,48 @@ STRINGTABLE
 BEGIN
 END
 
-/* c:\codigo\source\modulos\contactos\views\uViewContactos.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewContactos.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorContactos.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorContactos.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewClientes.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewClientes.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorClientes.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorClientes.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewProveedores.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewProveedores.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorProveedores.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorProveedores.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewEmpleados.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewEmpleados.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorEmpleados.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorEmpleados.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewAgentes.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewAgentes.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorAgentes.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorAgentes.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorElegirClientes.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorElegirClientes.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewContacto.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewContacto.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewContactoDatosBancarios.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewContactoDatosBancarios.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewContactoListaDatosBancarios.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewContactoListaDatosBancarios.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewPersonalContacto.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewPersonalContacto.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorContacto.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorContacto.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewCliente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewCliente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewEmpleado.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewEmpleado.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewDireccionesEntrega.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewDireccionesEntrega.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewClienteDescuentos.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewClienteDescuentos.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewClienteDatosComerciales.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewClienteDatosComerciales.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorCliente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorCliente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewProveedor.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewProveedor.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewProveedorDatosComerciales.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewProveedorDatosComerciales.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorProveedor.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorProveedor.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewAgente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewAgente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewAgenteComisiones.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewAgenteComisiones.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorAgente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorAgente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorEmpleado.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorEmpleado.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorElegirProveedores.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorElegirProveedores.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorDireccion.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorDireccion.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorElegirDireccionEntrega.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorElegirDireccionEntrega.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorGruposCliente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorGruposCliente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorGruposProveedor.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorGruposProveedor.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorGruposEmpleado.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorGruposEmpleado.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorFichasEmpleadoReport.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorFichasEmpleadoReport.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorEtiquetasContactosReport.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorEtiquetasContactosReport.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorDatoBancario.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorDatoBancario.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorPersonal.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorPersonal.dfm */
-/* c:\codigo\source\modulos\contactos\views\uEditorElegirPersonaContacto.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uEditorElegirPersonaContacto.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewDatosYSeleccionProveedor.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewDatosYSeleccionProveedor.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewDatosYSeleccionCliente.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewDatosYSeleccionCliente.dfm */
-/* c:\codigo\source\modulos\contactos\views\uViewDatosYSeleccionClienteBase.dfm */
+/* C:\Codigo\Source\Modulos\Contactos\Views\uViewDatosYSeleccionClienteBase.dfm */
-/* c:\codigo\source\modulos\contactos\views\Contactos_view.res */
+/* C:\Codigo\Source\Modulos\Contactos\Views\Contactos_view.res */
-/* c:\codigo\source\modulos\contactos\views\Contactos_view.drf */
+/* C:\Codigo\Source\Modulos\Contactos\Views\Contactos_view.drf */

Source/Modulos/Contactos/Views/uEditorAgente.dfm

@@ -19,7 +19,7 @@ inherited fEditorAgente: TfEditorAgente
         000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
         4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
         80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
-        17110000171101CA26F33F0000040F49444154484BD595594C9C651486F5C22B
+        17100000171001186111DB0000040F49444154484BD595594C9C651486F5C22B
         4DBC6ABC7349AD56AD089434696AD548DDD2DA86DA54206026D029AB8896A626
         55AA8D315A2D8B8DD6428B550B52455A96863DB4D0B253F6656080D998056686
         7D29DBE3F70D8B343FDCC9857F7226F96FDEF73DCF3973FE07810736F491061B
@@ -132,7 +132,7 @@ inherited fEditorAgente: TfEditorAgente
   inherited pgPaginas: TPageControl
     Width = 864
     Height = 614
-    ActivePage = pagGeneral
+    ActivePage = pagDescuentos
     ExplicitWidth = 864
     ExplicitHeight = 614
     inherited pagGeneral: TTabSheet
@@ -221,6 +221,14 @@ inherited fEditorAgente: TfEditorAgente
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 587
           end
+          inherited eFechaBaja: TcxDBDateEdit
+            ExplicitWidth = 229
+            Width = 229
+          end
+          inherited eCausaBaja: TcxDBTextEdit
+            ExplicitWidth = 229
+            Width = 229
+          end
           inherited eTlfMovil: TcxDBTextEdit
             Left = 587
             Style.LookAndFeel.SkinName = ''
@@ -243,14 +251,6 @@ inherited fEditorAgente: TfEditorAgente
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
           end
-          inherited eFechaBaja: TcxDBDateEdit
-            ExplicitWidth = 229
-            Width = 229
-          end
-          inherited eCausaBaja: TcxDBTextEdit
-            ExplicitWidth = 229
-            Width = 229
-          end
           inherited eNIFCIF: TcxDBTextEdit
             Left = 285
             Style.LookAndFeel.SkinName = ''
@@ -337,7 +337,7 @@ inherited fEditorAgente: TfEditorAgente
       end
     end
     object pagDescuentos: TTabSheet [2]
-      Caption = 'Descuentos'
+      Caption = 'Comisiones'
       ImageIndex = 2
       inline frViewAgenteComisiones1: TfrViewAgenteComisiones
         Left = 0
@@ -353,14 +353,17 @@ inherited fEditorAgente: TfEditorAgente
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitLeft = 230
+        ExplicitWidth = 856
-        ExplicitTop = 91
+        ExplicitHeight = 586
         inherited cxGrid: TcxGrid
           Width = 856
           Height = 561
+          ExplicitWidth = 856
+          ExplicitHeight = 561
         end
         inherited ToolBar1: TToolBar
           Width = 856
+          ExplicitWidth = 856
         end
       end
     end

Source/Modulos/Contactos/Views/uEditorDireccion.dfm

@@ -4,22 +4,22 @@ object fEditorDireccion: TfEditorDireccion
   ActiveControl = eNombre
   BorderStyle = bsDialog
   Caption = 'Cambiar datos de la direcci'#243'n'
-  ClientHeight = 499
+  ClientHeight = 534
-  ClientWidth = 426
+  ClientWidth = 454
   Color = clBtnFace
   ParentFont = True
   OldCreateOrder = True
   Position = poOwnerFormCenter
   DesignSize = (
-    426
+    454
-    499)
+    534)
   PixelsPerInch = 96
   TextHeight = 13
   object Bevel1: TBevel
     Left = 8
     Top = 8
-    Width = 329
+    Width = 357
-    Height = 457
+    Height = 521
     Anchors = [akLeft, akTop, akRight]
     Shape = bsFrame
   end
@@ -120,15 +120,6 @@ object fEditorDireccion: TfEditorDireccion
     AutoSize = False
     Caption = 'Notas:'
   end
-  object Label10: TLabel
-    Left = 20
-    Top = 471
-    Width = 156
-    Height = 13
-    AutoSize = False
-    Caption = 'Coste del env'#237'o a esta direcci'#243'n:'
-    Visible = False
-  end
   object Label11: TLabel
     Left = 21
     Top = 275
@@ -145,8 +136,23 @@ object fEditorDireccion: TfEditorDireccion
     AutoSize = False
     Caption = 'Fax:'
   end
+  object Label10: TLabel
+    Left = 21
+    Top = 493
+    Width = 156
+    Height = 13
+    AutoSize = False
+    Caption = 'Coste del env'#237'o a esta direcci'#243'n:'
+  end
+  object Bevel2: TBevel
+    Left = 21
+    Top = 475
+    Width = 307
+    Height = 14
+    Shape = bsTopLine
+  end
   object OKBtn: TButton
-    Left = 343
+    Left = 371
     Top = 7
     Width = 75
     Height = 25
@@ -154,9 +160,10 @@ object fEditorDireccion: TfEditorDireccion
     Caption = '&Aceptar'
     ModalResult = 1
     TabOrder = 0
+    ExplicitLeft = 343
   end
   object CancelBtn: TButton
-    Left = 343
+    Left = 371
     Top = 38
     Width = 75
     Height = 25
@@ -165,6 +172,7 @@ object fEditorDireccion: TfEditorDireccion
     Caption = '&Cancelar'
     ModalResult = 2
     TabOrder = 1
+    ExplicitLeft = 343
   end
   object eDireccion: TDBEdit
     Left = 135
@@ -263,9 +271,27 @@ object fEditorDireccion: TfEditorDireccion
     ScrollBars = ssVertical
     TabOrder = 10
   end
+  object eMovil: TDBEdit
+    Left = 136
+    Top = 272
+    Width = 191
+    Height = 21
+    DataField = 'MOVIL'
+    DataSource = dsDireccion
+    TabOrder = 11
+  end
+  object eFax: TDBEdit
+    Left = 136
+    Top = 296
+    Width = 191
+    Height = 21
+    DataField = 'FAX'
+    DataSource = dsDireccion
+    TabOrder = 12
+  end
   object ePortes: TcxDBCurrencyEdit
     Left = 194
-    Top = 471
+    Top = 492
     DataBinding.DataField = 'PORTE'
     DataBinding.DataSource = dsDireccion
     Properties.UseThousandSeparator = True
@@ -277,27 +303,8 @@ object fEditorDireccion: TfEditorDireccion
     StyleFocused.LookAndFeel.NativeStyle = True
     StyleHot.LookAndFeel.Kind = lfStandard
     StyleHot.LookAndFeel.NativeStyle = True
-    TabOrder = 11
-    Visible = False
-    Width = 143
-  end
-  object eMovil: TDBEdit
-    Left = 136
-    Top = 272
-    Width = 191
-    Height = 21
-    DataField = 'MOVIL'
-    DataSource = dsDireccion
-    TabOrder = 12
-  end
-  object eFax: TDBEdit
-    Left = 136
-    Top = 296
-    Width = 191
-    Height = 21
-    DataField = 'FAX'
-    DataSource = dsDireccion
     TabOrder = 13
+    Width = 132
   end
   object dsDireccion: TDADataSource
     Left = 352

Source/Modulos/Contactos/Views/uEditorDireccion.pas

@@ -33,12 +33,13 @@ type
     Label8: TLabel;
     Label9: TLabel;
     eNotas: TDBMemo;
-    Label10: TLabel;
-    ePortes: TcxDBCurrencyEdit;
     Label11: TLabel;
     eMovil: TDBEdit;
     Label12: TLabel;
     eFax: TDBEdit;
+    Label10: TLabel;
+    ePortes: TcxDBCurrencyEdit;
+    Bevel2: TBevel;
     procedure PngSpeedButton3Click(Sender: TObject);
     procedure eMailPropertiesEditValueChanged(Sender: TObject);
     procedure eMailPropertiesValidate(Sender: TObject;

Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm

@@ -3,8 +3,8 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
   Top = 108
   BorderStyle = bsDialog
   Caption = 'Elegir una direcci'#243'n de cliente'
-  ClientHeight = 506
+  ClientHeight = 386
-  ClientWidth = 599
+  ClientWidth = 638
   Color = clBtnFace
   ParentFont = True
   OldCreateOrder = True
@@ -17,7 +17,7 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
   object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 656
+    Width = 638
     Height = 64
     Align = alTop
     BevelOuter = bvNone
@@ -27,12 +27,12 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     Padding.Right = 25
     Padding.Bottom = 8
     ParentBackground = False
-    TabOrder = 5
+    TabOrder = 2
     object lblTitle: TLabel
       AlignWithMargins = True
       Left = 25
       Top = 8
-      Width = 606
+      Width = 588
       Height = 13
       Margins.Left = 0
       Margins.Top = 0
@@ -46,28 +46,29 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
       Font.Name = 'Tahoma'
       Font.Style = [fsBold]
       ParentFont = False
-      ExplicitWidth = 135
+      ExplicitWidth = 199
     end
     object lblComments: TLabel
       AlignWithMargins = True
       Left = 50
       Top = 29
-      Width = 581
+      Width = 563
-      Height = 27
+      Height = 24
       Margins.Left = 25
       Margins.Top = 0
       Margins.Right = 0
       Align = alClient
-      ExplicitWidth = 3
+      Caption = 
-      ExplicitHeight = 13
+        'El cliente dispone de varias direcciones dadas de alta en su fic' +
-      Caption = 'El cliente dispone de varias direcciones dadas de alta en su fic' +
         'ha. Seleccione la direcci'#243'n del cliente que quiere utilizar.'
+      ExplicitWidth = 564
+      ExplicitHeight = 13
     end
   end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion
     Left = 0
-    Top = 457
+    Top = 337
-    Width = 599
+    Width = 638
     Height = 49
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
@@ -78,18 +79,18 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     ParentFont = False
     TabOrder = 0
     ReadOnly = False
-    ExplicitTop = 457
+    ExplicitTop = 337
-    ExplicitWidth = 599
+    ExplicitWidth = 638
     inherited JvFooter1: TJvFooter
-      Width = 599
+      Width = 638
-      ExplicitWidth = 599
+      ExplicitWidth = 638
       inherited bSeleccionar: TJvFooterBtn
-        Left = 387
+        Left = 426
         ExplicitLeft = 387
       end
       inherited bCancelar: TJvFooterBtn
-        Left = 491
+        Left = 530
-        ExplicitLeft = 491
+        ExplicitLeft = 530
       end
     end
     inherited BarraSeleccionActionList: TActionList
@@ -103,8 +104,8 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     end
   end
   object DBCtrlGrid1: TDBCtrlGrid
-    Left = 45
+    Left = 50
-    Top = 214
+    Top = 77
     Width = 539
     Height = 241
     Margins.Left = 10
@@ -275,177 +276,6 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
       OnDblClick = ComponenteDblClick
     end
   end
-  object rdxDestino1: TRadioButton
-    Left = 16
-    Top = 77
-    Width = 335
-    Height = 17
-    Action = actDirSocial
-    TabOrder = 2
-    TabStop = True
-  end
-  object RadioButton1: TRadioButton
-    Left = 16
-    Top = 193
-    Width = 335
-    Height = 17
-    Action = actOtro
-    TabOrder = 3
-    TabStop = True
-  end
-  object pnlDirSocial: TPanel
-    Left = 45
-    Top = 97
-    Width = 520
-    Height = 81
-    Color = clWindow
-    ParentBackground = False
-    TabOrder = 4
-    object DBText1: TDBText
-      Left = 8
-      Top = 5
-      Width = 497
-      Height = 17
-      DataField = 'NOMBRE'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object Label3: TLabel
-      Left = 13
-      Top = 23
-      Width = 27
-      Height = 13
-      Caption = 'Calle:'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      ParentFont = False
-    end
-    object DBText2: TDBText
-      Left = 46
-      Top = 23
-      Width = 465
-      Height = 17
-      DataField = 'CALLE'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object Label5: TLabel
-      Left = 13
-      Top = 40
-      Width = 49
-      Height = 13
-      Caption = 'Poblaci'#243'n:'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      ParentFont = False
-    end
-    object DBText3: TDBText
-      Left = 68
-      Top = 40
-      Width = 251
-      Height = 17
-      DataField = 'POBLACION'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object DBText4: TDBText
-      Left = 325
-      Top = 40
-      Width = 50
-      Height = 17
-      DataField = 'CODIGO_POSTAL'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object DBText5: TDBText
-      Left = 381
-      Top = 40
-      Width = 130
-      Height = 17
-      DataField = 'PROVINCIA'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object DBText7: TDBText
-      Left = 381
-      Top = 57
-      Width = 130
-      Height = 17
-      DataField = 'TELEFONO_1'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-    object Label6: TLabel
-      Left = 13
-      Top = 57
-      Width = 103
-      Height = 13
-      Caption = 'Persona de contacto:'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      ParentFont = False
-    end
-    object DBText6: TDBText
-      Left = 122
-      Top = 57
-      Width = 261
-      Height = 17
-      DataField = 'PERSONA_CONTACTO'
-      DataSource = dsContacto
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-      ParentFont = False
-      Transparent = True
-    end
-  end
   object dsDirecciones: TDADataSource
     Left = 16
     Top = 222

Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas

@@ -27,23 +27,11 @@ type
     Label1: TLabel;
     Label2: TLabel;
     Label4: TLabel;
-    rdxDestino1: TRadioButton;
-    RadioButton1: TRadioButton;
     ActionList1: TActionList;
     actDirSocial: TAction;
     actOtro: TAction;
     dsContacto: TDADataSource;
-    pnlDirSocial: TPanel;
+    pnlHeader: TPanel;
-    DBText1: TDBText;
-    Label3: TLabel;
-    DBText2: TDBText;
-    Label5: TLabel;
-    DBText3: TDBText;
-    DBText4: TDBText;
-    DBText5: TDBText;
-    DBText7: TDBText;
-    Label6: TLabel;
-    DBText6: TDBText;
     procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject);
     procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject);
     procedure DBCtrlGrid1DblClick(Sender: TObject);
@@ -162,38 +150,20 @@ end;
 function TfEditorElegirDireccionEntrega.GetDireccionSeleccionada: IBizDireccionesContacto;
 begin
   Result := FDireccionesController.Nuevo;
-  if actOtro.Checked then
+  with Result do
   begin
-    with Result do
+    ID := FDirecciones.ID;
-    begin
+    NOMBRE := FDirecciones.NOMBRE;
-      ID := FDirecciones.ID;
+    CALLE := FDirecciones.CALLE;
-      NOMBRE := FDirecciones.NOMBRE;
+    POBLACION := FDirecciones.POBLACION;
-      CALLE := FDirecciones.CALLE;
+    CODIGO_POSTAL := FDirecciones.CODIGO_POSTAL;
-      POBLACION := FDirecciones.POBLACION;
+    PROVINCIA := FDirecciones.PROVINCIA;
-      CODIGO_POSTAL := FDirecciones.CODIGO_POSTAL;
+    TELEFONO := FDirecciones.TELEFONO;
-      PROVINCIA := FDirecciones.PROVINCIA;
+    FAX := FDirecciones.FAX;
-      TELEFONO := FDirecciones.TELEFONO;
+    MOVIL := FDirecciones.MOVIL;
-      FAX := FDirecciones.FAX;
+    EMAIL := FDirecciones.EMAIL;
-      MOVIL := FDirecciones.MOVIL;
+    PERSONA_CONTACTO := FDirecciones.PERSONA_CONTACTO;
-      EMAIL := FDirecciones.EMAIL;
+    PORTE := FDirecciones.PORTE;
-      PERSONA_CONTACTO := FDirecciones.PERSONA_CONTACTO;
-    end;
-  end
-  else begin
-    with Result do
-    begin
-      DataTable.FieldByName('ID').AsVariant := Null;
-      NOMBRE := FContacto.NOMBRE;
-      CALLE := FContacto.CALLE;
-      POBLACION := FContacto.POBLACION;
-      CODIGO_POSTAL := FContacto.CODIGO_POSTAL;
-      PROVINCIA := FContacto.PROVINCIA;
-      TELEFONO := FContacto.TELEFONO_1;
-      FAX := FContacto.FAX;
-      MOVIL := FContacto.MOVIL_1;
-      EMAIL := FContacto.EMAIL_1;
-      PERSONA_CONTACTO := FContacto.PERSONA_CONTACTO;
-    end;
   end;
 end;
 
@@ -204,6 +174,7 @@ end;
 
 procedure TfEditorElegirDireccionEntrega.RefrescarEstado;
 begin
+{
   if (actOtro.Checked) then
   begin
     DBCtrlGrid1.Enabled := True;
@@ -225,10 +196,12 @@ begin
     ColorearTextoDirSocial(clWindowText);
     ColorearTextoDirOtra(clGray);
   end;
+}  
 end;
 
 procedure TfEditorElegirDireccionEntrega.ColorearTextoDirOtra(AColor: TColor);
 begin
+{
   eNombre.Font.Color := AColor;
   eCalle.Font.Color := AColor;
   ePoblacion.Font.Color := AColor;
@@ -236,10 +209,12 @@ begin
   eTelefono.Font.Color := AColor;
   ePersonaContacto.Font.Color := AColor;
   eCodigoPostal.Font.Color := AColor;
+}  
 end;
 
 procedure TfEditorElegirDireccionEntrega.ColorearTextoDirSocial(AColor: TColor);
 begin
+{
   DBText1.Font.Color := AColor;
   DBText2.Font.Color := AColor;
   DBText3.Font.Color := AColor;
@@ -247,6 +222,7 @@ begin
   DBText5.Font.Color := AColor;
   DBText6.Font.Color := AColor;
   DBText7.Font.Color := AColor;
+}  
 end;
 
 procedure TfEditorElegirDireccionEntrega.SetContacto(const Value: IBizContacto);

Source/Modulos/Contactos/Views/uViewAgente.dfm

@@ -154,6 +154,43 @@ inherited frViewAgente: TfrViewAgente
       ExplicitWidth = 239
       Width = 239
     end
+    object eFechaBaja: TcxDBDateEdit [14]
+      Left = 121
+      Top = 109
+      DataBinding.DataField = 'FECHA_BAJA'
+      DataBinding.DataSource = dsContacto
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 4
+      Width = 229
+    end
+    object eCausaBaja: TcxDBTextEdit [15]
+      Left = 121
+      Top = 136
+      DataBinding.DataField = 'CAUSA_BAJA'
+      DataBinding.DataSource = dsContacto
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Color = clWindow
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 5
+      Width = 229
+    end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 231
       Style.LookAndFeel.SkinName = ''
@@ -188,43 +225,6 @@ inherited frViewAgente: TfrViewAgente
       ExplicitWidth = 137
       Width = 137
     end
-    object eFechaBaja: TcxDBDateEdit [17]
-      Left = 121
-      Top = 109
-      DataBinding.DataField = 'FECHA_BAJA'
-      DataBinding.DataSource = dsContacto
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.NativeStyle = True
-      Style.ButtonStyle = bts3D
-      Style.PopupBorderStyle = epbsFrame3D
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
-      Width = 229
-    end
-    object eCausaBaja: TcxDBTextEdit [18]
-      Left = 121
-      Top = 136
-      DataBinding.DataField = 'CAUSA_BAJA'
-      DataBinding.DataSource = dsContacto
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.Color = clWindow
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
-      Width = 229
-    end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
       Left = 485
       Style.LookAndFeel.SkinName = ''
@@ -299,18 +299,11 @@ inherited frViewAgente: TfrViewAgente
           inherited dxLayoutControlContactoGroup2: TdxLayoutGroup
             inherited dxLayoutControlContactoItem10: TdxLayoutItem
               Caption = 'Tlf. trabajo:'
-              Visible = False
             end
             inherited dxLayoutControlContactoItem9: TdxLayoutItem
               Caption = 'Tlf. particular:'
               Visible = False
             end
-            inherited dxLayoutControlContactoItem12: TdxLayoutItem
-              Visible = False
-            end
-          end
-          inherited dxLayoutControlContactoGroup5: TdxLayoutGroup
-            Visible = False
           end
         end
       end

Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm

@@ -9,14 +9,14 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
     Left = 0
     Top = 0
     Width = 725
-    Height = 209
+    Height = 217
     Align = alTop
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
     object Label1: TLabel
-      Left = 435
+      Left = 445
       Top = 28
       Width = 227
       Height = 26
@@ -34,7 +34,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Shape = bsBottomLine
     end
     object eDiasVencimiento1: TcxDBSpinEdit
-      Left = 507
+      Left = 517
       Top = 60
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_1'
       DataBinding.DataSource = dsDatosComerciales
@@ -154,7 +154,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 121
     end
     object bFormasPago: TButton
-      Left = 273
+      Left = 283
       Top = 55
       Width = 132
       Height = 21
@@ -198,7 +198,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 121
     end
     object bTiposIVA: TButton
-      Left = 273
+      Left = 283
       Top = 82
       Width = 132
       Height = 21
@@ -233,7 +233,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 190
     end
     object eDiasVencimiento2: TcxDBSpinEdit
-      Left = 507
+      Left = 517
       Top = 87
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_2'
       DataBinding.DataSource = dsDatosComerciales
@@ -260,7 +260,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 79
     end
     object eDiasVencimiento3: TcxDBSpinEdit
-      Left = 507
+      Left = 517
       Top = 114
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_3'
       DataBinding.DataSource = dsDatosComerciales

Source/Modulos/Fabricantes/Data/Fabricantes_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Fabricantes\Data\uDataModuleFabricantes.dfm */
 /* C:\Codigo\Source\Modulos\Fabricantes\Data\Fabricantes_data.res */
-/* c:\temp\dtf159.tmp */
+/* c:\temp\dtf5B7.tmp */

Source/Modulos/Fabricantes/Model/Fabricantes_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Fabricantes\Model\Fabricantes_model.res */
-/* c:\temp\dtf157.tmp */
+/* c:\temp\dtf5B5.tmp */

Source/Modulos/Fabricantes/Plugin/uPluginFabricantes.dfm

@@ -53,7 +53,9 @@ object PluginFabricantes: TPluginFabricantes
     object actFabricantes: TAction
       Category = 'Datos'
       Caption = 'Fabricantes'
+      Enabled = False
       ImageIndex = 0
+      Visible = False
       OnExecute = actFabricantesExecute
     end
   end

Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Controller\FacturasCliente_controller.res */
-/* c:\temp\dtf1A7.tmp */
+/* c:\temp\dtf605.tmp */

Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas

@@ -177,7 +177,8 @@ begin
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
   if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
      if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+//       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
      else
        ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;

Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.res */
-/* c:\temp\dtf1A5.tmp */
+/* c:\temp\dtf603.tmp */

Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.res */
-/* c:\temp\dtf1A3.tmp */
+/* c:\temp\dtf601.tmp */

Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
-/* c:\temp\dtf1FB.tmp */
+/* c:\temp\dtf64B.tmp */

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk

@@ -33,7 +33,6 @@ requires
   Contactos_view,
   Articulos_view,
   AlbCli_FacCli_relation,
-  PreCli_FacCli_relation,
   GestorInformes_controller,
   rtl,
   vcl;

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj

@@ -58,7 +58,6 @@
     <DCCReference Include="..\FacturasCliente_model.dcp" />
     <DCCReference Include="..\GestorInformes_controller.dcp" />
     <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\PreCli_FacCli_relation.dcp" />
     <DCCReference Include="..\rtl.dcp" />
     <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uDialogOpcionesImpresionFacturasCliente.pas">

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc

@@ -24,4 +24,4 @@ END
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
-/* c:\temp\dtf1F9.tmp */
+/* c:\temp\dtf649.tmp */

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm

@@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     Width = 842
     ExplicitWidth = 842
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 842
+      ExplicitWidth = 740
       object TBXSubmenuItem2: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas

@@ -83,7 +83,7 @@ implementation
 
 uses
   uDataModuleFacturasCliente, uDataModuleUsuarios, uAlbaranesClienteController, uFactuGES_App,
-  uGenerarFacturasCliAlbCliUtils, uGenerarFacturasCliPreCliUtils,
+  uGenerarFacturasCliAlbCliUtils, //uGenerarFacturasCliPreCliUtils,
   uBizAlbaranesCliente, uGestorInformesController, uDialogOpcionesImpresionFacturasCliente,
   uEditorBase,  uGridStatusUtils, uDBSelectionListUtils, udialogUtils;
 
@@ -365,7 +365,7 @@ begin
   begin
     case JsNuevaFacturaDialog.CustomButtonResult of
       200   : begin   // Utilizar presupuestos
-                GenerarFacturaCliPre;
+//                GenerarFacturaCliPre;
                 actRefrescar.Execute;
               end;
       300   : begin   // Utilizar albaranes

Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Controller\FacturasProveedor_controller.res */
-/* c:\temp\dtf1D1.tmp */
+/* c:\temp\dtf62F.tmp */

Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas

@@ -162,9 +162,10 @@ begin
   if Assigned(AField) then
      ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
 
-  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
+
-  if Assigned(AField) then
+//  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
-     ADetalles.DataTable.FieldByName(fld_FacturasProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
+//  if Assigned(AField) then
+//     ADetalles.DataTable.FieldByName(fld_FacturasProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
 end;
 
 procedure TDetallesFacturaProveedorController.ValidarCampos(DataTable: TDADataTable);

Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Data\uDataModuleFacturasProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Data\FacturasProveedor_data.res */
-/* c:\temp\dtf1CF.tmp */
+/* c:\temp\dtf62D.tmp */

Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Model\FacturasProveedor_model.res */
-/* c:\temp\dtf1CD.tmp */
+/* c:\temp\dtf62B.tmp */

Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Plugin\uPluginFacturasProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.res */
-/* c:\temp\dtf20F.tmp */
+/* c:\temp\dtf65F.tmp */

Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */
-/* c:\temp\dtf163.tmp */
+/* c:\temp\dtf5C1.tmp */

Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */
 /* C:\Codigo\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */
-/* c:\temp\dtf161.tmp */
+/* c:\temp\dtf5BF.tmp */

Source/Modulos/Inventario/Controller/Inventario_controller.dpk

@@ -29,8 +29,6 @@ requires
   Inventario_data,
   Articulos_controller,
   Almacenes_controller,
-  PresupuestosCliente_model,
-  PresupuestosCliente_controller,
   PedidosProveedor_controller,
   PedidosProveedor_model,
   Obras_controller,

Source/Modulos/Inventario/Controller/Inventario_controller.dproj

@@ -46,16 +46,14 @@
     <DelphiCompile Include="Inventario_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Almacenes_controller.dcp" />
+    <DCCReference Include="..\Almacenes_controller.dcp" />
-    <DCCReference Include="..\..\..\Articulos_controller.dcp" />
+    <DCCReference Include="..\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\..\Inventario_data.dcp" />
+    <DCCReference Include="..\Inventario_data.dcp" />
-    <DCCReference Include="..\..\..\Inventario_model.dcp" />
+    <DCCReference Include="..\Inventario_model.dcp" />
-    <DCCReference Include="..\..\..\Obras_controller.dcp" />
+    <DCCReference Include="..\Obras_controller.dcp" />
-    <DCCReference Include="..\..\..\Obras_model.dcp" />
+    <DCCReference Include="..\Obras_model.dcp" />
-    <DCCReference Include="..\..\..\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="..\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\..\..\PedidosProveedor_model.dcp" />
+    <DCCReference Include="..\PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\..\..\PresupuestosCliente_controller.dcp" />
-    <DCCReference Include="..\..\..\PresupuestosCliente_model.dcp" />
     <DCCReference Include="..\Utiles\uInventarioUtils.pas">
       <Form>dmInventarioUtils</Form>
       <DesignClass>TDataModule</DesignClass>

Source/Modulos/Inventario/Controller/uInventarioController.pas

@@ -6,8 +6,9 @@ interface
 uses
   Classes, SysUtils, uDADataTable, uControllerBase, uEditorDBItem,
   uIDataModuleInventario, uBizInventario, uArticulosInventarioController,
-  uAlmacenesController, uObrasController, uPresupuestosClienteController,
+  uAlmacenesController, uObrasController, //uPresupuestosClienteController,
-  uBizPresupuestosCliente, uPedidosProveedorController, uBizPedidosProveedor,
+  //uBizPresupuestosCliente,
+  uPedidosProveedorController, uBizPedidosProveedor,
   uBizArticulos, uBizAlmacenes, uBizObras;
 
 
@@ -60,17 +61,17 @@ type
     FAlmacenesController: IAlmacenesController;
     FObrasController: IObrasController;
     FArticulosController : IArticulosInventarioController;
-    FPresupuestosClienteController : IPresupuestosClienteController;
+//    FPresupuestosClienteController : IPresupuestosClienteController;
     FPedidosProveedorController : IPedidosProveedorController;
     function GetAlmacenesController: IAlmacenesController;
     function GetObrasController: IObrasController;
     function GetArticulosController: IArticulosInventarioController;
-    function GetPresupuestosClienteController: IPresupuestosClienteController;
+//    function GetPresupuestosClienteController: IPresupuestosClienteController;
     function GetPedidosProveedorController: IPedidosProveedorController;
     procedure SetAlmacenesController(const Value: IAlmacenesController);
     procedure SetObrasController(const Value: IObrasController);
     procedure SetArticulosController(const Value: IArticulosInventarioController);
-    procedure SetPresupuestosClienteController(const Value: IPresupuestosClienteController);
+//    procedure SetPresupuestosClienteController(const Value: IPresupuestosClienteController);
     procedure SetPedidosProveedorController(const Value: IPedidosProveedorController);
 
     function Liberar(AInventario : IBizInventario; Todos: Boolean): Boolean; overload;
@@ -102,7 +103,7 @@ type
     property AlmacenesController: IAlmacenesController read GetAlmacenesController write SetAlmacenesController;
     property ObrasController: IObrasController read GetObrasController write SetObrasController;
     property ArticulosController: IArticulosInventarioController read GetArticulosController write SetArticulosController;
-    property PresupuestosClienteController: IPresupuestosClienteController read GetPresupuestosClienteController write SetPresupuestosClienteController;
+//    property PresupuestosClienteController: IPresupuestosClienteController read GetPresupuestosClienteController write SetPresupuestosClienteController;
     property PedidosProveedorController: IPedidosProveedorController read GetPedidosProveedorController write SetPedidosProveedorController;
 
     constructor Create; override;
@@ -367,7 +368,7 @@ begin
   FArticulosController := TArticulosInventarioController.Create;
   FAlmacenesController := TAlmacenesController.Create;
   FObrasController := TObrasController.Create;  
-  FPresupuestosClienteController := TPresupuestosClienteController.Create;
+//  FPresupuestosClienteController := TPresupuestosClienteController.Create;
   FPedidosProveedorController := TPedidosProveedorController.Create;
 end;
 
@@ -400,7 +401,7 @@ begin
   FArticulosController := Nil;
   FAlmacenesController := Nil;
   FObrasController := Nil;  
-  FPresupuestosClienteController := Nil;
+//  FPresupuestosClienteController := Nil;
   FPedidosProveedorController := Nil;    
   inherited;
 end;
@@ -854,10 +855,12 @@ begin
   FArticulosController := Value
 end;
 
+{
 procedure TInventarioController.SetPresupuestosClienteController(const Value: IPresupuestosClienteController);
 begin
   FPresupuestosClienteController := Value
 end;
+}
 
 procedure TInventarioController.SetPedidosProveedorController(const Value: IPedidosProveedorController);
 begin
@@ -1016,10 +1019,12 @@ begin
   Result := FArticulosController;
 end;
 
+{
 function TInventarioController.GetPresupuestosClienteController: IPresupuestosClienteController;
 begin
   Result := FPresupuestosClienteController;
 end;
+}
 
 function TInventarioController.GetPedidosProveedorController: IPedidosProveedorController;
 begin

Source/Modulos/Inventario/Plugin/uPluginInventario.dfm

@@ -175,7 +175,9 @@ object PluginInventario: TPluginInventario
     object actInventarioObras: TAction
       Category = 'Log'#237'stica'
       Caption = 'Inventario obras'
+      Enabled = False
       ImageIndex = 1
+      Visible = False
       OnExecute = actInventarioObrasExecute
     end
   end

Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.res */
-/* c:\temp\dtf1AD.tmp */
+/* c:\temp\dtf60B.tmp */

Source/Modulos/Pedidos a proveedor/Controller/uDetallesPedidoProveedorController.pas

@@ -147,9 +147,9 @@ begin
   if Assigned(AField) then
      ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
 
-  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
+//  AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
-  if Assigned(AField) then
+//  if Assigned(AField) then
-     ADetalles.DataTable.FieldByName(fld_PedidosProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
+//     ADetalles.DataTable.FieldByName(fld_PedidosProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
 end;
 
 procedure TDetallesPedidoProveedorController.ValidarCampos(DataTable: TDADataTable);

Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Data\uDataModulePedidosProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Data\PedidosProveedor_data.res */
-/* c:\temp\dtf1AB.tmp */
+/* c:\temp\dtf609.tmp */

Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Model\PedidosProveedor_model.res */
-/* c:\temp\dtf1A9.tmp */
+/* c:\temp\dtf607.tmp */

Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Plugin\uPluginPedidosProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.res */
-/* c:\temp\dtf207.tmp */
+/* c:\temp\dtf657.tmp */

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc

@@ -30,4 +30,4 @@ END
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Views\uEditorDireccionEntregaPedidoProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Views\uEditorSituacionPedidoProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos a proveedor\Views\PedidosProveedor_view.res */
-/* c:\temp\dtf205.tmp */
+/* c:\temp\dtf655.tmp */

Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas

@@ -230,7 +230,7 @@ begin
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
   if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
      if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
      else
        ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;

Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Recibos de cliente\Data\uDataModuleRecibosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Recibos de cliente\Data\RecibosCliente_data.res */
-/* c:\temp\dtf185.tmp */
+/* c:\temp\dtf5E3.tmp */

Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Recibos de cliente\Plugin\uPluginRecibosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.res */
-/* c:\temp\dtf18B.tmp */
+/* c:\temp\dtf5E9.tmp */

Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Recibos de proveedor\Data\uDataModuleRecibosProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Recibos de proveedor\Data\RecibosProveedor_data.res */
-/* c:\temp\dtf1B1.tmp */
+/* c:\temp\dtf60F.tmp */

Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Recibos de proveedor\Plugin\uPluginRecibosProveedor.dfm */
 /* C:\Codigo\Source\Modulos\Recibos de proveedor\Plugin\RecibosProveedor_plugin.res */
-/* c:\temp\dtf1B7.tmp */
+/* c:\temp\dtf615.tmp */

Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
 /* C:\Codigo\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* c:\temp\dtf127.tmp */
+/* c:\temp\dtf585.tmp */

Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* c:\temp\dtf125.tmp */
+/* c:\temp\dtf583.tmp */

Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Unidades de medida\Data\uDataModuleUnidadesMedida.dfm */
 /* C:\Codigo\Source\Modulos\Unidades de medida\Data\UnidadesMedida_data.res */
-/* c:\temp\dtf13B.tmp */
+/* c:\temp\dtf599.tmp */

Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Unidades de medida\Model\UnidadesMedida_model.res */
-/* c:\temp\dtf139.tmp */
+/* c:\temp\dtf597.tmp */

Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm

@@ -42,7 +42,9 @@ object PluginUnidadesMedida: TPluginUnidadesMedida
     object actUnidadesMedida: TAction
       Category = 'Datos'
       Caption = 'Unidades de medida'
+      Enabled = False
       ImageIndex = 0
+      Visible = False
       OnExecute = actUnidadesMedidaExecute
     end
   end

Source/Servicios/FactuGES.RODL

@@ -880,6 +880,38 @@
 </Interface>
 </Interfaces>
 </Service>
+<Service Name="srvPedidosCliente" UID="{7491FEBB-7312-408A-BB2F-9E4141BA8C87}" Ancestor="DataAbstractService">
+<Interfaces>
+<Interface Name="Default" UID="{9AAB5A2E-DCC0-455C-B22D-39186EA1E273}">
+<Operations>
+<Operation Name="GenerarInforme" UID="{B802C067-33D2-4FD1-A480-37D8EEC690B1}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirPrecio" DataType="Boolean" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirRefProveedor" DataType="Boolean" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
+<Operation Name="GenerarInformeEnPDF" UID="{004F8ECE-D3D5-45DB-A482-D1F3F520B13D}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirPrecio" DataType="Boolean" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirRefProveedor" DataType="Boolean" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
+</Operations>
+</Interface>
+</Interfaces>
+</Service>
 </Services>
 <EventSinks>
 </EventSinks>

Source/Servicios/FactuGES_Intf.pas

@@ -52,6 +52,7 @@ const
   IsrvProvinciasPoblaciones_IID : TGUID = '{551D8756-51AE-4929-B235-107CD7B05C38}';
   IsrvGestorDocumentos_IID : TGUID = '{2FFB4EEA-F314-442C-920A-E1D37F378929}';
   IsrvGestorInformes_IID : TGUID = '{9ACA4D42-EA9A-4D2C-B233-19CD299EAE91}';
+  IsrvPedidosCliente_IID : TGUID = '{9AAB5A2E-DCC0-455C-B22D-39186EA1E273}';
 
   { Event ID's }
 
@@ -86,6 +87,7 @@ type
   IsrvProvinciasPoblaciones = interface;
   IsrvGestorDocumentos = interface;
   IsrvGestorInformes = interface;
+  IsrvPedidosCliente = interface;
 
   TRdxEmpresasArray = class;
   TIntegerArray = class;
@@ -825,6 +827,27 @@ type
                                           const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
   end;
 
+  { IsrvPedidosCliente }
+  IsrvPedidosCliente = interface(IDataAbstractService)
+    ['{9AAB5A2E-DCC0-455C-B22D-39186EA1E273}']
+    function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+  end;
+
+  { CosrvPedidosCliente }
+  CosrvPedidosCliente = class
+    class function Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvPedidosCliente;
+  end;
+
+  { TsrvPedidosCliente_Proxy }
+  TsrvPedidosCliente_Proxy = class(TDataAbstractService_Proxy, IsrvPedidosCliente)
+  protected
+    function __GetInterfaceName:string; override;
+
+    function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+  end;
+
 implementation
 
 uses
@@ -2615,6 +2638,58 @@ begin
   end
 end;
 
+{ CosrvPedidosCliente }
+
+class function CosrvPedidosCliente.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvPedidosCliente;
+begin
+  result := TsrvPedidosCliente_Proxy.Create(aMessage, aTransportChannel);
+end;
+
+{ TsrvPedidosCliente_Proxy }
+
+function TsrvPedidosCliente_Proxy.__GetInterfaceName:string;
+begin
+  result := 'srvPedidosCliente';
+end;
+
+function TsrvPedidosCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
+    __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Write('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
+function TsrvPedidosCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF');
+    __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Write('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 initialization
   RegisterROClass(TRdxLoginInfo);
   RegisterROClass(TRdxEmpresasArray);
@@ -2648,6 +2723,7 @@ initialization
   RegisterProxyClass(IsrvProvinciasPoblaciones_IID, TsrvProvinciasPoblaciones_Proxy);
   RegisterProxyClass(IsrvGestorDocumentos_IID, TsrvGestorDocumentos_Proxy);
   RegisterProxyClass(IsrvGestorInformes_IID, TsrvGestorInformes_Proxy);
+  RegisterProxyClass(IsrvPedidosCliente_IID, TsrvPedidosCliente_Proxy);
 
 
 finalization
@@ -2683,5 +2759,6 @@ finalization
   UnregisterProxyClass(IsrvProvinciasPoblaciones_IID);
   UnregisterProxyClass(IsrvGestorDocumentos_IID);
   UnregisterProxyClass(IsrvGestorInformes_IID);
+  UnregisterProxyClass(IsrvPedidosCliente_IID);
 
 end.

Source/Servicios/FactuGES_Invk.pas

@@ -305,6 +305,16 @@ type
     procedure Invoke_GenerarInformeListadoPedidos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
+  TsrvPedidosCliente_Invoker = class(TDataAbstractService_Invoker)
+  private
+  protected
+  public
+    constructor Create; override;
+  published
+    procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+  end;
+
 implementation
 
 uses
@@ -2215,5 +2225,81 @@ begin
   end;
 end;
 
+{ TsrvPedidosCliente_Invoker }
+
+constructor TsrvPedidosCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+procedure TsrvPedidosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
+var
+  ListaID: FactuGES_Intf.TIntegerArray;
+  ImprimirPrecio: Boolean;
+  ImprimirRefProveedor: Boolean;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaID := nil;
+  lResult := nil;
+  try
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Read('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
+
+    lResult := (__Instance as IsrvPedidosCliente).GenerarInforme(ListaID, ImprimirPrecio, ImprimirRefProveedor);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvPedidosCliente', 'GenerarInformeResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(ListaID);
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
+procedure TsrvPedidosCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
+var
+  ListaID: FactuGES_Intf.TIntegerArray;
+  ImprimirPrecio: Boolean;
+  ImprimirRefProveedor: Boolean;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaID := nil;
+  lResult := nil;
+  try
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Read('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
+
+    lResult := (__Instance as IsrvPedidosCliente).GenerarInformeEnPDF(ListaID, ImprimirPrecio, ImprimirRefProveedor);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvPedidosCliente', 'GenerarInformeEnPDFResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(ListaID);
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 initialization
 end.