diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index bf3bf4ea..cc32d99b 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/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
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 10f2f4b1..157aa24f 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/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);
diff --git a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
index ac065ea0..51da0574 100644
--- a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
+++ b/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
diff --git a/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm
index 0bf39351..da32d192 100644
--- a/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm
+++ b/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
diff --git a/Source/Modulos/Almacenes/Plugin/uPluginAlmacenes.dfm b/Source/Modulos/Almacenes/Plugin/uPluginAlmacenes.dfm
index 02a6d44f..56038e53 100644
--- a/Source/Modulos/Almacenes/Plugin/uPluginAlmacenes.dfm
+++ b/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
diff --git a/Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm b/Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm
index 0ac32d65..4144b60d 100644
--- a/Source/Modulos/Articulos/Plugin/uPluginArticulos.dfm
+++ b/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
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
index 71f28cc3..9568f911 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
+++ b/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
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
index cfd710cf..00ef3898 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
+++ b/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);
diff --git a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm
index 34f5ed8e..23dc28a3 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm
+++ b/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
diff --git a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.pas
index 04f70c9f..172e2359 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.pas
+++ b/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;
diff --git a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.dfm
index e27a3735..c237584b 100644
--- a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.dfm
+++ b/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
diff --git a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas
index 7ca5aa11..d7948777 100644
--- a/Source/Modulos/Facturas de proveedor/Plugin/uPluginFacturasProveedor.pas
+++ b/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;
diff --git a/Source/Modulos/Familias/Plugin/uPluginFamilias.dfm b/Source/Modulos/Familias/Plugin/uPluginFamilias.dfm
index 2c5b0ba3..54d891a0 100644
--- a/Source/Modulos/Familias/Plugin/uPluginFamilias.dfm
+++ b/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'
- object N1: TMenuItem
- Tag = 18990
- Caption = '-'
- end
+ Caption = 'Datos'
object Familias1: TMenuItem
Tag = 19000
Action = actFamilias
diff --git a/Source/Modulos/Familias/Plugin/uPluginFamilias.pas b/Source/Modulos/Familias/Plugin/uPluginFamilias.pas
index 67e8fd46..6c4e154d 100644
--- a/Source/Modulos/Familias/Plugin/uPluginFamilias.pas
+++ b/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;
diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj
index f8913308..aa09e22e 100644
--- a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj
+++ b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj
@@ -47,19 +47,18 @@
MainSource
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-