Recolocar todos los módulos del menú principal para que salgan en el orden correcto.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@54 f4e31baf-9722-1c47-927c-6f952f962d4b

Source/Cliente/uPantallaPrincipal.dfm

@@ -512,7 +512,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
     Left = 248
     Top = 168
     object Archivo2_OLD: TMenuItem
-      Tag = -9000
+      Tag = -90000
       Caption = 'Archivo'
       object Cambiarmicontrasea2_OLD: TMenuItem
         Tag = 1
@@ -537,7 +537,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
       end
     end
     object Edicin1_OLD: TMenuItem
-      Tag = -8000
+      Tag = -80000
       Caption = 'Ver'
       object Paneldeexploracin1: TMenuItem
         Action = actVerPanel
@@ -548,7 +548,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
       end
     end
     object Opciones1_OLD: TMenuItem
-      Tag = -7000
+      Tag = -70000
       Caption = 'Opciones'
       object Configuraractualizaciones1: TMenuItem
         Tag = 100
@@ -576,18 +576,18 @@ object fPantallaPrincipal: TfPantallaPrincipal
       end
     end
     object Ayuda2_OLD: TMenuItem
-      Tag = -6000
+      Tag = -60000
       Caption = 'Ayuda'
       object Acercade2_OLD: TMenuItem
         Action = actAcerca
       end
     end
     object N1: TMenuItem
-      Tag = -5001
+      Tag = -1
       Caption = '|'
     end
     object Empresa1_OLD: TMenuItem
-      Tag = -1000
+      Tag = 1000
       Caption = 'Empresa'
       object Listadeempresas1_OLD: TMenuItem
         Caption = 'Lista de empresas'
@@ -602,17 +602,53 @@ object fPantallaPrincipal: TfPantallaPrincipal
         OnClick = Informacindeempresa1Click
       end
     end
+    object Datos1: TMenuItem
+      Tag = 2000
+      Caption = 'Datos'
+      object N5: TMenuItem
+        Tag = 200
+        Caption = '-'
+      end
+      object N6: TMenuItem
+        Tag = 300
+        Caption = '-'
+      end
+    end
     object Logstica1: TMenuItem
-      Tag = 100
+      Tag = 3000
       Action = actLogisticaMenu
+      object N7: TMenuItem
+        Tag = 200
+        Caption = '-'
+      end
+      object N8: TMenuItem
+        Tag = 300
+        Caption = '-'
+      end
     end
     object Compras1: TMenuItem
-      Tag = 1000
+      Tag = 4000
       Action = actMenuCompras
+      object N9: TMenuItem
+        Tag = 200
+        Caption = '-'
+      end
+      object N10: TMenuItem
+        Tag = 300
+        Caption = '-'
+      end
     end
     object Ventas1: TMenuItem
-      Tag = 3000
+      Tag = 5000
       Action = actVentasMenu
+      object N3: TMenuItem
+        Tag = 200
+        Caption = '-'
+      end
+      object N4: TMenuItem
+        Tag = 300
+        Caption = '-'
+      end
     end
   end
   object JvXPMenuItemPainter1: TJvXPMenuItemPainter

Source/Cliente/uPantallaPrincipal.pas

@@ -81,6 +81,15 @@ type
     N2: TMenuItem;
     Usuarios1: TMenuItem;
     Perfiles1: TMenuItem;
+    N3: TMenuItem;
+    N4: TMenuItem;
+    Datos1: TMenuItem;
+    N5: TMenuItem;
+    N6: TMenuItem;
+    N7: TMenuItem;
+    N8: TMenuItem;
+    N9: TMenuItem;
+    N10: TMenuItem;
     procedure FormCreate(Sender: TObject);
     procedure Salir1Click(Sender: TObject);
     procedure actSalirExecute(Sender: TObject);

Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm

@@ -271,11 +271,11 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente
     object Compras1: TMenuItem
       Caption = 'Ventas'
       object AlbaranesdeCliente1: TMenuItem
-        Tag = 104
+        Tag = 210
         Action = actAlbaranesCliente
       end
       object Ordenesdedevolucin1: TMenuItem
-        Tag = 105
+        Tag = 211
         Action = actAlbaranesDevCliente
       end
     end

Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm

@@ -271,11 +271,11 @@ object PluginAlbaranesProveedor: TPluginAlbaranesProveedor
     object Compras1: TMenuItem
       Caption = 'Compras'
       object AlbaranesdeProveedor1: TMenuItem
-        Tag = 104
+        Tag = 210
         Action = actAlbaranesProveedor
       end
       object rdenesdedevolucin1: TMenuItem
-        Tag = 105
+        Tag = 211
         Action = actDevolucionesProveedor
       end
     end

Source/Modulos/Almacenes/Plugin/uPluginAlmacenes.dfm

@@ -59,7 +59,7 @@ object PluginAlmacenes: TPluginAlmacenes
     object Ventas1: TMenuItem
       Caption = 'Log'#237'stica'
       object Almacenes1: TMenuItem
-        Tag = 101
+        Tag = 110
         Action = actAlmacenes
       end
     end

Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm

@@ -55,7 +55,7 @@ object PluginArticulos: TPluginArticulos
     object N1: TMenuItem
       Caption = 'Log'#237'stica'
       object Articulos1: TMenuItem
-        Tag = 100
+        Tag = 101
         Action = actArticulos
       end
     end

Source/Modulos/Contactos/Plugin/uPluginContactos.dfm

@@ -254,33 +254,34 @@ object PluginContactos: TPluginContactos
     Images = SmallImages
     Left = 40
     Top = 16
+    object Da1: TMenuItem
+      Caption = 'Datos'
+      object Gruposdeproveedor1: TMenuItem
+        Tag = 101
+        Action = actGruposProveedor
+        SubMenuImages = SmallImages
+      end
+      object GruposCliente1: TMenuItem
+        Tag = 102
+        Action = actGruposCliente
+      end
+      object Categoriasdeempleado1: TMenuItem
+        Tag = 103
+        Action = actGruposEmpleado
+      end
+    end
     object Compras1: TMenuItem
-      Tag = 200
       Caption = '&Compras'
       SubMenuImages = SmallImages
       GroupIndex = 1
       OnClick = actProveedoresExecute
       object Proveedores1: TMenuItem
-        Tag = 100
+        Tag = 101
         Action = actProveedores
         SubMenuImages = SmallImages
       end
-      object N2: TMenuItem
-        Tag = 101
-        Caption = '-'
-      end
-      object Datosauxiliares2: TMenuItem
-        Tag = 999999
-        Caption = 'Datos auxiliares'
-        SubMenuImages = SmallImages
-        object Gruposdeproveedor1: TMenuItem
-          Action = actGruposProveedor
-          SubMenuImages = SmallImages
-        end
-      end
     end
     object Ventas1: TMenuItem
-      Tag = 400
       Caption = '&Ventas'
       SubMenuImages = SmallImages
       GroupIndex = 1
@@ -294,23 +295,6 @@ object PluginContactos: TPluginContactos
         Action = actEmpleados
         SubMenuImages = SmallImages
       end
-      object N4: TMenuItem
-        Tag = 103
-        Caption = '-'
-      end
-      object DatosAuxiliares1: TMenuItem
-        Tag = 99999
-        Caption = 'Datos auxiliares'
-        SubMenuImages = SmallImages
-        object GruposCliente1: TMenuItem
-          Tag = 201
-          Action = actGruposCliente
-        end
-        object Categoriasdeempleado1: TMenuItem
-          Tag = 202
-          Action = actGruposEmpleado
-        end
-      end
     end
   end
   object SmallImages: TPngImageList

Source/Modulos/Contactos/Plugin/uPluginContactos.pas

@@ -24,16 +24,14 @@ type
     Resumen1: TMenuItem;
     SmallImages: TPngImageList;
     Ventas1: TMenuItem;
-    N2: TMenuItem;
     actEmpleados: TAction;
     Vendedores1: TMenuItem;
-    N4: TMenuItem;
     actGruposCliente: TAction;
     actGruposProveedor: TAction;
     actGruposEmpleado: TAction;
     Categoriasdeempleado1: TMenuItem;
-    Datosauxiliares2: TMenuItem;
     Gruposdeproveedor1: TMenuItem;
+    Da1: TMenuItem;
     procedure actClientesExecute(Sender: TObject);
     procedure actProveedoresExecute(Sender: TObject);
     procedure actEmpleadosExecute(Sender: TObject);

Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm

@@ -60,12 +60,8 @@ object PluginFacturasCliente: TPluginFacturasCliente
       Caption = '&Ventas'
       GroupIndex = 1
       ImageIndex = 0
-      object N1: TMenuItem
-        Tag = 11999
-        Caption = '-'
-      end
       object Facturasdecliente1: TMenuItem
-        Tag = 106
+        Tag = 301
         Action = actFacturasCliente
       end
     end

Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Ventas1: TMenuItem;
     Facturasdecliente1: TMenuItem;
-    N1: TMenuItem;
     procedure actFacturasClienteExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.dfm

@@ -60,12 +60,8 @@ object PluginFacturasProveedor: TPluginFacturasProveedor
       Caption = '&Compras'
       GroupIndex = 1
       ImageIndex = 0
-      object N1: TMenuItem
-        Tag = 11999
-        Caption = '-'
-      end
       object Facturasdeproveedor1: TMenuItem
-        Tag = 106
+        Tag = 301
         Action = actFacturasProveedor
       end
     end

Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Compras1: TMenuItem;
     Facturasdeproveedor1: TMenuItem;
-    N1: TMenuItem;
     procedure actFacturasProveedorExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Familias/Plugin/uPluginFamilias.dfm

@@ -23,7 +23,7 @@ object PluginFamilias: TPluginFamilias
     Top = 72
     object actFamilias: TAction
       Category = 'Familias'
-      Caption = 'Familias'
+      Caption = 'Familias de art'#237'culos'
       ImageIndex = 0
       OnExecute = actFamiliasExecute
     end
@@ -33,11 +33,7 @@ object PluginFamilias: TPluginFamilias
     Left = 40
     Top = 16
     object Ventas1: TMenuItem
-      Caption = 'Empresa'
+      Caption = 'Datos'
-      object N1: TMenuItem
-        Tag = 18990
-        Caption = '-'
-      end
       object Familias1: TMenuItem
         Tag = 19000
         Action = actFamilias

Source/Modulos/Familias/Plugin/uPluginFamilias.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Ventas1: TMenuItem;
     Familias1: TMenuItem;
-    N1: TMenuItem;
     procedure actFamiliasExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj

@@ -47,19 +47,18 @@
     <DelphiCompile Include="FormasPago_plugin.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
+    <DCCReference Include="..\FormasPago_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
+    <DCCReference Include="..\FormasPago_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_view.dcp" />
+    <DCCReference Include="..\FormasPago_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\PluginSDK_D10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uPluginFormasPago.pas" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm

@@ -62,13 +62,9 @@ object PluginFormasPago: TPluginFormasPago
     Left = 40
     Top = 16
     object Ventas1: TMenuItem
-      Caption = 'Empresa'
+      Caption = 'Datos'
-      object N1: TMenuItem
-        Tag = 18990
-        Caption = '-'
-      end
       object FormasPago1: TMenuItem
-        Tag = 19001
+        Tag = 301
         Action = actFormasPago
       end
     end

Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Ventas1: TMenuItem;
     FormasPago1: TMenuItem;
-    N1: TMenuItem;
     procedure actFormasPagoExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.dfm

@@ -154,12 +154,8 @@ object PluginHistoricoMovimientos: TPluginHistoricoMovimientos
     Top = 16
     object HistoricoMovimientos1: TMenuItem
       Caption = 'Log'#237'stica'
-      object N1: TMenuItem
-        Tag = 889
-        Caption = '-'
-      end
       object HistoricoMovimiento1: TMenuItem
-        Tag = 103
+        Tag = 301
         Action = actHistoricoMovimientos
       end
     end

Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     HistoricoMovimientos1: TMenuItem;
     HistoricoMovimiento1: TMenuItem;
-    N1: TMenuItem;
     procedure actHistoricoMovimientosExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Inventario/Plugin/uPluginInventario.dfm

@@ -60,12 +60,8 @@ object PluginInventario: TPluginInventario
     Top = 16
     object Logstica1: TMenuItem
       Caption = 'Log'#237'stica'
-      object N1: TMenuItem
-        Tag = 889
-        Caption = '-'
-      end
       object Inventario1: TMenuItem
-        Tag = 103
+        Tag = 201
         Action = actInventario
       end
     end

Source/Modulos/Inventario/Plugin/uPluginInventario.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Logstica1: TMenuItem;
     Inventario1: TMenuItem;
-    N1: TMenuItem;
     procedure actInventarioExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;

Source/Modulos/Pedidos a proveedor/Plugin/uPluginPedidosProveedor.dfm

@@ -63,7 +63,7 @@ object PluginPedidosProveedor: TPluginPedidosProveedor
     object Compras1: TMenuItem
       Caption = 'Compras'
       object Pedidosaproveedor1: TMenuItem
-        Tag = 101
+        Tag = 201
         Action = actPedidosProveedor
       end
     end

Source/Modulos/Presupuestos de cliente/Plugin/uPluginPresupuestosCliente.dfm

@@ -145,13 +145,13 @@ object PluginPresupuestosCliente: TPluginPresupuestosCliente
     end
   end
   object MainMenu: TMainMenu
-    Images = LargeImages
+    Images = SmallImages
     Left = 40
     Top = 16
     object Ventas1: TMenuItem
       Caption = 'Ventas'
       object PresupuestosdeCliente1: TMenuItem
-        Tag = 103
+        Tag = 201
         Action = actPresupuestosCliente
       end
     end

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm

@@ -1906,7 +1906,7 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
       FD84C20B8417C3AA789405239826E0CBCE4F98979E10344C33B0BE630473D312
       82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA
       1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082}
-    Instruction.Text = 'Generar a partir del pedido...'
+    Instruction.Text = 'Generar a partir del presupuesto...'
     Instruction.Glyph.Data = {
       0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
       00001C0806000000720DDF940000000970485973000017120000171201679FD2
@@ -1944,9 +1944,9 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
         Default = True
         Info.Strings = (
           
-            'Se generar'#225' un albar'#225'n de cliente basado en este pedido. Solo se' +
+            'Se generar'#225' un albar'#225'n de cliente basado en este presupuesto. So' +
-            ' tendr'#225'n en cuenta aquellos art'#237'culos que existan en el cat'#225'logo' +
+            'lo se tendr'#225'n en cuenta aquellos art'#237'culos que existan en el cat' +
-            ' y sean inventariables.'
+            #225'logo y sean inventariables.'
           '')
       end
       item
@@ -2260,12 +2260,12 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
     Instruction.Icon = tdiCustom
     CustomButtons = <
       item
-        Caption = 'Previsualizar el pedido/s seleccionado/s'
+        Caption = 'Previsualizar el presupuesto/s seleccionado/s'
         Value = 100
         Default = True
       end
       item
-        Caption = 'Previsualizar la lista de pedidos actual'
+        Caption = 'Previsualizar la lista de presupuestos actual'
         Value = 200
       end>
     ButtonBar.Buttons = [cbCancel]
@@ -2571,12 +2571,12 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
     Instruction.Icon = tdiCustom
     CustomButtons = <
       item
-        Caption = 'Imprimir el pedido/s seleccionado/s'
+        Caption = 'Imprimir el presupuesto/s seleccionado/s'
         Value = 100
         Default = True
       end
       item
-        Caption = 'Imprimir la lista de pedidos actual'
+        Caption = 'Imprimir la lista de presupuesto actual'
         Value = 200
       end>
     ButtonBar.Buttons = [cbCancel]
@@ -2847,8 +2847,8 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
       82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA
       1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082}
     Instruction.Text = 
-      'Los siguientes pedidos no han podido ser eliminados, porque tien' +
+      'Los siguientes presupuestos no han podido ser eliminados, porque' +
-      'en albaranes asociados'
+      ' tienen albaranes asociados'
     Instruction.Glyph.Data = {
       0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
       00001C0806000000720DDF940000000970485973000017120000171201679FD2

Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm

@@ -1,18 +1,126 @@
 inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
+  Width = 933
+  inherited ToolBar1: TToolBar
+    Width = 933
+    Height = 24
+    inherited ToolButton4: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
+      Left = 368
+      Top = 0
+      ExplicitLeft = 368
+      ExplicitTop = 0
+    end
+    inherited FontSize: TEdit
+      Left = 513
+      Top = 0
+      ExplicitLeft = 513
+      ExplicitTop = 0
+    end
+    inherited UpDown1: TUpDown
+      Left = 555
+      Top = 0
+      ExplicitLeft = 555
+      ExplicitTop = 0
+    end
+    inherited ToolButton13: TToolButton
+      Left = 572
+      Top = 0
+      ExplicitLeft = 572
+      ExplicitTop = 0
+    end
+    inherited ToolButton6: TToolButton
+      Left = 580
+      Top = 0
+      ExplicitLeft = 580
+      ExplicitTop = 0
+    end
+    inherited ToolButton7: TToolButton
+      Left = 614
+      Top = 0
+      ExplicitLeft = 614
+      ExplicitTop = 0
+    end
+    inherited ToolButton8: TToolButton
+      Left = 648
+      Top = 0
+      ExplicitLeft = 648
+      ExplicitTop = 0
+    end
+    inherited ToolButton12: TToolButton
+      Left = 682
+      Top = 0
+      ExplicitLeft = 682
+      ExplicitTop = 0
+    end
+    inherited ToolButton9: TToolButton
+      Left = 690
+      Top = 0
+      ExplicitLeft = 690
+      ExplicitTop = 0
+    end
+    inherited ToolButton10: TToolButton
+      Left = 724
+      Top = 0
+      ExplicitLeft = 724
+      ExplicitTop = 0
+    end
+    inherited ToolButton11: TToolButton
+      Left = 758
+      Top = 0
+      ExplicitLeft = 758
+      ExplicitTop = 0
+    end
+  end
   inherited cxGrid: TcxGrid
+    Top = 50
+    Width = 933
+    Height = 254
     inherited cxGridView: TcxGridDBTableView
-      inherited cxGridViewID: TcxGridDBColumn
-        Visible = False
-      end
-      inherited cxGridViewPOSICION: TcxGridDBColumn
-        Visible = False
-      end
       inherited cxGridViewTIPO: TcxGridDBColumn
-        Visible = False
+        Width = 51
+      end
+      inherited cxGridViewREFERENCIA: TcxGridDBColumn
+        Width = 74
+      end
+      inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
+        Width = 82
+      end
+      inherited cxGridViewDESCRIPCION: TcxGridDBColumn
+        Width = 440
+      end
+      inherited cxGridViewCANTIDAD: TcxGridDBColumn
+        Width = 55
+      end
+      inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
+        Width = 54
+      end
+      inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Width = 28
+      end
+      inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+        Width = 65
       end
       inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
         Visible = False
       end
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
+        Width = 68
+      end
+    end
+  end
+  inherited TBXDock1: TTBXDock
+    Top = 24
+    Width = 933
+    inherited TBXToolbar1: TTBXToolbar
+      ExplicitWidth = 548
     end
   end
 end

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm

@@ -1,10 +1,10 @@
 inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
-  Width = 596
+  Width = 931
   Height = 479
-  ExplicitWidth = 596
+  ExplicitWidth = 931
   ExplicitHeight = 479
   inherited cxGrid: TcxGrid
-    Width = 596
+    Width = 931
     Height = 351
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
@@ -36,7 +36,7 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
-        Visible = False
+        OnCustomDrawCell = cxGridViewIDCustomDrawCell
         BestFitMaxWidth = 22
         MinWidth = 22
         Options.HorzSizing = False
@@ -71,37 +71,39 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
         BestFitMaxWidth = 25
         Width = 68
       end
+      object cxGridViewSITUACION: TcxGridDBColumn
+        Caption = 'Situaci'#243'n'
+        DataBinding.FieldName = 'SITUACION'
+        Width = 48
+      end
       object cxGridViewFECHA_PRESUPUESTO: TcxGridDBColumn
         Caption = 'Fecha presupuesto'
         DataBinding.FieldName = 'FECHA_PRESUPUESTO'
         BestFitMaxWidth = 45
         SortIndex = 0
         SortOrder = soDescending
-        Width = 45
+        Width = 68
-      end
-      object cxGridViewSITUACION: TcxGridDBColumn
-        DataBinding.FieldName = 'SITUACION'
-        Width = 69
       end
       object cxGridViewFECHA_DECISION: TcxGridDBColumn
         Caption = 'Fecha decisi'#243'n'
         DataBinding.FieldName = 'FECHA_DECISION'
         BestFitMaxWidth = 45
-        Width = 45
+        Width = 60
       end
       object cxGridViewNIF_CIF: TcxGridDBColumn
         Caption = 'NIF/CIF'
         DataBinding.FieldName = 'NIF_CIF'
+        Width = 54
       end
       object cxGridViewNOMBRE: TcxGridDBColumn
         Caption = 'Nombre'
         DataBinding.FieldName = 'NOMBRE'
-        Width = 69
+        Width = 349
       end
       object cxGridViewCLIENTE_FINAL: TcxGridDBColumn
         Caption = 'Cliente final'
         DataBinding.FieldName = 'CLIENTE_FINAL'
-        Visible = False
+        Width = 137
       end
       object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn
         Caption = 'Importe total'
@@ -110,7 +112,7 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
         Properties.Alignment.Horz = taRightJustify
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
-        Width = 69
+        Width = 89
       end
       object cxGridViewFACTURA: TcxGridDBColumn
         Caption = 'Ref. factura'
@@ -123,6 +125,7 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <>
       DataController.Summary.SummaryGroups = <>
+      OptionsView.NewItemRowInfoText = 'Click here to add a new row'
     end
     inherited cxGridLevel: TcxGridLevel
       Caption = 'Todos'
@@ -138,12 +141,12 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
-    Width = 596
+    Width = 931
     ExplicitWidth = 596
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 596
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 596
+        Width = 931
         ExplicitWidth = 596
         inherited txtFiltroTodo: TcxTextEdit
           ExplicitWidth = 273
@@ -154,17 +157,17 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 251
+          Left = 383
-          ExplicitLeft = 251
+          ExplicitLeft = 383
           ExplicitWidth = 294
           Width = 294
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 596
+        Width = 931
         ExplicitWidth = 596
         inherited tbxBotones: TTBXToolbar
-          Width = 586
+          Width = 921
           ExplicitWidth = 586
         end
       end
@@ -176,10 +179,10 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
     ExplicitTop = 453
     ExplicitWidth = 596
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-      Width = 596
+      Width = 931
       ExplicitWidth = 596
       inherited TBXToolbar1: TTBXToolbar
-        Width = 586
+        Width = 921
         ExplicitWidth = 586
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
@@ -187,21 +190,29 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
           Action = actCliente
         end
         object TBXSeparatorItem1: TTBXSeparatorItem
+          Visible = False
         end
         object TBXItem2: TTBXItem
           Action = actProvincia
+          Visible = False
         end
       end
     end
   end
   inherited dxComponentPrinter: TdxComponentPrinter
+    Top = 184
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 38673.741107951390000000
       BuiltInReportLink = True
     end
   end
+  inherited dxPSEngineController1: TdxPSEngineController
+    Left = 296
+    Top = 160
+  end
   inherited cxStyleRepository1: TcxStyleRepository
     Left = 248
+    Top = 160
     object cxStylePENDIENTES: TcxStyle
       AssignedValues = [svTextColor]
       TextColor = clGreen
@@ -214,7 +225,8 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
     end
   end
   inherited cxViewGridPopupMenu: TcxGridPopupMenu
-    Left = 288
+    Left = 272
+    Top = 176
   end
   inherited ActionList1: TActionList
     object actCliente: TAction
@@ -238,102 +250,22 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
       item
         PngImage.Data = {
           89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-          610000000970485973000017120000171201679FD2520000014B4944415478DA
+          610000000970485973000017120000171201679FD252000001774944415478DA
-          6364C007F47A8C9999FE9F6162FCCFF0FB2F9309C3A592B31CC61DFF7F9CAD60
+          63FCFFFF3FC384055BFF3390010A12BC1919610600394469FAF3F71FC3EF3F7F
-          0449F398B6FF67C4A79FD9A0FBFFDF0BA56035EC469DFF7F9E2B87AB0769FE72
+          192CBCB3192EEE99856A80C35E4B14C5079C8F836964F1ED368718662EDFC530
-          BA9211AF01AC865DFF7F9F2F03AB41B719A419C4C66B001BD0805F5003B84C3A
+          7FC9464C03F0815FBFFF826D06D10BD7EDC36E00BA0BB0815586BB18966D3A84
-          FE7F3B53C188AC59D0A20DBF17909DCD6DD2FEFFEB994A0CF5780D00052217DB
+          DB0098B341E01F50EECF9F7F709B034F3B312CD3DDC1B06ADB11FC06C05CB2CB
-          9F338C0CFF19BEFE620507226906100118B327BDFCFFE7EF6F86BF7F20F80F8C
+          EE0883DB211BB8CD61E7DD18166A6E6558BFEB387E03D06DFEFDE70F981F75D9
-          FEFB07C14762FFF9FD0B48FF82D2BF1918D3FB9FFCB734944631F5CFDF7F0CBF
+          8361AEEA2686CDFB4EE136609FD33106A77D56605BD79BEE033B1B044036C75F
-          7EFF65F809C67FE0EC5F403688FEF1EB0F185F3AB2938131A5FBFE7F1B530592
+          F76698AEB88161E7A133B80D00391BDDE69FBFFE30FC028AA5DFF567E8975CCD
-          35FFF8F597E1DAB16D0C8C89EDB7FEDB5BAA92AC1944DF3ABE858131B6F9EA7F
+          70F0D4454C0372623D195C0E58A384F862ED6D0CB157BDC0EC2972EB18721E05
-          675B2D923583F0BD139B1918A3EA2FFC77B2D32559F3AF3F7F191E9CD8C0C018
+          317489AE643876EE32A601E9916E605BFEFCFE07B639E2A23BC37CF52D60B1DF
-          5673E6BF838D1EC99A41006C4070C5F1FF84A2EA3732FFF76F301B9E0EFEFFFF
+          BF21B8F0792843ABE03286D397AE611A9018EA0CD70CF202CC6674D0C0BB98E1
-          4F514202003F5091819E0016AB0000000049454E44AE426082}
+          C2B59B9806C40638C23583FC8D6CF36F688C80F0BF7FFF192EDDB8856940848F
-        Name = 'PngImage1'
+          2DC38A2D8789CE89180680044805200300115980F04CC063740000000049454E
-        Background = clWindow
+          44AE426082}
-      end
-      item
-        PngImage.Data = {
-          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-          610000000970485973000017120000171201679FD2520000010E4944415478DA
-          63648001BD9EFF0CC8E052092350CC18C83A031531018A9D05AB03C941F530A2
-          180093C026862E0FE5230B10B40D1B1BD546749BB16922CA0BF80C400384BC80
-          2986D300320163F0AC3BFFFFFEFECBF0E70F100369301BCA87B1FFFE81F2FFFC
-          63F8FDEB0FC31F20FE0D9203D28C01536FFE6F705663F80033F20784FA00657F
-          4016FB815003129F367B3503A3CFC46BFF4BDC3549D208634F9CB79C81D1A3E7
-          F2FF4375E638FDD8B6EE2B8646984573672C6660746DBFF0FF68B3154E03CA96
-          7DC56A3B08CC98BD8081D1B1E9ECFF783B23BC4E45D7080353A6CE6160B4AD3B
-          F53FD8CA94248D303061C24C0646ABCAE3FF0945D59F5F7F816C3431200D4E07
-          FFFFFF67A00400007E51EECD81D1728E0000000049454E44AE426082}
-        Name = 'PngImage2'
-        Background = clWindow
-      end
-      item
-        PngImage.Data = {
-          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-          610000000970485973000017120000171201679FD252000000F54944415478DA
-          6364D0EBF9CF70A98411481B3330309C61800013A0D8591C6210F52000643322
-          19802281530C06A07CF20C4062936E00D5BC00058C24072286011402C6EC492F
-          FFFFF9FB9BE1EF1F08FE03A3FFFE41F091D87F7EFF02D2BFA0F46F06C6F4FE27
-          FF2D0DA5514CFDF3F71FC3AFDF7F197E82F11F38FB17900DA27FFCFA03C6978E
-          EC64604CE9BEFFDFC6548164CD3F7EFD65B8766C1B036362FBADFF2B9B0DC8F2
-          BF9C7D2303636CF3D5FF6BDB4DC93240CAAA868131AAFEC27F273B5DA29D0D63
-          FFFAF397E1C1890D0C8C613567FE3BD8E891AC1904C00604571CFF4F28AA7E23
-          F37FFF06B3E1E9E0FFFFFF1425240089FD645E7C3F344D0000000049454E44AE
-          426082}
         Name = 'PngImage0'
         Background = clWindow
-      end
-      item
-        PngImage.Data = {
-          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-          61000000097048597300000AEB00000AEB01828B0D5A0000027F4944415478DA
-          95926D48535118C79FDB268AA54485D62C4C50962CDC87F5416D9AB966CEA440
-          A4E84D828C304C89B217DB87D00F65252B69422F9A4161D6A0507C6D595A6450
-          83CC55787129CE19949B6DD3DDEDDE9D73BABB561835D3030FCF39E739FFDFF3
-          C2A1608EF5A1467A415632783A589C100254B0A0EB5A623A9392DCD365B89DBE
-          FF3CBC5830C0DD9DD726922B34EFDAEB5B53F75972170470D4C8E461DB724D78
-          091139AC66F4FC5E9BA24007FDF3064C75E6DE7DE94BD8DBDC4A834615014B5D
-          BD8D6985E37BE6056074D2B544934357DCFA1CD2FBEA1B6C908742E96EAFBFFB
-          7E5FE2A15A18FA2FC0F978B35E9CBAE94895EE2DB474D82053B918CA4BA2A1BF
-          D37823B3D879784E80BB36298ADA98368C97937043F3185CACA1E164F12AD89E
-          1509132316E659BB39A14807B6A000E74365A5282D43EB67BFC020FD1D76159A
-          C0502785D8984580B8691830BEA9561F634EFC1340AAA4111E55C60817859611
-          E4038EF34256FE6BE86C5A0F807D4010035F2DA3EE1EA32DEEA81EEC7F0126EF
-          288E87A8D597389F8DC28280858ACB9FE06C690CBFF702E60DB153E463EF70C5
-          D632EEDC1F00FA6A7CA824397D888B46AB671EF300CC826DDC092B5710411CB0
-          406C62D86EEFEA72C69DAA07F76FC0645DD241B15A7D93E3C6A85FE2471D5E68
-          6872C1CE1C2FE46BF0AC2A1842F7B9CBB2CFF8AB05007900A26949819995E075
-          184D43A0FF400B95575CD0FED4010A9907AAB5E1BC9801EC9FA9C261656D0346
-          7FFC8106E2A55C7A591EA551197CC84A1121BB4FC8346AF540CB1307A8950462
-          25E8670B8CD01E6611B198C445D9E5DC75EABD7E4DA32B322C05630F3F15BE54
-          82788F788FF9E9FB679D9110C781FBC077B753433BB478CB0F7C3B8CF0987D51
-          CF0000000049454E44AE426082}
-        Name = 'PngImage3'
-        Background = clWindow
-      end
-      item
-        PngImage.Data = {
-          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-          61000001E34944415478DAA5932D72E43010855F98D934341BC1858261D10D76
-          8E3047305C1685051A067A59A0E042E70682863D6C608719EE6B399EADDABFAA
-          AD7595CAB2DCFDF5EB1FDDE13F9FBB9F0FF258225F27AEC415D109B05A35C3CC
-          EF32E653FD2380CE035F4388720C41609DC2D68ABA28B42688E1820E79CAE7E9
-          17407316E4788F43E8033CF2F46D42F804E8E29084E0A2ACBE7B90E9798334C0
-          40D9145AC2BD1E8591A58B5CFE27406D462915EA59AD4A70812CF142FBD3340E
-          750764113C8648C9A214E20A0C762560A1A925A662A8FDD0D48A06846B782220
-          6F80E732C7181F14858079CB69895B1D57D6824BBB99FF4A03C9952134BD9597
-          21ED008BF1F341F52BAA3035098CC23428DB561A70D53EC39888EFB941D4F45E
-          5EB2DC0021A6035BC56A0F306660BD1B464A3DB5A8B00CED89606A62B201A61D
-          90CB8C3E3EA03BD2F002BD8EF4550FB441D421532B62658D02CFC4C2DBFC9AD3
-          0EC86CDBA349DC24B2F7BA8E2D227BCF9CFD3CB573EC69409EE6D731EF804899
-          EC4F3CB6D631927623FFD48F5AC84741B1B572D58B4FEB5CC67A1BA4739ECE34
-          18D185435DE756B070B5CDB17305B63BB741A2F38F41BA41BE38C4324D8FE6C6
-          3E0FBE7CEF15F602716877E7DF5EA6F330B6CBC4F6A55641CAE69EC973245714
-          97FDD7DBF8AFCF7740E00D20BA266C3A0000000049454E44AE426082}
-        Name = 'PngImage4'
-        Background = clWindow
       end>
     Left = 56
     Top = 48

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas

@@ -62,6 +62,9 @@ type
     procedure actProvinciaUpdate(Sender: TObject);
     procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X,
       Y: Integer);
+    procedure cxGridViewIDCustomDrawCell(Sender: TcxCustomGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      var ADone: Boolean);
 
   private
     //Filtros relativos a la vista
@@ -194,6 +197,19 @@ begin
   ADone := True;
 end;
 
+procedure TfrViewPresupuestosCliente.cxGridViewIDCustomDrawCell(
+  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  R := AViewInfo.ContentBounds;
+  ACanvas.FillRect(R);
+  ACanvas.DrawImage(PngImageList, R.Left, R.Top, 0);
+  ADone := True;
+end;
+
 procedure TfrViewPresupuestosCliente.cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
 var
   Site     : TcxGridSite;

Source/Modulos/Recibos de cliente/Plugin/uPluginRecibosCliente.dfm

@@ -61,7 +61,7 @@ object PluginRecibosCliente: TPluginRecibosCliente
     object Compras1: TMenuItem
       Caption = 'Ventas'
       object RecibosdeCliente1: TMenuItem
-        Tag = 106
+        Tag = 310
         Action = actRecibosCliente
       end
     end

Source/Modulos/Recibos de proveedor/Plugin/uPluginRecibosProveedor.dfm

@@ -61,7 +61,7 @@ object PluginRecibosProveedor: TPluginRecibosProveedor
     object Compras1: TMenuItem
       Caption = 'Compras'
       object RecibosdeProveedor1: TMenuItem
-        Tag = 106
+        Tag = 310
         Action = actRecibosProveedor
       end
     end

Source/Modulos/Remesas de cliente/Plugin/uPluginRemesasCliente.dfm

@@ -64,7 +64,7 @@ object PluginRemesasCliente: TPluginRemesasCliente
     object N1: TMenuItem
       Caption = 'Ventas'
       object RemesasCliente1: TMenuItem
-        Tag = 107
+        Tag = 320
         Action = actRemesasCliente
       end
     end

Source/Modulos/Remesas de proveedor/Plugin/uPluginRemesasProveedor.dfm

@@ -64,7 +64,7 @@ object PluginRemesasProveedor: TPluginRemesasProveedor
     object N1: TMenuItem
       Caption = 'Compras'
       object RemesasProveedor1: TMenuItem
-        Tag = 107
+        Tag = 320
         Action = actRemesasProveedor
       end
     end

Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm

@@ -52,13 +52,9 @@ object PluginTiposIVA: TPluginTiposIVA
     Left = 40
     Top = 16
     object Ventas1: TMenuItem
-      Caption = 'Empresa'
+      Caption = 'Datos'
-      object N1: TMenuItem
-        Tag = 18990
-        Caption = '-'
-      end
       object TiposIVA1: TMenuItem
-        Tag = 19002
+        Tag = 310
         Action = actTiposIVA
       end
     end

Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.pas

@@ -20,7 +20,6 @@ type
     SmallImages: TPngImageList;
     Ventas1: TMenuItem;
     TiposIVA1: TMenuItem;
-    N1: TMenuItem;
     procedure actTiposIVAExecute(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;