From 13bd761a0917280083ddd4fe5fa624e1ca413fdd Mon Sep 17 00:00:00 2001 From: david Date: Tue, 18 Sep 2007 17:55:59 +0000 Subject: [PATCH] git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@63 1c943782-d109-9647-9548-93b3ac332352 --- .../Stock/Cliente/uEditorControlStockEDI.dfm | 63 ++++++++++++-- .../Cliente/uEditorControlStockVARELA.dfm | 83 ++++++------------- .../Cliente/uEditorControlStockVARELA.pas | 8 -- .../Stock/Cliente/uViewControGridStockEDI.dfm | 17 ++-- .../uViewControGridStockEDIInventario.dfm | 17 ++-- .../uViewControGridStockPrendasCentros.dfm | 15 ++-- .../Cliente/uViewControGridStockVARELA.dfm | 36 ++++---- 7 files changed, 133 insertions(+), 106 deletions(-) diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm index 208181b..89c408e 100644 --- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm +++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm @@ -202,9 +202,10 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI ExplicitHeight = 450 inherited cxGrid: TcxGrid Width = 856 - Height = 322 + Height = 390 + ExplicitTop = 60 ExplicitWidth = 856 - ExplicitHeight = 322 + ExplicitHeight = 390 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -251,9 +252,19 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI end inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 856 + inherited frViewParametrosColeccion1: TfrViewParametrosColeccion + ExplicitHeight = 41 + inherited dxLayoutControl1: TdxLayoutControl + inherited ccbColeccion: TJvCheckedComboBox + Width = 512 + ExplicitWidth = 512 + end + end + end inherited pnlAgrupaciones: TTBXAlignmentPanel Width = 535 ExplicitWidth = 535 + ExplicitHeight = 41 inherited TBXButton3: TTBXButton Action = actRefrescar end @@ -297,9 +308,10 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI ExplicitHeight = 450 inherited cxGrid: TcxGrid Width = 856 - Height = 322 + Height = 390 + ExplicitTop = 60 ExplicitWidth = 856 - ExplicitHeight = 322 + ExplicitHeight = 390 inherited cxGridView: TcxGridDBTableView PopupMenu = GridPopupMenu DataController.Summary.DefaultGroupSummaryItems = < @@ -539,9 +551,28 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI end inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 856 + inherited frViewParametrosColeccion1: TfrViewParametrosColeccion + ExplicitHeight = 41 + inherited dxLayoutControl1: TdxLayoutControl + inherited ccbColeccion: TJvCheckedComboBox + Width = 512 + ExplicitWidth = 512 + end + end + end + inherited frViewParametrosCentro1: TfrViewParametrosCentro + ExplicitHeight = 41 + inherited dxLayoutControl1: TdxLayoutControl + inherited ccbCentro: TJvCheckedComboBox + Width = 392 + ExplicitWidth = 392 + end + end + end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 135 ExplicitWidth = 135 + ExplicitHeight = 41 inherited TBXButton1: TTBXButton Action = actRefrescar end @@ -580,9 +611,10 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI ExplicitHeight = 450 inherited cxGrid: TcxGrid Width = 856 - Height = 322 + Height = 390 + ExplicitTop = 60 ExplicitWidth = 856 - ExplicitHeight = 322 + ExplicitHeight = 390 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -821,9 +853,28 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI end inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 856 + inherited frViewParametrosColeccion1: TfrViewParametrosColeccion + ExplicitHeight = 41 + inherited dxLayoutControl1: TdxLayoutControl + inherited ccbColeccion: TJvCheckedComboBox + Width = 512 + ExplicitWidth = 512 + end + end + end + inherited frViewParametrosCentro1: TfrViewParametrosCentro + ExplicitHeight = 41 + inherited dxLayoutControl1: TdxLayoutControl + inherited ccbCentro: TJvCheckedComboBox + Width = 392 + ExplicitWidth = 392 + end + end + end inherited pnlAgrupaciones: TTBXAlignmentPanel Width = 135 ExplicitWidth = 135 + ExplicitHeight = 41 inherited TBXButton3: TTBXButton Action = actRefrescar end diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.dfm b/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.dfm index ed80113..b1d2d53 100644 --- a/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.dfm +++ b/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.dfm @@ -3,17 +3,17 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA Top = 342 Caption = 'Stock VARELA' ClientHeight = 573 - ClientWidth = 1071 - ExplicitWidth = 1079 + ClientWidth = 720 + ExplicitWidth = 728 ExplicitHeight = 607 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 1071 + Width = 720 Caption = 'Control de stock de almac'#233'n' ExplicitWidth = 1071 inherited Image1: TImage - Left = 1044 + Left = 693 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -126,58 +126,28 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA end end inherited TBXDock: TTBXDock - Width = 1071 - ExplicitWidth = 1071 + Width = 720 inherited tbxMain: TTBXToolbar - ExplicitWidth = 350 - inherited TBXItem33: TTBXItem - Visible = False - end - object TBXSeparatorItem16: TTBXSeparatorItem [13] - end - object tbxiExpandir: TTBXItem [14] - Action = actExpandir - end - object tbxiContraer: TTBXItem [15] - Action = actContraer - end - object tbxiAnchoAuto: TTBXItem [16] - Action = actAnchoAuto - DisplayMode = nbdmImageAndText - end + ExplicitWidth = 256 end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 1071 - inherited TBXSubmenuItem6: TTBXSubmenuItem - object TBXItem37: TTBXItem [0] - Action = actExpandir - end - object TBXItem36: TTBXItem [1] - Action = actContraer - end - object TBXItem35: TTBXItem [2] - Action = actAnchoAuto - end - object TBXSeparatorItem17: TTBXSeparatorItem [3] - end - end + ExplicitWidth = 720 end inherited tbxFiltro: TTBXToolbar - Left = 350 - DockPos = 350 - ExplicitLeft = 350 + Left = 392 + ExplicitLeft = 392 end end inherited StatusBar: TStatusBar Top = 554 - Width = 1071 + Width = 720 ExplicitTop = 554 ExplicitWidth = 1071 end inline frViewControlGridStockVARELA1: TfrViewControlGridStockVARELA [3] Left = 0 Top = 76 - Width = 1071 + Width = 720 Height = 478 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -188,16 +158,15 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitTop = 76 - ExplicitWidth = 1071 - ExplicitHeight = 478 + ExplicitLeft = -111 + ExplicitTop = 223 inherited cxGrid: TcxGrid - Width = 1071 - Height = 350 - ExplicitWidth = 1071 - ExplicitHeight = 350 + Width = 720 + Height = 418 + ExplicitTop = 60 + ExplicitWidth = 831 + ExplicitHeight = 290 inherited cxGridView: TcxGridDBTableView - PopupMenu = GridPopupMenu DataController.Summary.DefaultGroupSummaryItems = < item Format = '0 referencias' @@ -291,10 +260,10 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA end end inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitTop = 0 - ExplicitWidth = 1071 inherited frViewParametrosColeccion1: TfrViewParametrosColeccion + ExplicitHeight = 41 inherited dxLayoutControl1: TdxLayoutControl + ExplicitHeight = 41 inherited ccbColeccion: TJvCheckedComboBox Width = 512 ExplicitWidth = 512 @@ -302,21 +271,21 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA end end inherited pnlAgrupaciones: TTBXAlignmentPanel - Width = 750 + Width = 399 + ExplicitWidth = 510 + ExplicitHeight = 41 inherited TBXButton3: TTBXButton Action = actRefrescar end end inherited TBXLabel1: TTBXLabel - Width = 1071 + Width = 720 + ExplicitWidth = 831 end end - inherited dsDataSource: TDADataSource - Top = 48 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink1: TdxGridReportLink - ReportDocument.CreationDate = 38965.703007268520000000 + ReportDocument.CreationDate = 39343.822301423610000000 ReportDocument.IsCaptionAssigned = True BuiltInReportLink = True end diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.pas b/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.pas index 0954881..9a160e2 100644 --- a/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.pas +++ b/Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.pas @@ -24,17 +24,9 @@ type TfEditorControlStockVARELA = class(TfEditorGridBase, IEditorControlStockVARELA) dsVentasTerminadas: TDADataSource; - TBXSeparatorItem16: TTBXSeparatorItem; - tbxiExpandir: TTBXItem; - tbxiContraer: TTBXItem; - tbxiAnchoAuto: TTBXItem; actExpandir: TAction; actContraer: TAction; actAnchoAuto: TAction; - TBXItem37: TTBXItem; - TBXItem36: TTBXItem; - TBXItem35: TTBXItem; - TBXSeparatorItem17: TTBXSeparatorItem; frViewControlGridStockVARELA1: TfrViewControlGridStockVARELA; procedure actAnchoAutoExecute(Sender: TObject); procedure FormShow(Sender: TObject); diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm index 6adf00d..8de9679 100644 --- a/Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm +++ b/Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm @@ -4,9 +4,9 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI ExplicitWidth = 553 ExplicitHeight = 477 inherited cxGrid: TcxGrid - Top = 128 + Top = 60 Width = 553 - Height = 349 + Height = 417 ExplicitTop = 128 ExplicitWidth = 553 ExplicitHeight = 349 @@ -457,15 +457,17 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI Top = 0 Align = alTop Caption = 'TBXDockablePanel1' + DockedWidth = 32 + DockedHeight = 32 FloatingWidth = 128 - FloatingHeight = 128 + FloatingHeight = 60 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 1 inline frViewParametrosColeccion1: TfrViewParametrosColeccion Left = 0 Top = 19 Width = 321 - Height = 109 + Height = 41 Align = alLeft AutoSize = True TabOrder = 0 @@ -486,7 +488,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI Left = 321 Top = 19 Width = 400 - Height = 109 + Height = 41 Align = alLeft AutoSize = True TabOrder = 1 @@ -508,10 +510,11 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI Left = 721 Top = 19 Width = 350 - Height = 109 + Height = 41 Align = alClient AutoSize = True TabOrder = 2 + ExplicitHeight = 109 object TBXButton1: TTBXButton Tag = 3 Left = 8 @@ -569,7 +572,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 ReportDocument.Caption = 'Venta mensual' - ReportDocument.CreationDate = 39342.683493553240000000 + ReportDocument.CreationDate = 39343.811115983790000000 ReportTitle.Text = 'Venta mensual' Font.Charset = DEFAULT_CHARSET Font.Color = clBlack diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm index 8cbc3ad..2cd06fc 100644 --- a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm +++ b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm @@ -4,9 +4,9 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa ExplicitWidth = 553 ExplicitHeight = 477 inherited cxGrid: TcxGrid - Top = 128 + Top = 60 Width = 553 - Height = 349 + Height = 417 ExplicitTop = 128 ExplicitWidth = 553 ExplicitHeight = 349 @@ -457,15 +457,17 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa Top = 0 Align = alTop Caption = 'TBXDockablePanel1' + DockedWidth = 32 + DockedHeight = 32 FloatingWidth = 128 - FloatingHeight = 128 + FloatingHeight = 60 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 1 inline frViewParametrosColeccion1: TfrViewParametrosColeccion Left = 0 Top = 19 Width = 321 - Height = 109 + Height = 41 Align = alLeft AutoSize = True TabOrder = 0 @@ -486,7 +488,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa Left = 321 Top = 19 Width = 400 - Height = 109 + Height = 41 Align = alLeft AutoSize = True TabOrder = 1 @@ -508,10 +510,11 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa Left = 721 Top = 19 Width = 350 - Height = 109 + Height = 41 Align = alClient AutoSize = True TabOrder = 2 + ExplicitHeight = 109 object TBXButton3: TTBXButton Tag = 3 Left = 8 @@ -569,7 +572,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 ReportDocument.Caption = 'Venta mensual' - ReportDocument.CreationDate = 39342.683484872690000000 + ReportDocument.CreationDate = 39343.811842083330000000 ReportTitle.Text = 'Venta mensual' Font.Charset = DEFAULT_CHARSET Font.Color = clBlack diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm index d4f2d16..5c60d21 100644 --- a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm +++ b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm @@ -4,9 +4,9 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe ExplicitWidth = 621 ExplicitHeight = 459 inherited cxGrid: TcxGrid - Top = 128 + Top = 60 Width = 621 - Height = 331 + Height = 399 ExplicitTop = 128 ExplicitWidth = 621 ExplicitHeight = 331 @@ -201,15 +201,17 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe Top = 0 Align = alTop Caption = 'TBXDockablePanel1' + DockedWidth = 32 + DockedHeight = 32 FloatingWidth = 128 - FloatingHeight = 128 + FloatingHeight = 60 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 1 inline frViewParametrosColeccion1: TfrViewParametrosColeccion Left = 0 Top = 19 Width = 321 - Height = 109 + Height = 41 Align = alLeft AutoSize = True TabOrder = 0 @@ -230,10 +232,11 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe Left = 321 Top = 19 Width = 300 - Height = 109 + Height = 41 Align = alClient AutoSize = True TabOrder = 1 + ExplicitHeight = 109 object TBXButton3: TTBXButton Tag = 3 Left = 8 @@ -293,7 +296,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe PrinterPage.PageSize.Y = 297000 PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39342.683474027780000000 + ReportDocument.CreationDate = 39343.812036666670000000 ReportDocument.IsCaptionAssigned = True ReportTitle.AdjustOnReportScale = True ReportTitle.Text = 'Venta mensual' diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm index f7a11ac..8b96f28 100644 --- a/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm +++ b/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm @@ -1,12 +1,12 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA - Width = 621 - Height = 459 - ExplicitWidth = 621 - ExplicitHeight = 459 + Width = 831 + Height = 350 + ExplicitWidth = 831 + ExplicitHeight = 350 inherited cxGrid: TcxGrid - Top = 128 - Width = 621 - Height = 331 + Top = 60 + Width = 831 + Height = 290 ExplicitTop = 128 ExplicitWidth = 621 ExplicitHeight = 331 @@ -216,17 +216,18 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA Top = 0 Align = alTop Caption = 'TBXDockablePanel1' + DockedWidth = 32 + DockedHeight = 32 FloatingWidth = 128 - FloatingHeight = 128 + FloatingHeight = 60 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 1 inline frViewParametrosColeccion1: TfrViewParametrosColeccion Left = 0 Top = 19 Width = 321 - Height = 109 + Height = 41 Align = alLeft - AutoSize = True TabOrder = 0 ReadOnly = False ExplicitTop = 19 @@ -234,6 +235,9 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA ExplicitHeight = 109 inherited dxLayoutControl1: TdxLayoutControl Width = 321 + Height = 41 + Align = alClient + AutoContentSizes = [acsWidth] ExplicitWidth = 321 inherited ccbColeccion: TJvCheckedComboBox Width = 512 @@ -244,11 +248,12 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA object pnlAgrupaciones: TTBXAlignmentPanel Left = 321 Top = 19 - Width = 300 - Height = 109 + Width = 510 + Height = 41 Align = alClient - AutoSize = True TabOrder = 1 + ExplicitWidth = 300 + ExplicitHeight = 109 object TBXButton3: TTBXButton Tag = 3 Left = 8 @@ -265,7 +270,7 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA object TBXLabel1: TTBXLabel Left = 0 Top = 0 - Width = 621 + Width = 831 Height = 19 Margins.Left = 5 Margins.Top = 5 @@ -279,6 +284,7 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA ParentColor = True ParentFont = False Underline = True + ExplicitWidth = 621 end end inherited dxComponentPrinter: TdxComponentPrinter @@ -304,7 +310,7 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA PrinterPage.PageSize.Y = 297000 PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39342.683460104170000000 + ReportDocument.CreationDate = 39343.812229085650000000 ReportDocument.IsCaptionAssigned = True ReportTitle.AdjustOnReportScale = True ReportTitle.Text = 'Venta mensual'