From b09f8611fc5eedb62e555baf6742fee26f72602c Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 14 Jul 2009 15:52:43 +0000 Subject: [PATCH] =?UTF-8?q?Arreglo=20de=20error=20en=20todos=20los=20elegi?= =?UTF-8?q?r,=20no=20se=20ha=20a=C3=B1adido=20la=20variable=20pnlHeader:TP?= =?UTF-8?q?anel=20en=20los=20pas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@967 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/GUIBase/uViewFormaPago.pas | 2 +- Source/GUIBase/uViewObservaciones.dfm | 3 +- Source/GUIBase/uViewObservaciones.pas | 2 +- .../Views/uEditorElegirAlbaranesCliente.pas | 1 + .../Views/uEditorElegirAlbaranesProveedor.pas | 1 + .../Views/uEditorElegirArticulos.pas | 1 + .../Contactos/Views/uEditorElegirClientes.pas | 1 + .../Views/uEditorElegirProveedores.pas | 1 + .../Views/uEditorElegirFacturasCliente.pas | 1 + .../Views/uEditorElegirArticulosAlmacen.pas | 1 + .../Views/uEditorElegirPedidosProveedor.pas | 1 + .../uEditorElegirPresupuestosCliente.pas | 1 + .../Views/uEditorElegirRecibosCliente.pas | 1 + .../Views/uEditorElegirRecibosProveedor.dfm | 136 +++++++++--------- .../Views/uEditorElegirRecibosProveedor.pas | 1 + .../Views/uViewRecibosProveedor.dfm | 10 +- .../Views/uViewRecibosProveedor.pas | 3 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 19 files changed, 89 insertions(+), 80 deletions(-) diff --git a/Source/GUIBase/uViewFormaPago.pas b/Source/GUIBase/uViewFormaPago.pas index fe3d269e..575dd4f1 100644 --- a/Source/GUIBase/uViewFormaPago.pas +++ b/Source/GUIBase/uViewFormaPago.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, DB, uDADataTable, cxMemo, cxDBEdit, cxControls, - cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls; + cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls, uDAInterfaces; type TfrViewFormaPago = class(TfrViewBase) diff --git a/Source/GUIBase/uViewObservaciones.dfm b/Source/GUIBase/uViewObservaciones.dfm index f0b06091..9a26555e 100644 --- a/Source/GUIBase/uViewObservaciones.dfm +++ b/Source/GUIBase/uViewObservaciones.dfm @@ -1,8 +1,9 @@ inherited frViewObservaciones: TfrViewObservaciones Width = 300 + ExplicitWidth = 300 DesignSize = ( 300 - 226) + 291) object Label5: TLabel Left = 8 Top = 8 diff --git a/Source/GUIBase/uViewObservaciones.pas b/Source/GUIBase/uViewObservaciones.pas index 2430ebac..c1c0fdb6 100644 --- a/Source/GUIBase/uViewObservaciones.pas +++ b/Source/GUIBase/uViewObservaciones.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, DB, uDADataTable, cxMemo, cxDBEdit, cxControls, - cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls; + cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls, uDAInterfaces; type TfrViewObservaciones = class(TfrViewBase) diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas index 979854e8..14b6df76 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas @@ -22,6 +22,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas index e13e0267..09ca2882 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas @@ -22,6 +22,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas index 65b860b8..0e855632 100644 --- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas +++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas @@ -22,6 +22,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas index ba04445e..e8dab6d5 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas @@ -23,6 +23,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas index 80bdff79..bb4893ff 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas +++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas @@ -22,6 +22,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas index f85160ee..f4e0e563 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas @@ -49,6 +49,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas index ff2071f2..56e707be 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas @@ -23,6 +23,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas index 576c6796..f0d1c283 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas @@ -23,6 +23,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas index b2a0a130..819354dc 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas @@ -22,6 +22,7 @@ type actBuscar2: TAction; actQuitarFiltro2: TAction; actAnchoAuto2: TAction; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas index b77fb663..6d88e36e 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas @@ -58,6 +58,7 @@ type rbTodo: TcxRadioButton; rbFechas: TcxRadioButton; Button1: TBitBtn; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm index 84af4c39..1d4d210d 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm @@ -4,59 +4,11 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor ExplicitWidth = 662 PixelsPerInch = 96 TextHeight = 13 - object pnlHeader: TPanel - Left = 0 - Top = 0 - Width = 656 - Height = 64 - Align = alTop - BevelOuter = bvNone - Color = clWhite - Padding.Left = 25 - Padding.Top = 8 - Padding.Right = 25 - Padding.Bottom = 8 - ParentBackground = False - TabOrder = 5 - object lblTitle: TLabel - AlignWithMargins = True - Left = 25 - Top = 8 - Width = 606 - Height = 13 - Margins.Left = 0 - Margins.Top = 0 - Margins.Right = 0 - Margins.Bottom = 8 - Align = alTop - Caption = 'Seleccione recibos de cliente' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [fsBold] - ParentFont = False - ExplicitWidth = 135 - end - object lblComments: TLabel - AlignWithMargins = True - Left = 50 - Top = 29 - Width = 581 - Height = 27 - Margins.Left = 25 - Margins.Top = 0 - Margins.Right = 0 - Align = alClient - ExplicitWidth = 3 - ExplicitHeight = 13 - end - end inherited JvNavPanelHeader: TJvNavPanelHeader - Top = 144 + Top = 148 Width = 654 Visible = False - ExplicitTop = 144 + ExplicitTop = 148 ExplicitWidth = 654 inherited Image1: TImage Left = 627 @@ -64,10 +16,10 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end inherited TBXDock: TTBXDock - Top = 171 + Top = 175 Width = 654 Height = 72 - ExplicitTop = 171 + ExplicitTop = 175 ExplicitWidth = 654 ExplicitHeight = 72 inherited tbxMain: TTBXToolbar @@ -122,7 +74,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor ExplicitTop = 609 ExplicitWidth = 654 end - inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4] + inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3] Left = 0 Top = 628 Width = 654 @@ -167,19 +119,67 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end end - inherited frViewRecibosProveedor1: TfrViewRecibosProveedor [5] - Top = 243 + object pnlHeader: TPanel [4] + Left = 0 + Top = 0 Width = 654 - Height = 366 - ExplicitTop = 243 + Height = 64 + Align = alTop + BevelOuter = bvNone + Color = clWhite + Padding.Left = 25 + Padding.Top = 8 + Padding.Right = 25 + Padding.Bottom = 8 + ParentBackground = False + TabOrder = 6 + object lblTitle: TLabel + AlignWithMargins = True + Left = 25 + Top = 8 + Width = 604 + Height = 13 + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 0 + Margins.Bottom = 8 + Align = alTop + Caption = 'Seleccione recibos de cliente' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [fsBold] + ParentFont = False + ExplicitWidth = 162 + end + object lblComments: TLabel + AlignWithMargins = True + Left = 50 + Top = 29 + Width = 579 + Height = 24 + Margins.Left = 25 + Margins.Top = 0 + Margins.Right = 0 + Align = alClient + ExplicitWidth = 3 + ExplicitHeight = 13 + end + end + inherited frViewRecibosProveedor1: TfrViewRecibosProveedor [5] + Top = 247 + Width = 654 + Height = 362 + ExplicitTop = 247 ExplicitWidth = 654 - ExplicitHeight = 366 + ExplicitHeight = 362 inherited cxGrid: TcxGrid Width = 654 - Height = 238 + Height = 234 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 654 - ExplicitHeight = 238 + ExplicitHeight = 234 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -225,24 +225,22 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 225 + Left = 197 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 225 + ExplicitLeft = 197 ExplicitWidth = 343 Width = 343 end inherited eLista: TcxComboBox - Left = 605 + Left = 528 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 605 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 528 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -256,8 +254,8 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 340 - ExplicitTop = 340 + Top = 336 + ExplicitTop = 336 ExplicitWidth = 654 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 @@ -284,7 +282,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end object pnlFiltrar: TTBXDockablePanel [6] Left = 0 - Top = 60 + Top = 64 Align = alTop Caption = 'Filtrar' CaptionRotation = dpcrAlwaysVert diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas index 9109fd49..b74ac393 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas @@ -57,6 +57,7 @@ type rbTodo: TcxRadioButton; rbFechas: TcxRadioButton; Button1: TBitBtn; + pnlHeader: TPanel; procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject); procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject); procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject); diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm index 0a75950e..c4e2963d 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm @@ -187,24 +187,22 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor Width = 201 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 305 + Left = 212 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 305 + ExplicitLeft = 212 ExplicitWidth = 216 Width = 216 end inherited eLista: TcxComboBox - Left = 558 + Left = 389 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 558 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 389 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas index 36213342..21be9cb6 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas @@ -13,7 +13,8 @@ uses cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, cxImage, Grids, DBGrids, uBizRecibosProveedor, cxGridCustomPopupMenu, cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView, + uViewBase; type IViewRecibosProveedor = interface(IViewGrid) diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 80945cba2cf008abf6da2a20fb7e0f54058da607..563231dff2e8c9c3b2288ad18be4b260c86cdd4c 100644 GIT binary patch delta 45 zcmZ3mm2tsV#tjlt!nq8I3`Gnj45