diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 7c41528..17ab1f6 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -35,9 +35,9 @@ begin LoadModule('Articulos_plugin.bpl'); {$ENDIF} - LoadModule('PresupuestosCliente_plugin.bpl'); - LoadModule('AlbaranesCliente_plugin.bpl'); - LoadModule('ContratosCliente_plugin.bpl'); +// LoadModule('PresupuestosCliente_plugin.bpl'); +// LoadModule('AlbaranesCliente_plugin.bpl'); +// LoadModule('ContratosCliente_plugin.bpl'); LoadModule('RecibosCliente_plugin.bpl'); LoadModule('FacturasCliente_plugin.bpl'); @@ -48,11 +48,11 @@ begin LoadModule('AlbaranesProveedor_plugin.bpl'); {$ENDIF} - LoadModule('RecibosProveedor_plugin.bpl'); - LoadModule('FacturasProveedor_plugin.bpl'); +// LoadModule('RecibosProveedor_plugin.bpl'); +// LoadModule('FacturasProveedor_plugin.bpl'); - LoadModule('RemesasCliente_plugin.bpl'); - LoadModule('RemesasProveedor_plugin.bpl'); +// LoadModule('RemesasCliente_plugin.bpl'); +// LoadModule('RemesasProveedor_plugin.bpl'); {$IFDEF ALMACEN} LoadModule('Inventario_plugin.bpl'); diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index bf958ac..4823962 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -645,6 +645,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object Empresa1_OLD: TMenuItem Tag = 1000 Action = actMenuEmpresa + Enabled = False + Visible = False object Informacindeempresa1: TMenuItem Tag = 10 Action = actInformacionEmpresa @@ -661,10 +663,15 @@ object fPantallaPrincipal: TfPantallaPrincipal Tag = 300 Caption = '-' end + object Informacindeempresa2: TMenuItem + Action = actInformacionEmpresa + end end object Compras1: TMenuItem Tag = 3000 Action = actMenuCompras + Enabled = False + Visible = False object N9: TMenuItem Tag = 200 Caption = '-' @@ -701,6 +708,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object Contabilidad1: TMenuItem Tag = 6000 Action = actMenuContabilidad + Enabled = False + Visible = False end object Informes1: TMenuItem Tag = 7000 diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index f72e847..44b836c 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -95,6 +95,7 @@ type actMenuInformes: TAction; actInformacionEmpresa: TAction; cxLocalizer1: TcxLocalizer; + Informacindeempresa2: TMenuItem; procedure FormCreate(Sender: TObject); procedure Salir1Click(Sender: TObject); procedure actSalirExecute(Sender: TObject); diff --git a/Source/FactuGES.inc b/Source/FactuGES.inc index bf43491..a56c429 100644 --- a/Source/FactuGES.inc +++ b/Source/FactuGES.inc @@ -1,4 +1,5 @@ -{$DEFINE MULTIEMPRESA} -{$DEFINE ALMACEN} +{DEFINE MULTIEMPRESA} +{DEFINE ALMACEN} {DEFINE PEDIDOSPROVEEDOR} -{$DEFINE CONTABILIDAD} \ No newline at end of file +{DEFINE CONTABILIDAD} + diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index f44e3be..e1875bd 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f3..1641339 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 3493aa6..15294aa 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem Width = 650 ExplicitWidth = 650 inherited tbxMain: TTBXToolbar - ExplicitWidth = 650 + ExplicitWidth = 605 inherited TBXItem26: TTBXItem Visible = False end @@ -77,14 +77,12 @@ inherited fEditorDBItem: TfEditorDBItem object pgPaginas: TPageControl [3] AlignWithMargins = True Left = 3 - Top = 112 + Top = 109 Width = 644 - Height = 325 + Height = 328 ActivePage = pagGeneral Align = alClient TabOrder = 2 - ExplicitTop = 109 - ExplicitHeight = 328 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 @@ -95,7 +93,7 @@ inherited fEditorDBItem: TfEditorDBItem end object PnlComentario: TPanel [4] Left = 0 - Top = 79 + Top = 76 Width = 650 Height = 30 Align = alTop @@ -105,7 +103,6 @@ inherited fEditorDBItem: TfEditorDBItem ParentBackground = False TabOrder = 4 VerticalAlignment = taAlignTop - ExplicitTop = 76 object lbComentario: TLabel AlignWithMargins = True Left = 6 diff --git a/Source/Informes/1(ABETO DESIGN)/InfAlbaranCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfAlbaranCliente.fr3 deleted file mode 100644 index a9deb0b..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfContratoCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfContratoCliente.fr3 deleted file mode 100644 index 8a73f79..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfContratoCliente.fr3 +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente(UECKO).fr3 b/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente(UECKO).fr3 deleted file mode 100644 index 86db81d..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente(UECKO).fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente.fr3 deleted file mode 100644 index 83c4ef5..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfFacturaCliente.fr3 +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfPresupuestoCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfPresupuestoCliente.fr3 deleted file mode 100644 index 944b511..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfReciboCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfReciboCliente.fr3 deleted file mode 100644 index f566830..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfReciboCliente.fr3 +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1(ABETO DESIGN)/InfRemesaCliente.fr3 b/Source/Informes/1(ABETO DESIGN)/InfRemesaCliente.fr3 deleted file mode 100644 index 0bbb3ac..0000000 --- a/Source/Informes/1(ABETO DESIGN)/InfRemesaCliente.fr3 +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 deleted file mode 100644 index a07c571..0000000 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/1/InfContratoCliente.fr3 deleted file mode 100644 index f10d4c2..0000000 --- a/Source/Informes/1/InfContratoCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index d7202bf..d2a26c6 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,32 +1,32 @@ - + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - + @@ -35,32 +35,31 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 deleted file mode 100644 index fc23b0f..0000000 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfReciboCliente.fr3 b/Source/Informes/1/InfReciboCliente.fr3 deleted file mode 100644 index cea4f58..0000000 --- a/Source/Informes/1/InfReciboCliente.fr3 +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfRemesaCliente.fr3 b/Source/Informes/1/InfRemesaCliente.fr3 deleted file mode 100644 index 0bbb3ac..0000000 --- a/Source/Informes/1/InfRemesaCliente.fr3 +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 deleted file mode 100644 index df73445..0000000 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfContratoCliente.fr3 b/Source/Informes/2/InfContratoCliente.fr3 deleted file mode 100644 index 0cc5396..0000000 --- a/Source/Informes/2/InfContratoCliente.fr3 +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 deleted file mode 100644 index 0fd44cc..0000000 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3 deleted file mode 100644 index bde6890..0000000 --- a/Source/Informes/2/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfReciboCliente.fr3 b/Source/Informes/2/InfReciboCliente.fr3 deleted file mode 100644 index 9a18539..0000000 --- a/Source/Informes/2/InfReciboCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/InfAlbaranCliente.fr3 b/Source/Informes/3/InfAlbaranCliente.fr3 deleted file mode 100644 index efd75da..0000000 --- a/Source/Informes/3/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/InfContratoCliente.fr3 b/Source/Informes/3/InfContratoCliente.fr3 deleted file mode 100644 index 2516921..0000000 --- a/Source/Informes/3/InfContratoCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3 deleted file mode 100644 index 5ebc3c8..0000000 --- a/Source/Informes/3/InfFacturaCliente.fr3 +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/InfPresupuestoCliente.fr3 b/Source/Informes/3/InfPresupuestoCliente.fr3 deleted file mode 100644 index 0e642ed..0000000 --- a/Source/Informes/3/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/InfReciboCliente.fr3 b/Source/Informes/3/InfReciboCliente.fr3 deleted file mode 100644 index c0cbfcd..0000000 --- a/Source/Informes/3/InfReciboCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/4/InfAlbaranCliente.fr3 b/Source/Informes/4/InfAlbaranCliente.fr3 deleted file mode 100644 index 264d275..0000000 --- a/Source/Informes/4/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/4/InfContratoCliente.fr3 b/Source/Informes/4/InfContratoCliente.fr3 deleted file mode 100644 index 1b96062..0000000 --- a/Source/Informes/4/InfContratoCliente.fr3 +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/4/InfFacturaCliente.fr3 b/Source/Informes/4/InfFacturaCliente.fr3 deleted file mode 100644 index 913c9dd..0000000 --- a/Source/Informes/4/InfFacturaCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/4/InfPresupuestoCliente.fr3 b/Source/Informes/4/InfPresupuestoCliente.fr3 deleted file mode 100644 index c937780..0000000 --- a/Source/Informes/4/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/4/InfReciboCliente.fr3 b/Source/Informes/4/InfReciboCliente.fr3 deleted file mode 100644 index 29ba058..0000000 --- a/Source/Informes/4/InfReciboCliente.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm index e0a9a56..24aabac 100644 --- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm +++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm @@ -280,7 +280,9 @@ object PluginContactos: TPluginContactos object actVendedores: TAction Category = 'Empresa' Caption = 'Vendedores' + Enabled = False ImageIndex = 2 + Visible = False OnExecute = actVendedoresExecute OnUpdate = actVendedoresUpdate end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 0bbff8c..8617324 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -2,21 +2,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Left = 454 Top = 208 Caption = 'Nueva factura de cliente' - ClientHeight = 662 - ClientWidth = 860 + ClientHeight = 705 + ClientWidth = 922 Position = poScreenCenter OnClose = CustomEditorClose - ExplicitWidth = 868 - ExplicitHeight = 700 + ExplicitWidth = 930 + ExplicitHeight = 732 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 860 + Width = 922 Caption = 'Nueva factura de cliente' - ExplicitTop = 52 ExplicitWidth = 860 inherited Image1: TImage - Left = 833 + Left = 895 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -40,10 +39,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited TBXDock: TTBXDock - Width = 860 + Width = 922 ExplicitWidth = 860 inherited tbxMain: TTBXToolbar - ExplicitWidth = 551 + ExplicitWidth = 488 inherited TBXItem2: TTBXItem Visible = False end @@ -55,7 +54,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 860 + ExplicitWidth = 922 inherited TBXSubmenuItem4: TTBXSubmenuItem inherited TBXItem8: TTBXItem Visible = False @@ -70,8 +69,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited StatusBar: TJvStatusBar - Top = 643 - Width = 860 + Top = 686 + Width = 922 Panels = < item Width = 200 @@ -80,22 +79,21 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 860 end inherited pgPaginas: TPageControl - Width = 854 - Height = 365 + Width = 916 + Height = 411 OnChanging = pgPaginasChanging - ExplicitTop = 112 ExplicitWidth = 854 - ExplicitHeight = 365 + ExplicitHeight = 368 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 846 - ExplicitHeight = 337 + ExplicitHeight = 340 inline frViewFacturaCliente1: TfrViewFacturaCliente Left = 0 Top = 0 - Width = 846 - Height = 337 + Width = 908 + Height = 383 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -106,12 +104,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 846 - ExplicitHeight = 337 + ExplicitHeight = 340 inherited dxLayoutControl1: TdxLayoutControl - Width = 846 - Height = 337 + Width = 908 + Height = 383 ExplicitWidth = 846 - ExplicitHeight = 337 + ExplicitHeight = 340 inherited eReferencia: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -137,11 +135,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 78 end inherited bFormasPago: TButton - Left = 279 - ExplicitLeft = 279 + Left = 312 + ExplicitLeft = 312 end inherited frViewTienda1: TfrViewTienda + Width = 351 + ExplicitWidth = 351 inherited dxLayoutControl1: TdxLayoutControl + Width = 351 inherited cbTienda: TcxComboBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -153,9 +154,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited frViewClienteFactura1: TfrViewClienteFactura - Left = 439 + Left = 472 Width = 398 - ExplicitLeft = 439 + ExplicitLeft = 472 ExplicitWidth = 398 inherited dxLayoutControl1: TdxLayoutControl Width = 398 @@ -209,17 +210,17 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 274 + Left = 306 DataBinding.DataSource = dsDataTable Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 274 + ExplicitLeft = 306 end inherited Button3: TBitBtn - Left = 164 - ExplicitLeft = 164 + Left = 196 + ExplicitLeft = 196 end inherited cxDBTextEdit1: TcxDBTextEdit Style.LookAndFeel.SkinName = '' @@ -269,11 +270,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitWidth = 846 + ExplicitHeight = 340 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 - Width = 846 - Height = 337 + Width = 908 + Height = 383 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -286,11 +289,11 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 846 - ExplicitHeight = 337 + ExplicitHeight = 340 inherited ToolBar1: TToolBar - Width = 846 + Width = 908 Height = 24 - ExplicitWidth = 846 + ExplicitWidth = 908 ExplicitHeight = 24 inherited ToolButton4: TToolButton Wrap = False @@ -316,75 +319,75 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 570 + Left = 585 Top = 0 - ExplicitLeft = 570 + ExplicitLeft = 585 ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 587 + Left = 602 Top = 0 - ExplicitLeft = 587 + ExplicitLeft = 602 ExplicitTop = 0 end inherited ToolButton6: TToolButton - Left = 595 + Left = 610 Top = 0 - ExplicitLeft = 595 + ExplicitLeft = 610 ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 629 + Left = 644 Top = 0 - ExplicitLeft = 629 + ExplicitLeft = 644 ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 663 + Left = 678 Top = 0 - ExplicitLeft = 663 + ExplicitLeft = 678 ExplicitTop = 0 end inherited ToolButton12: TToolButton - Left = 697 + Left = 712 Top = 0 - ExplicitLeft = 697 + ExplicitLeft = 712 ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 705 + Left = 720 Top = 0 - ExplicitLeft = 705 + ExplicitLeft = 720 ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 739 + Left = 754 Top = 0 - ExplicitLeft = 739 + ExplicitLeft = 754 ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 773 + Left = 788 Top = 0 - ExplicitLeft = 773 + ExplicitLeft = 788 ExplicitTop = 0 end end inherited cxGrid: TcxGrid Top = 50 - Width = 846 - Height = 287 + Width = 908 + Height = 333 ExplicitTop = 50 - ExplicitWidth = 846 - ExplicitHeight = 287 + ExplicitWidth = 908 + ExplicitHeight = 333 end inherited TBXDock1: TTBXDock Top = 24 - Width = 846 + Width = 908 ExplicitTop = 24 - ExplicitWidth = 846 + ExplicitWidth = 908 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 622 + ExplicitWidth = 548 end end inherited cxRichEdit1: TcxRichEdit @@ -396,10 +399,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Caption = 'Contabilidad' ImageIndex = 2 TabVisible = False + ExplicitWidth = 846 + ExplicitHeight = 340 inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 0 - Width = 846 + Width = 908 Height = 73 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -413,7 +418,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 846 ExplicitHeight = 73 inherited dxLayoutControl1: TdxLayoutControl - Width = 846 + Width = 908 ExplicitWidth = 846 inherited cbSubCuentas: TcxComboBox Left = 85 @@ -426,12 +431,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 429 end inherited eContabilizar: TcxCheckBox - Left = 581 + Left = 624 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 581 + ExplicitLeft = 624 ExplicitWidth = 227 Width = 227 end @@ -445,19 +450,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited PnlComentario: TPanel - Width = 860 + Width = 922 TabOrder = 5 - ExplicitTop = 79 ExplicitWidth = 860 inherited lbComentario: TLabel - Width = 850 + Width = 912 Height = 25 end end inline frViewTotales1: TfrViewTotales [5] Left = 0 - Top = 480 - Width = 860 + Top = 523 + Width = 922 Height = 163 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -472,22 +476,22 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 860 ExplicitHeight = 163 inherited dxLayoutControl1: TdxLayoutControl - Width = 860 + Width = 922 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 ExplicitWidth = 860 inherited Bevel3: TBevel - Left = 457 + Left = 489 Top = 30 Height = 122 - ExplicitLeft = 457 + ExplicitLeft = 489 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 569 + Left = 601 Top = 57 Width = 186 - ExplicitLeft = 569 + ExplicitLeft = 601 ExplicitTop = 57 ExplicitWidth = 186 end @@ -503,27 +507,27 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 220 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 640 + Left = 672 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 640 + ExplicitLeft = 672 ExplicitTop = 77 ExplicitWidth = 155 Width = 155 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 570 + Left = 602 Top = 158 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 570 + ExplicitLeft = 602 ExplicitTop = 158 ExplicitWidth = 225 Width = 225 @@ -539,31 +543,31 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitTop = 57 end inherited edtIVA: TcxDBSpinEdit - Left = 569 + Left = 601 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 569 + ExplicitLeft = 601 ExplicitTop = 77 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 569 + Left = 601 Top = 30 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 569 + ExplicitLeft = 601 ExplicitTop = 30 ExplicitWidth = 226 Width = 226 end inherited edtRE: TcxDBSpinEdit - Left = 569 + Left = 601 Top = 131 Properties.AssignedValues.MinValue = True Style.LookAndFeel.SkinName = '' @@ -571,34 +575,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 569 + ExplicitLeft = 601 ExplicitTop = 131 end inherited edtIRPF: TcxDBSpinEdit - Left = 569 + Left = 601 Top = 104 Style.IsFontAssigned = True - ExplicitLeft = 569 + ExplicitLeft = 601 ExplicitTop = 104 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 640 + Left = 672 Top = 131 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 640 + ExplicitLeft = 672 ExplicitTop = 131 ExplicitWidth = 155 Width = 155 end inherited ImporteIRPF: TcxDBCurrencyEdit - Left = 640 + Left = 672 Top = 104 Style.IsFontAssigned = True - ExplicitLeft = 640 + ExplicitLeft = 672 ExplicitTop = 104 ExplicitWidth = 56 Width = 56 @@ -617,6 +621,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited ePorte: TcxDBCurrencyEdit Top = 84 DataBinding.DataSource = dsDataTable + Enabled = False Properties.OnValidate = frViewTotales1ePortePropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -641,14 +646,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 153 end inherited bTiposIVA: TButton - Left = 309 + Left = 341 Top = 111 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 309 + ExplicitLeft = 341 ExplicitTop = 111 end inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 138 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' @@ -662,9 +668,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Item9: TdxLayoutItem + Enabled = False Visible = False end end + inherited dxLayoutControl1Item16: TdxLayoutItem + Enabled = False + Visible = False + end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup @@ -675,6 +686,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Visible = False end end + inherited dxLayoutControl1Group1191: TdxLayoutGroup + Enabled = False + end + inherited dxLayoutControl1Group8: TdxLayoutGroup + Enabled = False + Visible = False + end end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index dc55b5f..c363a4a 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -3,7 +3,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente ClientHeight = 666 ClientWidth = 640 ExplicitWidth = 648 - ExplicitHeight = 704 + ExplicitHeight = 693 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente Width = 640 ExplicitWidth = 640 inherited tbxMain: TTBXToolbar - ExplicitWidth = 640 + ExplicitWidth = 632 object TBXSubmenuItem2: TTBXSubmenuItem [0] Caption = 'Nuevo' DisplayMode = nbdmImageAndText @@ -58,7 +58,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 454 + ExplicitWidth = 431 inherited lblAno: TTBXLabelItem Visible = True end @@ -73,10 +73,10 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente ExplicitWidth = 640 end inherited TBXTMain2: TTBXToolbar - Left = 454 + Left = 431 Visible = True - ExplicitLeft = 454 - ExplicitWidth = 91 + ExplicitLeft = 431 + ExplicitWidth = 83 object TBXItem40: TTBXItem Action = actInformes DisplayMode = nbdmImageAndText @@ -91,9 +91,9 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end inline frViewFacturasCliente1: TfrViewFacturasCliente [3] Left = 0 - Top = 106 + Top = 102 Width = 640 - Height = 541 + Height = 545 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -103,14 +103,14 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitTop = 106 + ExplicitTop = 102 ExplicitWidth = 640 - ExplicitHeight = 541 + ExplicitHeight = 545 inherited cxGrid: TcxGrid Width = 640 - Height = 413 + Height = 417 ExplicitWidth = 640 - ExplicitHeight = 413 + ExplicitHeight = 417 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -225,8 +225,8 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 515 - ExplicitTop = 515 + Top = 519 + ExplicitTop = 519 ExplicitWidth = 640 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 640 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas index 613eefb..11b1900 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas @@ -358,13 +358,13 @@ var begin inherited; - Respuesta := JsNuevaFacturaDialog.Execute; +// Respuesta := JsNuevaFacturaDialog.Execute; - if Respuesta <> IDCANCEL then - begin - case JsNuevaFacturaDialog.CustomButtonResult of - 300 : begin // Utilizar un pedido - ShowMessage('A COMPLETAR'); +// if Respuesta <> IDCANCEL then +// begin +// case JsNuevaFacturaDialog.CustomButtonResult of +// 300 : begin // Utilizar un pedido +// ShowMessage('A COMPLETAR'); {FPedidosClienteController := TPedidosClienteController.Create; try APedido := FPedidosClienteController.ElegirPedidos(FPedidosClienteController.BuscarPendientes, @@ -378,17 +378,17 @@ begin finally FPedidosClienteController := NIL; end;} - end; - 200 : begin // Utilizar albaranes - GenerarFacturaCli; - actRefrescar.Execute; - end; - 100 : begin // Factura nueva vacia +// end; +// 200 : begin // Utilizar albaranes +// GenerarFacturaCli; +// actRefrescar.Execute; +// end; +// 100 : begin // Factura nueva vacia if FController.Anadir(Facturas) then FController.Ver(Facturas); - end; - end; - end; +// end; +// end; +// end; end; procedure TfEditorFacturasCliente.OnListaAnosChange(Sender: TObject; const Text: string); diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm index c4ad4c7..89d860c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm @@ -4,12 +4,21 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente inherited cxGridViewDESCRIPCION: TcxGridDBColumn OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit end + inherited cxGridViewDESCUENTO: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end inherited cxGridViewIMPORTENETO: TcxGridDBColumn Visible = False VisibleForCustomization = False end end end + inherited TBXDock1: TTBXDock + inherited TBXToolbar1: TTBXToolbar + ExplicitWidth = 447 + end + end object cxRichEdit1: TcxRichEdit [3] Left = 78 Top = 225 @@ -28,4 +37,10 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente Height = 25 Width = 145 end + inherited ActionListContenido: TActionList + inherited actAnadirArticulos: TAction + Enabled = False + Visible = False + end + end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index 71834b9..be73651 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 867 - Height = 490 + Width = 1061 + Height = 533 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 867 - Height = 490 + Width = 1061 + Height = 533 Align = alClient ParentBackground = True TabOrder = 0 @@ -20,8 +20,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 867 - 490) + 1061 + 533) object eReferencia: TcxDBTextEdit Left = 135 Top = 30 @@ -69,6 +69,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Top = 135 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource + Enabled = False Properties.DropDownListStyle = lsFixedList Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' @@ -97,11 +98,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 300 + Left = 399 Top = 135 Width = 132 Height = 23 Caption = 'Ver las formas de pago...' + Enabled = False TabOrder = 4 OnClick = bFormasPagoClick end @@ -140,7 +142,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end inline frViewClienteFactura1: TfrViewClienteFactura - Left = 460 + Left = 559 Top = 30 Width = 398 Height = 265 @@ -152,7 +154,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 10 ReadOnly = False - ExplicitLeft = 460 + ExplicitLeft = 559 ExplicitTop = 30 ExplicitWidth = 398 ExplicitHeight = 265 @@ -182,12 +184,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 293 - ExplicitLeft = 293 + Left = 388 + ExplicitLeft = 388 end inherited Button3: TBitBtn - Left = 183 - ExplicitLeft = 183 + Left = 278 + ExplicitLeft = 278 end inherited cxDBTextEdit1: TcxDBTextEdit ExplicitWidth = 283 @@ -201,6 +203,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_VENCIMIENTO' DataBinding.DataSource = DADataSource + Enabled = False Properties.DateButtons = [btnClear, btnToday] Properties.DateOnError = deNull Properties.ImmediatePost = True @@ -371,6 +374,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end object dxLayoutControl1Group8: TdxLayoutGroup Caption = 'Forma de pago' + Enabled = False + Visible = False object dxLayoutControl1Group3: TdxLayoutGroup ShowCaption = False Hidden = True @@ -399,6 +404,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente AutoAligns = [aaVertical] Caption = 'Contrato asociado' Enabled = False + Visible = False object dxLayoutControl1Item8: TdxLayoutItem Caption = 'Ref. Contrato:' Control = edtRefContrato diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 649ec27..60a1a7c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -128,14 +128,18 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end object cxGridViewRE: TcxGridDBColumn DataBinding.FieldName = 'RE' + Visible = False FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify + VisibleForCustomization = False end object cxGridViewIMPORTE_RE: TcxGridDBColumn DataBinding.FieldName = 'IMPORTE_RE' + Visible = False FooterAlignmentHorz = taRightJustify GroupSummaryAlignment = taRightJustify HeaderAlignmentHorz = taRightJustify + VisibleForCustomization = False end object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn Caption = 'Importe total' @@ -156,10 +160,14 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente object cxGridViewREF_CONTRATO: TcxGridDBColumn Caption = 'Contrato' DataBinding.FieldName = 'REF_CONTRATO' + Visible = False + VisibleForCustomization = False end object cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn Caption = 'Ref. Cliente contrato' DataBinding.FieldName = 'REF_CLI_CONTRATO' + Visible = False + VisibleForCustomization = False end object cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn DataBinding.FieldName = 'FECHA_VENCIMIENTO' diff --git a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm index 9b80ff8..a743034 100644 --- a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm +++ b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm @@ -64,43 +64,57 @@ object PluginGestorInformes: TPluginGestorInformes object actInformeRecibosCliente: TAction Category = 'Recibos de cliente' Caption = 'Listado de recibos de cliente' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeRecibosClienteExecute end object actInformeRecibosCliPendientes: TAction Category = 'Recibos de cliente' Caption = 'Listado de recibos de cliente pendientes' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeRecibosCliPendientesExecute end object actInformeFacturasProveedor: TAction Category = 'Facturas de proveedor' Caption = 'Listado de facturas de proveedor' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeFacturasProveedorExecute end object actInformeFacturasProveedorPendientes: TAction Category = 'Facturas de proveedor' Caption = 'Listado de facturas de proveedor pendientes' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeFacturasProveedorPendientesExecute end object actInformeFacturasProveedorIVA: TAction Category = 'Facturas de proveedor' Caption = 'Listado de IVA de facturas de proveedor' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeFacturasProveedorIVAExecute end object actInformeRecibosProveedor: TAction Category = 'Recibos de proveedor' Caption = 'Listado de recibos de proveedor' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeRecibosProveedorExecute end object actInformeRecibosProvPendientes: TAction Category = 'Recibos de proveedor' Caption = 'Listado de recibos de proveedor pendientes' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actInformeRecibosProvPendientesExecute end end diff --git a/Source/Modulos/Recibos de cliente/Plugin/uPluginRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Plugin/uPluginRecibosCliente.dfm index 2b0fe93..e1b8f74 100644 --- a/Source/Modulos/Recibos de cliente/Plugin/uPluginRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Plugin/uPluginRecibosCliente.dfm @@ -50,7 +50,9 @@ object PluginRecibosCliente: TPluginRecibosCliente object actRecibosCliente: TAction Category = 'Ventas' Caption = 'Recibos de cliente' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actRecibosClienteExecute end end diff --git a/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm b/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm index f98d2d3..051f232 100644 --- a/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm +++ b/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm @@ -34,7 +34,7 @@ object PluginReferencias: TPluginReferencias Left = 40 Top = 16 object Referencias: TMenuItem - Caption = 'Empresa' + Caption = 'Datos' SubMenuImages = SmallImages object N1: TMenuItem Tag = 18990 diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 562fbba..7a82eb2 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ