From 6e496b07178cf0f645b50bcfa2f6d0f4118d64f0 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 10 Dec 2017 12:03:49 +0000 Subject: [PATCH] #1463 -> Revisar fechas del informe de listado de iva de facturas de cliente git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@665 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/GUIBase/uEditorBase.pas | 9 +- .../Views/uEditorInformeBase.dfm | 78 +++- .../Views/uEditorInformeBase.pas | 11 +- ...InformeFacturasClientePendientesReport.dfm | 375 ++++++++-------- ...InformeFacturasClientePendientesReport.pas | 6 +- .../uEditorInformeFacturasClienteReport.dfm | 376 ++++++++-------- .../uEditorInformeFacturasClienteReport.pas | 6 +- ...formeFacturasProveedorPendientesReport.dfm | 390 +++++++++-------- ...formeFacturasProveedorPendientesReport.pas | 3 +- .../uEditorInformeFacturasProveedorReport.dfm | 362 ++++++++-------- .../uEditorInformeFacturasProveedorReport.pas | 3 +- .../Views/uEditorInformeIVAClientesReport.dfm | 393 ++++++++--------- .../Views/uEditorInformeIVAClientesReport.pas | 5 +- .../uEditorInformeIVAProveedoresReport.dfm | 357 ++++++++-------- .../uEditorInformeIVAProveedoresReport.pas | 3 +- ...ditorInformeRecibosCliPendientesReport.dfm | 376 ++++++++-------- ...ditorInformeRecibosCliPendientesReport.pas | 3 +- .../uEditorInformeRecibosClienteReport.dfm | 402 +++++++++--------- .../uEditorInformeRecibosClienteReport.pas | 3 +- ...itorInformeRecibosProvPendientesReport.dfm | 362 ++++++++-------- ...itorInformeRecibosProvPendientesReport.pas | 3 +- .../uEditorInformeRecibosProveedorReport.dfm | 366 ++++++++-------- .../uEditorInformeRecibosProveedorReport.pas | 3 +- .../Views/uViewFiltroClientes.dfm | 293 +++++++------ .../Views/uViewFiltroClientes.pas | 13 +- .../Views/uViewFiltroImportes.dfm | 87 ++-- .../Views/uViewFiltroImportes.pas | 12 +- .../Views/uViewFiltroProveedores.dfm | 285 +++++++------ .../Views/uViewFiltroProveedores.pas | 13 +- .../Views/uViewPeriodoFechas.dfm | 353 +++++++-------- .../Views/uViewPeriodoFechas.pas | 158 +++++-- 31 files changed, 2665 insertions(+), 2444 deletions(-) diff --git a/Source/GUIBase/uEditorBase.pas b/Source/GUIBase/uEditorBase.pas index 9909189a..2f57eb35 100644 --- a/Source/GUIBase/uEditorBase.pas +++ b/Source/GUIBase/uEditorBase.pas @@ -530,8 +530,8 @@ end; procedure TfEditorBase.CreateParams(var params: TCreateParams); begin - inherited CreateParams(params); - + inherited CreateParams(params); + { Descomentar para crear varios formularios hijos abiertos a la vez fuera de la aplicación principal pero cuidado por que las ventanas modales como la previsualización también se ven afectadas. @@ -549,6 +549,11 @@ begin ABorderIcons := Self.BorderIcons; Self.BorderIcons := Self.BorderIcons - [biMinimize]; try + // Para tratar de evistar que la ventana modal se quede detrás + // de la pantalla principal. + PopupMode := pmExplicit; + PopupParent := Application.MainForm; + Result := inherited ShowModal; finally Self.BorderIcons := ABorderIcons; diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm index 9c4abab8..1aed9206 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm @@ -1,9 +1,9 @@ inherited fEditorInformeBase: TfEditorInformeBase Caption = '' - ClientHeight = 483 + ClientHeight = 641 ClientWidth = 787 ExplicitWidth = 795 - ExplicitHeight = 517 + ExplicitHeight = 675 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -23,23 +23,23 @@ inherited fEditorInformeBase: TfEditorInformeBase end end inherited StatusBar: TJvStatusBar - Top = 464 + Top = 622 Width = 787 - ExplicitTop = 464 + ExplicitTop = 622 ExplicitWidth = 787 end object TBXMultiDockIzquierdo: TTBXMultiDock [3] Left = 0 Top = 116 Width = 7 - Height = 348 + Height = 506 Position = dpLeft end object TBXMultiDockDerecho: TTBXMultiDock [4] - Left = 537 + Left = 447 Top = 116 - Width = 250 - Height = 348 + Width = 340 + Height = 506 Position = dpRight object pnlParametros: TTBXDockablePanel Left = 0 @@ -49,29 +49,27 @@ inherited fEditorInformeBase: TfEditorInformeBase CloseButtonWhenDocked = False DefaultDock = TBXMultiDockDerecho DockableTo = [dpLeft, dpRight] - DockedWidth = 246 + DockedWidth = 336 DockMode = dmCannotFloat DockPos = 6 FloatingWidth = 128 FloatingHeight = 128 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - object TBXDockablePanel1: TTBXDockablePanel + object dxLayoutControl1: TdxLayoutControl Left = 0 - Top = 259 - MaxClientHeight = 50 - Align = alBottom - Caption = 'TBXDockablePanel1' - FloatingWidth = 128 - FloatingHeight = 128 - SupportedDocks = [dkStandardDock, dkMultiDock] + Top = 0 + Width = 336 + Height = 467 + Align = alClient TabOrder = 0 - ExplicitTop = 181 - ExplicitWidth = 150 - ExplicitHeight = 128 + TabStop = False + AutoContentSizes = [acsWidth, acsHeight] + LookAndFeel = dxLayoutOfficeLookAndFeel1 + ExplicitHeight = 105 object TBXButton1: TTBXButton - Left = 16 - Top = 12 + Left = 11 + Top = 432 Width = 121 Height = 24 Action = actRefrescar @@ -79,6 +77,29 @@ inherited fEditorInformeBase: TfEditorInformeBase Images = SmallImages TabOrder = 0 end + object dxLayoutControl1Group_Root: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControlGroupRefrescar: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avBottom + Caption = 'Refrescar' + ShowCaption = False + ShowBorder = False + object dxLayoutControlItemRefrescar: TdxLayoutItem + Caption = 'Actualizar' + ShowCaption = False + Control = TBXButton1 + ControlOptions.ShowBorder = False + end + end + object dxLayoutControlGroupFiltros: TdxLayoutGroup + Caption = 'Filtros' + ShowCaption = False + ShowBorder = False + end + end end end end @@ -125,4 +146,17 @@ inherited fEditorInformeBase: TfEditorInformeBase Left = 280 Top = 152 end + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 120 + Top = 24 + object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel + GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET + GroupOptions.CaptionOptions.Font.Color = clWindowText + GroupOptions.CaptionOptions.Font.Height = -11 + GroupOptions.CaptionOptions.Font.Name = 'Tahoma' + GroupOptions.CaptionOptions.Font.Style = [fsBold] + GroupOptions.CaptionOptions.TextColor = clHighlight + GroupOptions.CaptionOptions.UseDefaultFont = False + end + end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas index 55825abc..c9572169 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas @@ -10,15 +10,22 @@ uses JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, - JvExControls, JvNavigationPane, uIEditorInformeBase, TBXDkPanels, frxExportCSV; + JvExControls, JvNavigationPane, uIEditorInformeBase, TBXDkPanels, frxExportCSV, + dxLayoutLookAndFeels, dxLayoutControl, cxControls; type TfEditorInformeBase = class(TfEditorPreview, IEditorInformeBase) TBXMultiDockIzquierdo: TTBXMultiDock; TBXMultiDockDerecho: TTBXMultiDock; pnlParametros: TTBXDockablePanel; - TBXDockablePanel1: TTBXDockablePanel; TBXButton1: TTBXButton; + dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutControl1: TdxLayoutControl; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; + dxLayoutControlGroupFiltros: TdxLayoutGroup; + dxLayoutControlItemRefrescar: TdxLayoutItem; + dxLayoutControlGroupRefrescar: TdxLayoutGroup; private { Private declarations } public diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.dfm index 01898dd7..0d34348b 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.dfm @@ -1,9 +1,9 @@ inherited fEditorInformeFacturasClientePendientesReport: TfEditorInformeFacturasClientePendientesReport Caption = 'fEditorInformeFacturasClientePendientesReport' - ClientHeight = 655 + ClientHeight = 844 ClientWidth = 895 ExplicitWidth = 903 - ExplicitHeight = 689 + ExplicitHeight = 878 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -21,7 +21,7 @@ inherited fEditorInformeFacturasClientePendientesReport: TfEditorInformeFacturas ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -30,198 +30,211 @@ inherited fEditorInformeFacturasClientePendientesReport: TfEditorInformeFacturas end end inherited StatusBar: TJvStatusBar - Top = 636 + Top = 825 Width = 895 - ExplicitTop = 636 + ExplicitTop = 825 ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 709 + ExplicitHeight = 709 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 535 + Width = 360 + Height = 709 + ExplicitLeft = 535 + ExplicitWidth = 360 + ExplicitHeight = 709 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 136 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 136 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 72 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 72 - ExplicitWidth = 100 - Width = 100 - end - inherited edtFechaIni: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 100 - Width = 100 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 693 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 670 + ExplicitWidth = 356 + ExplicitHeight = 670 + inline frViewFiltroClientes1: TfrViewFiltroClientes [0] + Left = 11 + Top = 282 + Width = 335 + Height = 180 + HelpContext = 160 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 282 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 180 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited rbTodosClientes: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited cbxDesglosado: TCheckBox + Width = 338 + ParentColor = False + ExplicitWidth = 338 + end + inherited rbUnCliente: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited edtCliente: TcxTextEdit + ExplicitWidth = 141 + Width = 141 + end + inherited bElegirCliente: TBitBtn + Width = 108 + ExplicitWidth = 108 + end end end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 630 + ExplicitLeft = 22 + ExplicitTop = 630 end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - Visible = False - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 99 - Width = 99 - end - inherited edtFechaVenIni: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end end end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 - Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 136 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 136 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 478 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 478 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end end end - end - inline frViewFiltroClientes1: TfrViewFiltroClientes - Left = 0 - Top = 213 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 213 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited bElegirCliente: TBitBtn - Width = 108 - ExplicitWidth = 108 - end - inherited edtCliente: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Clientes:' + ShowCaption = False + Control = frViewFiltroClientes1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.pas index abfa267f..d0666582 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClientePendientesReport.pas @@ -15,7 +15,8 @@ uses uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, uIEditorInformeBase, uViewParametrosInforme, - uIEditorInformeFacturasClientePendientesReport; + uIEditorInformeFacturasClientePendientesReport, frxExportCSV, + dxLayoutLookAndFeels; type TfEditorInformeFacturasClientePendientesReport = class(TfEditorInformeBase, IEditorInformeFacturasClientePendientesReport) @@ -23,6 +24,9 @@ type frViewPeriodoFechas1: TfrViewPeriodoFechas; frViewFiltroImportes1: TfrViewFiltroImportes; frViewFiltroClientes1: TfrViewFiltroClientes; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; procedure actRefrescarExecute(Sender: TObject); private FListaIDClientes: TIntegerArray; diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.dfm index 10bfe850..60bb4332 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.dfm @@ -1,9 +1,9 @@ inherited fEditorInformeFacturasClienteReport: TfEditorInformeFacturasClienteReport Caption = 'fEditorInformeFacturasClienteReport' - ClientHeight = 655 + ClientHeight = 826 ClientWidth = 895 ExplicitWidth = 903 - ExplicitHeight = 689 + ExplicitHeight = 860 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -21,7 +21,7 @@ inherited fEditorInformeFacturasClienteReport: TfEditorInformeFacturasClienteRep ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -30,206 +30,202 @@ inherited fEditorInformeFacturasClienteReport: TfEditorInformeFacturasClienteRep end end inherited StatusBar: TJvStatusBar - Top = 636 + Top = 807 Width = 895 - ExplicitTop = 636 + ExplicitTop = 807 ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 691 + ExplicitHeight = 691 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 535 + Width = 360 + Height = 691 + ExplicitLeft = 535 + ExplicitWidth = 360 + ExplicitHeight = 691 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 136 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 136 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - Height = 98 - ExplicitWidth = 182 - ExplicitHeight = 98 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 74 - Top = 77 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 74 - ExplicitTop = 77 - ExplicitWidth = 99 - Width = 99 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 136 - Width = 182 - Visible = False - ExplicitTop = 136 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 99 - Width = 99 - end - inherited edtFechaVenIni: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 675 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 652 + ExplicitWidth = 356 + ExplicitHeight = 652 inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 - Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 + Top = 617 + ExplicitTop = 617 end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 136 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 136 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewPeriodoFechas1: TfrViewPeriodoFechas [1] + Left = 11 + Top = 11 + Width = 313 + Height = 250 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 313 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 313 + Height = 250 + ExplicitWidth = 313 + ExplicitHeight = 250 + DesignSize = ( + 313 + 250) + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end end end - end - inline frViewFiltroClientes1: TfrViewFiltroClientes - Left = 0 - Top = 213 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 213 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 453 + Width = 334 + Height = 120 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 453 + ExplicitWidth = 334 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 334 + Height = 120 + ExplicitWidth = 334 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end end - inherited bElegirCliente: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewFiltroClientes1: TfrViewFiltroClientes + Left = 11 + Top = 267 + Width = 313 + Height = 180 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 267 + ExplicitWidth = 313 + ExplicitHeight = 180 + inherited dxLayoutControl1: TdxLayoutControl + Width = 313 + Height = 180 + ExplicitWidth = 313 + ExplicitHeight = 180 + inherited rbTodosClientes: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited cbxDesglosado: TCheckBox + Width = 338 + ParentColor = False + ExplicitWidth = 338 + end + inherited rbUnCliente: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited edtCliente: TcxTextEdit + ExplicitWidth = 141 + Width = 141 + end + inherited bElegirCliente: TBitBtn + Width = 108 + ExplicitWidth = 108 + end + end end - inherited edtCliente: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + Caption = 'Clientes:' + ShowCaption = False + Control = frViewFiltroClientes1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.pas index f0477300..f9626f76 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeFacturasClienteReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeFacturasClienteReport, + frxExportCSV, dxLayoutLookAndFeels; type TfEditorInformeFacturasClienteReport = class(TfEditorInformeBase, IEditorInformeFacturasClienteReport) @@ -22,6 +23,9 @@ type frViewPeriodoFechas1: TfrViewPeriodoFechas; frViewFiltroImportes1: TfrViewFiltroImportes; frViewFiltroClientes1: TfrViewFiltroClientes; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; procedure actRefrescarExecute(Sender: TObject); private FListaIDClientes: TIntegerArray; diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.dfm index e3db8a31..6805a4b3 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.dfm @@ -1,27 +1,27 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFacturasProveedorPendientesReport Caption = 'fEditorInformeFacturasProveedorPendientesReport' - ClientHeight = 655 - ClientWidth = 895 - ExplicitWidth = 903 - ExplicitHeight = 689 + ClientHeight = 843 + ClientWidth = 1035 + ExplicitWidth = 1043 + ExplicitHeight = 877 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 895 - ExplicitWidth = 895 + Width = 1035 + ExplicitWidth = 1035 inherited Image1: TImage - Left = 868 + Left = 1008 ExplicitLeft = 868 end end inherited TBXDock: TTBXDock - Width = 895 - ExplicitWidth = 895 + Width = 1035 + ExplicitWidth = 1035 inherited tbxMenu: TTBXToolbar - ExplicitWidth = 895 + ExplicitWidth = 1035 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -30,205 +30,195 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur end end inherited StatusBar: TJvStatusBar - Top = 636 - Width = 895 - ExplicitTop = 636 - ExplicitWidth = 895 + Top = 824 + Width = 1035 + ExplicitTop = 824 + ExplicitWidth = 1035 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 708 + ExplicitHeight = 708 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 675 + Width = 360 + Height = 708 + ExplicitLeft = 675 + ExplicitWidth = 360 + ExplicitHeight = 708 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 692 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 669 + ExplicitWidth = 356 + ExplicitHeight = 669 + inline frViewFiltroProveedores1: TfrViewFiltroProveedores [0] + Left = 11 + Top = 284 + Width = 451 + Height = 173 Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 284 + inherited dxLayoutControl1: TdxLayoutControl + inherited rbTodosProveedores: TRadioButton + Width = 195 + ParentColor = False + ExplicitWidth = 195 + end + inherited cbxDesglosado: TCheckBox + Width = 158 + ParentColor = False + ExplicitWidth = 158 + end + inherited rbUnProveedor: TRadioButton + Width = 175 + ParentColor = False + ExplicitWidth = 175 + end + inherited edtProveedor: TcxTextEdit + ExplicitWidth = 607 + Width = 607 + end + inherited bElegirProveedor: TBitBtn + Width = 574 + ExplicitWidth = 574 + end end end - end - inline frViewFiltroProveedores1: TfrViewFiltroProveedores - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 629 + ExplicitLeft = 22 + ExplicitTop = 629 end - inherited bElegirProveedor: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited edtProveedor: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 475 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 475 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Proveedores:' + ShowCaption = False + Control = frViewFiltroProveedores1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.pas index 13727853..e37acc3a 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.pas @@ -15,7 +15,8 @@ uses uViewFiltroProveedores, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, uIEditorInformeBase, uViewParametrosInforme, - uIEditorInformeFacturasProveedorPendientesReport; + uIEditorInformeFacturasProveedorPendientesReport, dxLayoutLookAndFeels, + frxExportCSV; type TfEditorInformeFacturasProveedorPendientesReport = class(TfEditorInformeBase, IEditorInformeFacturasProveedorPendientesReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.dfm index 47bbbded..84efb2f2 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,199 +36,189 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 675 + Width = 360 + Height = 708 + ExplicitLeft = 675 + ExplicitWidth = 360 + ExplicitHeight = 708 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 77 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 77 - ExplicitWidth = 96 - Width = 96 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 77 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 77 - ExplicitWidth = 96 - Width = 96 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 692 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 669 + ExplicitWidth = 356 + ExplicitHeight = 669 + inline frViewFiltroProveedores1: TfrViewFiltroProveedores [0] + Left = 11 + Top = 284 + Width = 451 + Height = 173 Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 284 + inherited dxLayoutControl1: TdxLayoutControl + inherited rbTodosProveedores: TRadioButton + Width = 195 + ParentColor = False + ExplicitWidth = 195 + end + inherited cbxDesglosado: TCheckBox + Width = 158 + ParentColor = False + ExplicitWidth = 158 + end + inherited rbUnProveedor: TRadioButton + Width = 175 + ParentColor = False + ExplicitWidth = 175 + end + inherited edtProveedor: TcxTextEdit + ExplicitWidth = 607 + Width = 607 + end + inherited bElegirProveedor: TBitBtn + Width = 574 + ExplicitWidth = 574 + end end end - end - inline frViewFiltroProveedores1: TfrViewFiltroProveedores - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 629 + ExplicitLeft = 22 + ExplicitTop = 629 end - inherited bElegirProveedor: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited edtProveedor: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 475 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 475 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Proveedores:' + ShowCaption = False + Control = frViewFiltroProveedores1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.pas index 62408cd9..5c6a8c38 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroProveedores, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeFacturasProveedorReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeFacturasProveedorReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeFacturasProveedorReport = class(TfEditorInformeBase, IEditorInformeFacturasProveedorReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm index 2d90881f..fc93af92 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm @@ -1,24 +1,24 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport Caption = 'fEditorInformeIVAClientesReport' - ClientHeight = 655 - ClientWidth = 895 - ExplicitWidth = 903 - ExplicitHeight = 689 + ClientHeight = 796 + ClientWidth = 950 + ExplicitWidth = 958 + ExplicitHeight = 830 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 895 - ExplicitWidth = 895 + Width = 950 + ExplicitWidth = 950 inherited Image1: TImage - Left = 868 + Left = 923 ExplicitLeft = 868 end end inherited TBXDock: TTBXDock - Width = 895 - ExplicitWidth = 895 + Width = 950 + ExplicitWidth = 950 inherited tbxMenu: TTBXToolbar - ExplicitWidth = 895 + ExplicitWidth = 950 end inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 678 @@ -30,201 +30,206 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport end end inherited StatusBar: TJvStatusBar - Top = 636 - Width = 895 - ExplicitTop = 636 - ExplicitWidth = 895 + Top = 777 + Width = 950 + ExplicitTop = 777 + ExplicitWidth = 950 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 520 - ExplicitHeight = 520 + Height = 661 + ExplicitHeight = 661 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 660 - Width = 235 - Height = 520 - ExplicitLeft = 660 - ExplicitWidth = 235 - ExplicitHeight = 520 + Left = 590 + Width = 360 + Height = 661 + ExplicitLeft = 590 + ExplicitWidth = 360 + ExplicitHeight = 661 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 231 - ExplicitWidth = 235 - ExplicitHeight = 504 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 231 - Height = 136 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 136 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 225 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 215 - end - inherited edtFechaFin: TcxDateEdit - Left = 77 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 77 - ExplicitWidth = 96 - Width = 139 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 140 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 213 - end - end - inherited TBXLabel2: TTBXLabel - Width = 231 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 225 - Visible = False - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 215 - end - inherited edtFechaVenFin: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 99 - Width = 142 - end - inherited edtFechaVenIni: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 97 - Width = 140 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - Width = 472 - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 431 - TabOrder = 2 - ExplicitTop = 353 - ExplicitWidth = 188 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 645 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 622 + ExplicitWidth = 356 + ExplicitHeight = 622 inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 225 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 - Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 + Top = 589 + Width = 121 + ExplicitTop = 589 + ExplicitWidth = 121 end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 136 - Width = 231 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 136 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 231 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 225 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewFiltroClientes1: TfrViewFiltroClientes [1] + Left = 11 + Top = 282 + Width = 334 + Height = 175 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 282 + ExplicitWidth = 334 + ExplicitHeight = 175 + inherited dxLayoutControl1: TdxLayoutControl + Width = 334 + Height = 175 + ExplicitWidth = 334 + ExplicitHeight = 175 + inherited rbTodosClientes: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited cbxDesglosado: TCheckBox + Width = 338 + ParentColor = False + ExplicitWidth = 338 + end + inherited rbUnCliente: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited edtCliente: TcxTextEdit + ExplicitWidth = 184 + Width = 184 + end + inherited bElegirCliente: TBitBtn + Width = 151 + ExplicitWidth = 151 + end end end - end - inline frViewFiltroClientes1: TfrViewFiltroClientes - Left = 0 - Top = 213 - Width = 231 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 213 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 231 - ExplicitWidth = 188 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 334 + Height = 265 + HelpContext = 265 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 334 + ExplicitHeight = 265 + inherited dxLayoutControl1: TdxLayoutControl + Width = 334 + Height = 265 + ExplicitWidth = 291 + ExplicitHeight = 260 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited bElegirCliente: TBitBtn - Width = 151 - ExplicitWidth = 108 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 463 + Width = 313 + Height = 120 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 463 + ExplicitWidth = 313 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 313 + Height = 120 + ExplicitWidth = 313 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end end - inherited edtCliente: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 184 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Clientes:' + ShowCaption = False + Control = frViewFiltroClientes1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas index 2c2f5763..f28b1cf6 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas @@ -15,7 +15,7 @@ uses uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeIVAClientesReport, - frxExportCSV; + frxExportCSV, dxLayoutLookAndFeels; type TfEditorInformeIVAClientesReport = class(TfEditorInformeBase, IEditorInformeIVAClientesReport) @@ -23,6 +23,9 @@ type frViewPeriodoFechas1: TfrViewPeriodoFechas; frViewFiltroImportes1: TfrViewFiltroImportes; frViewFiltroClientes1: TfrViewFiltroClientes; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; procedure actRefrescarExecute(Sender: TObject); private FListaIDClientes: TIntegerArray; diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.dfm index 1ebea350..bef2aaab 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,194 +36,189 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 675 + Width = 360 + Height = 708 + ExplicitLeft = 675 + ExplicitWidth = 360 + ExplicitHeight = 708 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 136 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 136 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - Visible = False - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 99 - Width = 99 - end - inherited edtFechaVenIni: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 692 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 669 + ExplicitWidth = 356 + ExplicitHeight = 669 + inline frViewFiltroProveedores1: TfrViewFiltroProveedores [0] + Left = 11 + Top = 284 + Width = 451 + Height = 173 Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 136 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 136 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 284 + inherited dxLayoutControl1: TdxLayoutControl + inherited rbTodosProveedores: TRadioButton + Width = 195 + ParentColor = False + ExplicitWidth = 195 + end + inherited cbxDesglosado: TCheckBox + Width = 158 + ParentColor = False + ExplicitWidth = 158 + end + inherited rbUnProveedor: TRadioButton + Width = 175 + ParentColor = False + ExplicitWidth = 175 + end + inherited edtProveedor: TcxTextEdit + ExplicitWidth = 607 + Width = 607 + end + inherited bElegirProveedor: TBitBtn + Width = 574 + ExplicitWidth = 574 + end end end - end - inline frViewFiltroProveedores1: TfrViewFiltroProveedores - Left = 0 - Top = 213 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 213 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 629 + ExplicitLeft = 22 + ExplicitTop = 629 end - inherited bElegirProveedor: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited edtProveedor: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 475 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 475 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Proveedores:' + ShowCaption = False + Control = frViewFiltroProveedores1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.pas index 0c868dbe..3de3c2f8 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroProveedores, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeIVAProveedoresReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeIVAProveedoresReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeIVAProveedoresReport = class(TfEditorInformeBase, IEditorInformeIVAProveedoresReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.dfm index e410228a..f0b0d328 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeRecibosCliPendientesReport: TfEditorInformeRecibosCliPen ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,199 +36,205 @@ inherited fEditorInformeRecibosCliPendientesReport: TfEditorInformeRecibosCliPen ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end - inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 +inherited TBXMultiDockDerecho: TTBXMultiDock + Left = 535 + Width = 360 + Height = 709 + ExplicitLeft = 535 + ExplicitWidth = 360 + ExplicitHeight = 709 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 693 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 670 + ExplicitWidth = 356 + ExplicitHeight = 670 + inline frViewFiltroClientes1: TfrViewFiltroClientes [0] + Left = 11 + Top = 282 + Width = 335 + Height = 180 + HelpContext = 160 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 282 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 180 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited rbTodosClientes: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited cbxDesglosado: TCheckBox + Width = 338 + ParentColor = False + ExplicitWidth = 338 + end + inherited rbUnCliente: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited edtCliente: TcxTextEdit + ExplicitWidth = 141 + Width = 141 + end + inherited bElegirCliente: TBitBtn + Width = 108 + ExplicitWidth = 108 + end end end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 630 + ExplicitLeft = 22 + ExplicitTop = 630 end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end end end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 - Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 478 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 478 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end end end - end - inline frViewFiltroClientes1: TfrViewFiltroClientes - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited bElegirCliente: TBitBtn - Width = 108 - ExplicitWidth = 108 - end - inherited edtCliente: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Clientes:' + ShowCaption = False + Control = frViewFiltroClientes1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.pas index 29e59980..708e9d6e 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosCliPendientesReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosCliPendientesReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosCliPendientesReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeRecibosCliPendientesReport = class(TfEditorInformeBase, IEditorInformeRecibosCliPendientesReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.dfm index 3ef88cdc..eed37775 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.dfm @@ -1,27 +1,27 @@ inherited fEditorInformeRecibosClienteReport: TfEditorInformeRecibosClienteReport Caption = 'fEditorInformeRecibosClienteReport' - ClientHeight = 655 - ClientWidth = 895 - ExplicitWidth = 903 - ExplicitHeight = 689 + ClientHeight = 818 + ClientWidth = 597 + ExplicitWidth = 605 + ExplicitHeight = 852 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 895 - ExplicitWidth = 895 + Width = 597 + ExplicitWidth = 597 inherited Image1: TImage - Left = 868 + Left = 570 ExplicitLeft = 868 end end inherited TBXDock: TTBXDock - Width = 895 - ExplicitWidth = 895 + Width = 597 + ExplicitWidth = 597 inherited tbxMenu: TTBXToolbar - ExplicitWidth = 895 + ExplicitWidth = 597 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 597 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -30,205 +30,213 @@ inherited fEditorInformeRecibosClienteReport: TfEditorInformeRecibosClienteRepor end end inherited StatusBar: TJvStatusBar - Top = 636 - Width = 895 + Top = 799 + Width = 597 ExplicitTop = 636 - ExplicitWidth = 895 + ExplicitWidth = 597 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 683 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 237 + Width = 360 + Height = 683 + ExplicitLeft = 237 + ExplicitWidth = 360 + ExplicitHeight = 520 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 77 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 77 - ExplicitWidth = 96 - Width = 96 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 667 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 644 + ExplicitWidth = 356 + ExplicitHeight = 481 + inline frViewFiltroClientes1: TfrViewFiltroClientes [0] + Left = 11 + Top = 270 + Width = 335 + Height = 180 + HelpContext = 160 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 270 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 180 + ExplicitWidth = 335 + ExplicitHeight = 180 + inherited rbTodosClientes: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited cbxDesglosado: TCheckBox + Width = 338 + ParentColor = False + ExplicitWidth = 338 + end + inherited rbUnCliente: TRadioButton + Width = 355 + ParentColor = False + ExplicitWidth = 355 + end + inherited edtCliente: TcxTextEdit + ExplicitWidth = 141 + Width = 141 + end + inherited bElegirCliente: TBitBtn + Width = 108 + ExplicitWidth = 108 + end end end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 604 + Width = 121 + ExplicitLeft = 22 + ExplicitTop = 604 + ExplicitWidth = 121 end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end end end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 - Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 458 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 458 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end end end - end - inline frViewFiltroClientes1: TfrViewFiltroClientes - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited bElegirCliente: TBitBtn - Width = 108 - ExplicitWidth = 108 - end - inherited edtCliente: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Clientes:' + ShowCaption = False + Control = frViewFiltroClientes1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.pas index e3a3d670..0da6f37c 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosClienteReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosClienteReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosClienteReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeRecibosClienteReport = class(TfEditorInformeBase, IEditorInformeRecibosClienteReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.dfm index 12127f83..6d310e65 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeRecibosProvPendientesReport: TfEditorInformeRecibosProvP ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,199 +36,189 @@ inherited fEditorInformeRecibosProvPendientesReport: TfEditorInformeRecibosProvP ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 675 + Width = 360 + Height = 708 + ExplicitLeft = 675 + ExplicitWidth = 360 + ExplicitHeight = 708 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 692 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 669 + ExplicitWidth = 356 + ExplicitHeight = 669 + inline frViewFiltroProveedores1: TfrViewFiltroProveedores [0] + Left = 11 + Top = 284 + Width = 451 + Height = 173 Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 284 + inherited dxLayoutControl1: TdxLayoutControl + inherited rbTodosProveedores: TRadioButton + Width = 195 + ParentColor = False + ExplicitWidth = 195 + end + inherited cbxDesglosado: TCheckBox + Width = 158 + ParentColor = False + ExplicitWidth = 158 + end + inherited rbUnProveedor: TRadioButton + Width = 175 + ParentColor = False + ExplicitWidth = 175 + end + inherited edtProveedor: TcxTextEdit + ExplicitWidth = 607 + Width = 607 + end + inherited bElegirProveedor: TBitBtn + Width = 574 + ExplicitWidth = 574 + end end end - end - inline frViewFiltroProveedores1: TfrViewFiltroProveedores - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 629 + ExplicitLeft = 22 + ExplicitTop = 629 end - inherited bElegirProveedor: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited edtProveedor: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 475 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 475 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Proveedores:' + ShowCaption = False + Control = frViewFiltroProveedores1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.pas index 7323cbb0..289a7182 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProvPendientesReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroProveedores, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosProvPendientesReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosProvPendientesReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeRecibosProvPendientesReport = class(TfEditorInformeBase, IEditorInformeRecibosProvPendientesReport) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.dfm index 1967711d..02c62b4e 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeRecibosProveedorReport: TfEditorInformeRecibosProveedorR ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,203 +36,189 @@ inherited fEditorInformeRecibosProveedorReport: TfEditorInformeRecibosProveedorR ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 675 + Width = 360 + Height = 708 + ExplicitLeft = 675 + ExplicitWidth = 360 + ExplicitHeight = 708 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 - inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] - Left = 0 - Top = 0 - Width = 188 - Height = 240 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 188 - ExplicitHeight = 240 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited Label3: TLabel - Width = 172 - end - inherited edtFechaFin: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 - Height = 99 - ExplicitWidth = 182 - ExplicitHeight = 99 - inherited Label4: TLabel - Width = 172 - end - inherited edtFechaVenFin: TcxDateEdit - Left = 76 - Top = 78 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitTop = 78 - ExplicitWidth = 97 - Width = 97 - end - inherited edtFechaVenIni: TcxDateEdit - Left = 76 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 76 - ExplicitWidth = 97 - Width = 97 - end - inherited cbPeriodo2: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 170 - Width = 170 - end - end - end - inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 - TabOrder = 2 - ExplicitTop = 368 - ExplicitWidth = 188 - inherited TBXButton1: TTBXButton - AlignWithMargins = True - Left = 3 - Top = 3 - Width = 182 - Height = 37 - Margins.Left = 8 - Margins.Top = 8 - Margins.Right = 8 - Margins.Bottom = 8 + DockedWidth = 356 + ExplicitWidth = 360 + ExplicitHeight = 692 + inherited dxLayoutControl1: TdxLayoutControl + Width = 356 + Height = 669 + ExplicitWidth = 356 + ExplicitHeight = 669 + inline frViewFiltroProveedores1: TfrViewFiltroProveedores [0] + Left = 11 + Top = 284 + Width = 451 + Height = 173 Align = alTop - ExplicitLeft = 3 - ExplicitTop = 3 - ExplicitWidth = 182 - ExplicitHeight = 37 - end - end - inline frViewFiltroImportes1: TfrViewFiltroImportes - Left = 0 - Top = 240 - Width = 188 - Height = 77 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitTop = 240 - ExplicitWidth = 188 - ExplicitHeight = 77 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 - ExplicitWidth = 182 - inherited eImporte: TcxSpinEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + TabOrder = 2 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 284 + inherited dxLayoutControl1: TdxLayoutControl + inherited rbTodosProveedores: TRadioButton + Width = 195 + ParentColor = False + ExplicitWidth = 195 + end + inherited cbxDesglosado: TCheckBox + Width = 158 + ParentColor = False + ExplicitWidth = 158 + end + inherited rbUnProveedor: TRadioButton + Width = 175 + ParentColor = False + ExplicitWidth = 175 + end + inherited edtProveedor: TcxTextEdit + ExplicitWidth = 607 + Width = 607 + end + inherited bElegirProveedor: TBitBtn + Width = 574 + ExplicitWidth = 574 + end end end - end - inline frViewFiltroProveedores1: TfrViewFiltroProveedores - Left = 0 - Top = 317 - Width = 188 - Height = 146 - Align = alTop - AutoSize = True - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 3 - ReadOnly = False - ExplicitTop = 317 - ExplicitWidth = 188 - ExplicitHeight = 146 - inherited TBXLabel2: TTBXLabel - Width = 188 - ExplicitWidth = 188 + inherited TBXButton1: TTBXButton [1] + Left = 22 + Top = 629 + ExplicitLeft = 22 + ExplicitTop = 629 end - inherited bElegirProveedor: TBitBtn - Width = 108 - ExplicitWidth = 108 + inline frViewPeriodoFechas1: TfrViewPeriodoFechas + Left = 11 + Top = 11 + Width = 335 + Height = 250 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 1 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 11 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 250 + ExplicitWidth = 335 + ExplicitHeight = 250 + inherited edtFechaIni: TcxDateEdit + ExplicitWidth = 360 + Width = 360 + end + inherited edtFechaFin: TcxDateEdit + ExplicitWidth = 362 + Width = 362 + end + inherited cbPeriodo: TcxComboBox + ExplicitWidth = 429 + Width = 429 + end + inherited edtFechaVenIni: TcxDateEdit + ExplicitWidth = 529 + Width = 529 + end + inherited edtFechaVenFin: TcxDateEdit + ExplicitWidth = 531 + Width = 531 + end + inherited cbPeriodo2: TcxComboBox + ExplicitWidth = 598 + Width = 598 + end + end end - inherited edtProveedor: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 141 - Width = 141 + inline frViewFiltroImportes1: TfrViewFiltroImportes + Left = 11 + Top = 475 + Width = 335 + Height = 120 + Align = alClient + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 3 + ReadOnly = False + ExplicitLeft = 11 + ExplicitTop = 475 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited dxLayoutControl1: TdxLayoutControl + Width = 335 + Height = 120 + ExplicitWidth = 335 + ExplicitHeight = 120 + inherited cbxDesglosado: TCheckBox + Width = 298 + ParentColor = False + ExplicitWidth = 298 + end + inherited eImporte: TcxSpinEdit + ExplicitWidth = 142 + Width = 142 + end + end + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControlGroupRefrescar: TdxLayoutGroup + ShowCaption = True + ShowBorder = True + end + inherited dxLayoutControlGroupFiltros: TdxLayoutGroup + AutoAligns = [aaHorizontal] + AlignVert = avClient + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Periodo:' + ShowCaption = False + Control = frViewPeriodoFechas1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Proveedores:' + ShowCaption = False + Control = frViewFiltroProveedores1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaHorizontal] + AlignVert = avClient + Caption = 'Importes:' + ShowCaption = False + Control = frViewFiltroImportes1 + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.pas index 3aeb0d75..9026d0cb 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeRecibosProveedorReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroProveedores, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosProveedorReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeRecibosProveedorReport, + dxLayoutLookAndFeels, frxExportCSV; type TfEditorInformeRecibosProveedorReport = class(TfEditorInformeBase, IEditorInformeRecibosProveedorReport) diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.dfm b/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.dfm index cebe0033..dcd25576 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.dfm @@ -1,131 +1,178 @@ inherited frViewFiltroClientes: TfrViewFiltroClientes - Width = 451 - Align = alTop + Width = 308 + Height = 189 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy - ExplicitWidth = 451 - DesignSize = ( - 451 - 195) - object TBXLabel2: TTBXLabel + ExplicitWidth = 308 + ExplicitHeight = 189 + object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 451 - Height = 29 - Margins.Top = 5 - Margins.Bottom = 10 - Align = alTop - Caption = 'Clientes' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentColor = True - ParentFont = False - Underline = True + Width = 308 + Height = 189 + Align = alClient + TabOrder = 0 + TabStop = False + AutoContentSizes = [acsWidth] + LookAndFeel = dxLayoutOfficeLookAndFeel1 + DesignSize = ( + 308 + 189) + object rbTodosClientes: TRadioButton + Left = 22 + Top = 30 + Width = 355 + Height = 17 + Caption = 'Incluir a todos los clientes' + Checked = True + TabOrder = 0 + TabStop = True + OnClick = rbTodosClientesClick + end + object cbxDesglosado: TCheckBox + Left = 40 + Top = 53 + Width = 338 + Height = 17 + Caption = 'Desglosar por cliente' + TabOrder = 1 + end + object rbUnCliente: TRadioButton + Left = 22 + Top = 76 + Width = 355 + Height = 17 + Caption = 'S'#243'lo listar el cliente siguiente:' + TabOrder = 2 + OnClick = rbUnClienteClick + end + object edtCliente: TcxTextEdit + Left = 40 + Top = 99 + Anchors = [akLeft, akTop, akRight] + AutoSize = False + Enabled = False + Properties.ReadOnly = True + Properties.UseLeftAlignmentOnEditing = False + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 3 + Height = 21 + Width = 598 + end + object bElegirCliente: TBitBtn + AlignWithMargins = True + Left = 40 + Top = 126 + Width = 522 + Height = 30 + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 2 + Margins.Bottom = 0 + Anchors = [akLeft, akTop, akRight] + Caption = 'Elegir un cliente' + Enabled = False + TabOrder = 4 + OnClick = bElegirClienteClick + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000000000000000000000000000000000000FF00FF00FF00 + FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10 + AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00B426B000526840004A823400478F310043962F0042992F0043972F004690 + 3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00 + FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E + 2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00 + FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB + 2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00 + FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2 + 28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00 + FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2 + 28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70 + 3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B + C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F + D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4 + D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7 + DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9 + DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198 + C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F + A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378 + AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116 + E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} + end + object dxLayoutControl1Group_Root: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group1: TdxLayoutGroup + Caption = 'Clientes:' + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Incluir a todos los clientes' + ShowCaption = False + Control = rbTodosClientes + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Desglosar por cliente' + Offsets.Left = 18 + ShowCaption = False + Control = cbxDesglosado + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + Caption = 'S'#243'lo listar el cliente siguiente:' + ShowCaption = False + Control = rbUnCliente + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item4: TdxLayoutItem + Caption = 'Cliente:' + Offsets.Left = 18 + ShowCaption = False + Control = edtCliente + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Elegir un cliente' + Offsets.Left = 18 + ShowCaption = False + Control = bElegirCliente + ControlOptions.ShowBorder = False + end + end + end end - object bElegirCliente: TBitBtn - AlignWithMargins = True - Left = 61 - Top = 123 - Width = 382 - Height = 23 - Margins.Left = 0 - Margins.Top = 0 - Margins.Right = 2 - Margins.Bottom = 0 - Anchors = [akLeft, akTop, akRight] - Caption = 'Elegir un cliente' - Enabled = False - TabOrder = 1 - OnClick = bElegirClienteClick - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000000000000000000000000000000000000FF00FF00FF00 - FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10 - AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00B426B000526840004A823400478F310043962F0042992F0043972F004690 - 3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00 - FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E - 2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00 - FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB - 2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00 - FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2 - 28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00 - FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2 - 28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70 - 3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B - C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F - D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4 - D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7 - DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9 - DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198 - C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F - A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378 - AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116 - E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} - end - object cbxDesglosado: TCheckBox - Left = 23 - Top = 49 - Width = 146 - Height = 17 - Caption = 'Desglosar por cliente' - TabOrder = 2 - end - object edtCliente: TcxTextEdit - Left = 28 - Top = 99 - Anchors = [akLeft, akTop, akRight] - AutoSize = False - Enabled = False - Properties.ReadOnly = True - Properties.UseLeftAlignmentOnEditing = False - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleDisabled.TextColor = clWindowText - StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 3 - Height = 21 - Width = 415 - end - object rbTodosClientes: TRadioButton - Left = 6 - Top = 29 - Width = 147 - Height = 17 - Caption = 'Incluir a todos los clientes' - Checked = True - TabOrder = 4 - TabStop = True - OnClick = rbTodosClientesClick - end - object rbUnCliente: TRadioButton - Left = 6 - Top = 76 - Width = 175 - Height = 17 - Caption = 'S'#243'lo listar el cliente siguiente:' - TabOrder = 5 - OnClick = rbUnClienteClick + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 120 + Top = 24 + object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel + GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET + GroupOptions.CaptionOptions.Font.Color = clWindowText + GroupOptions.CaptionOptions.Font.Height = -11 + GroupOptions.CaptionOptions.Font.Name = 'Tahoma' + GroupOptions.CaptionOptions.Font.Style = [fsBold] + GroupOptions.CaptionOptions.TextColor = clHighlight + GroupOptions.CaptionOptions.UseDefaultFont = False + end end end diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.pas b/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.pas index 0719a029..2a480f15 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroClientes.pas @@ -6,7 +6,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, StdCtrls, Buttons, TBXDkPanels, uViewParametrosInforme, uBizContactos, - uClientesController; + uClientesController, dxLayoutControl, dxLayoutLookAndFeels; type IViewFiltroClientes = interface(IViewParametrosInforme) @@ -14,12 +14,21 @@ type end; TfrViewFiltroClientes = class(TfrViewParametrosInforme, IViewFiltroClientes) - TBXLabel2: TTBXLabel; rbTodosClientes: TRadioButton; rbUnCliente: TRadioButton; cbxDesglosado: TCheckBox; bElegirCliente: TBitBtn; edtCliente: TcxTextEdit; + dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutControl1: TdxLayoutControl; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; + dxLayoutControl1Group1: TdxLayoutGroup; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; + dxLayoutControl1Item4: TdxLayoutItem; + dxLayoutControl1Item5: TdxLayoutItem; procedure rbTodosClientesClick(Sender: TObject); procedure rbUnClienteClick(Sender: TObject); procedure CustomViewCreate(Sender: TObject); diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.dfm b/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.dfm index 0fc8dfb7..8d12c5be 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.dfm @@ -1,52 +1,30 @@ inherited frViewFiltroImportes: TfrViewFiltroImportes Width = 451 - Height = 93 - Align = alTop + Height = 101 ExplicitWidth = 451 - ExplicitHeight = 93 - object TBXLabel2: TTBXLabel + ExplicitHeight = 101 + object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 451 - Height = 29 - Margins.Top = 5 - Margins.Bottom = 10 - Align = alTop - Caption = 'Importes' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentColor = True - ParentFont = False - Underline = True - end - object TBXAlignmentPanel1: TTBXAlignmentPanel - AlignWithMargins = True - Left = 3 - Top = 32 - Width = 445 - Height = 42 - Margins.Left = 5 - Margins.Right = 5 - Align = alTop - AutoSize = True - TabOrder = 1 + Height = 101 + Align = alClient + TabOrder = 0 + TabStop = False + AutoContentSizes = [acsWidth] + LookAndFeel = dxLayoutOfficeLookAndFeel1 object cbxDesglosado: TCheckBox - Left = 7 - Top = 0 - Width = 159 + Left = 22 + Top = 30 + Width = 298 Height = 17 Caption = 'Solo facturas que superen:' - Color = clBtnFace - ParentColor = False TabOrder = 0 OnClick = cbxDesglosadoClick end object eImporte: TcxSpinEdit - Left = 24 - Top = 21 + Left = 69 + Top = 53 Enabled = False Properties.Alignment.Horz = taRightJustify Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364 @@ -56,14 +34,43 @@ inherited frViewFiltroImportes: TfrViewFiltroImportes Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Value = 3000.000000000000000000 Width = 142 end + object dxLayoutControl1Group_Root: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group1: TdxLayoutGroup + Caption = 'Importes:' + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Solo facturas que superen:' + ShowCaption = False + Control = cbxDesglosado + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Importe:' + Control = eImporte + ControlOptions.ShowBorder = False + end + end + end + end + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 192 + Top = 24 + object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel + GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET + GroupOptions.CaptionOptions.Font.Color = clWindowText + GroupOptions.CaptionOptions.Font.Height = -11 + GroupOptions.CaptionOptions.Font.Name = 'Tahoma' + GroupOptions.CaptionOptions.Font.Style = [fsBold] + GroupOptions.CaptionOptions.TextColor = clHighlight + GroupOptions.CaptionOptions.UseDefaultFont = False + end end end diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.pas b/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.pas index bec8f367..c9f70952 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroImportes.pas @@ -5,7 +5,8 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxSpinEdit, - dxLayoutControl, StdCtrls, cxControls, TBXDkPanels, uViewParametrosInforme; + dxLayoutControl, StdCtrls, cxControls, TBXDkPanels, uViewParametrosInforme, + dxLayoutLookAndFeels; type IViewFiltroImportes = interface(IViewParametrosInforme) @@ -15,8 +16,13 @@ type TfrViewFiltroImportes = class(TfrViewParametrosInforme, IViewFiltroImportes) cbxDesglosado: TCheckBox; eImporte: TcxSpinEdit; - TBXLabel2: TTBXLabel; - TBXAlignmentPanel1: TTBXAlignmentPanel; + dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutControl1: TdxLayoutControl; + dxLayoutControl1Group1: TdxLayoutGroup; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; procedure cbxDesglosadoClick(Sender: TObject); end; diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.dfm b/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.dfm index 4198254a..ad5e49af 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.dfm @@ -1,131 +1,178 @@ inherited frViewFiltroProveedores: TfrViewFiltroProveedores Width = 451 + Height = 173 Align = alTop OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy ExplicitWidth = 451 - DesignSize = ( - 451 - 195) - object TBXLabel2: TTBXLabel + ExplicitHeight = 173 + object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 451 - Height = 29 - Margins.Top = 5 - Margins.Bottom = 10 - Align = alTop - Caption = 'Proveedores' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentColor = True - ParentFont = False - Underline = True + Height = 173 + Align = alClient + TabOrder = 0 + TabStop = False + AutoContentSizes = [acsWidth] + LookAndFeel = dxLayoutOfficeLookAndFeel1 + DesignSize = ( + 451 + 173) + object rbTodosProveedores: TRadioButton + Left = 22 + Top = 30 + Width = 195 + Height = 17 + Caption = 'Incluir a todos los proveedores' + Checked = True + TabOrder = 0 + TabStop = True + OnClick = rbTodosProveedoresClick + end + object cbxDesglosado: TCheckBox + Left = 40 + Top = 53 + Width = 158 + Height = 17 + Caption = 'Desglosar por proveedor' + TabOrder = 1 + end + object rbUnProveedor: TRadioButton + Left = 22 + Top = 76 + Width = 175 + Height = 17 + Caption = 'S'#243'lo listar el proveedor siguiente:' + TabOrder = 2 + OnClick = rbUnProveedorClick + end + object edtProveedor: TcxTextEdit + Left = 99 + Top = 99 + Anchors = [akLeft, akTop, akRight] + AutoSize = False + Enabled = False + Properties.ReadOnly = True + Properties.UseLeftAlignmentOnEditing = False + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 3 + Height = 21 + Width = 607 + end + object bElegirProveedor: TBitBtn + AlignWithMargins = True + Left = 40 + Top = 126 + Width = 574 + Height = 23 + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 2 + Margins.Bottom = 0 + Anchors = [akLeft, akTop, akRight] + Caption = 'Elegir un proveedor' + Enabled = False + TabOrder = 4 + OnClick = bElegirProveedorClick + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000000000000000000000000000000000000FF00FF00FF00 + FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10 + AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00B426B000526840004A823400478F310043962F0042992F0043972F004690 + 3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00 + FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E + 2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00 + FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB + 2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00 + FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2 + 28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00 + FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2 + 28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70 + 3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B + C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F + D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4 + D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7 + DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9 + DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198 + C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F + A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378 + AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116 + E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} + end + object dxLayoutGroup1: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutGroup2: TdxLayoutGroup + Caption = 'Proveedores:' + object dxLayoutItem1: TdxLayoutItem + Caption = 'Incluir a todos los proveedores' + ShowCaption = False + Control = rbTodosProveedores + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Desglosar por proveedor' + Offsets.Left = 18 + ShowCaption = False + Control = cbxDesglosado + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + Caption = 'S'#243'lo listar el proveedor siguiente:' + ShowCaption = False + Control = rbUnProveedor + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item4: TdxLayoutItem + Caption = 'Proveedor:' + Offsets.Left = 18 + Control = edtProveedor + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Elegir un proveedor' + Offsets.Left = 18 + ShowCaption = False + Control = bElegirProveedor + ControlOptions.ShowBorder = False + end + end + end end - object bElegirProveedor: TBitBtn - AlignWithMargins = True - Left = 61 - Top = 123 - Width = 382 - Height = 23 - Margins.Left = 0 - Margins.Top = 0 - Margins.Right = 2 - Margins.Bottom = 0 - Anchors = [akLeft, akTop, akRight] - Caption = 'Elegir un proveedor' - Enabled = False - TabOrder = 1 - OnClick = bElegirProveedorClick - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000000000000000000000000000000000000FF00FF00FF00 - FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10 - AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00B426B000526840004A823400478F310043962F0042992F0043972F004690 - 3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00 - FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E - 2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00 - FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB - 2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00 - FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2 - 28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00 - FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2 - 28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70 - 3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B - C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F - D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4 - D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7 - DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9 - DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198 - C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F - A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378 - AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116 - E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} - end - object cbxDesglosado: TCheckBox - Left = 23 - Top = 49 - Width = 158 - Height = 17 - Caption = 'Desglosar por proveedor' - TabOrder = 2 - end - object edtProveedor: TcxTextEdit - Left = 28 - Top = 99 - Anchors = [akLeft, akTop, akRight] - AutoSize = False - Enabled = False - Properties.ReadOnly = True - Properties.UseLeftAlignmentOnEditing = False - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleDisabled.TextColor = clWindowText - StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 3 - Height = 21 - Width = 415 - end - object rbTodosProveedores: TRadioButton - Left = 6 - Top = 29 - Width = 195 - Height = 17 - Caption = 'Incluir a todos los Proveedores' - Checked = True - TabOrder = 4 - TabStop = True - OnClick = rbTodosProveedoresClick - end - object rbUnProveedor: TRadioButton - Left = 6 - Top = 76 - Width = 175 - Height = 17 - Caption = 'S'#243'lo listar el proveedor siguiente:' - TabOrder = 5 - OnClick = rbUnProveedorClick + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 192 + Top = 24 + object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel + GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET + GroupOptions.CaptionOptions.Font.Color = clWindowText + GroupOptions.CaptionOptions.Font.Height = -11 + GroupOptions.CaptionOptions.Font.Name = 'Tahoma' + GroupOptions.CaptionOptions.Font.Style = [fsBold] + GroupOptions.CaptionOptions.TextColor = clHighlight + GroupOptions.CaptionOptions.UseDefaultFont = False + end end end diff --git a/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.pas b/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.pas index b9cb10ed..7f37f335 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewFiltroProveedores.pas @@ -6,7 +6,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, StdCtrls, Buttons, TBXDkPanels, uViewParametrosInforme, uBizContactos, - uProveedoresController; + uProveedoresController, dxLayoutLookAndFeels, dxLayoutControl; type IViewFiltroProveedores = interface(IViewParametrosInforme) @@ -14,12 +14,21 @@ type end; TfrViewFiltroProveedores = class(TfrViewParametrosInforme, IViewFiltroProveedores) - TBXLabel2: TTBXLabel; rbTodosProveedores: TRadioButton; rbUnProveedor: TRadioButton; cbxDesglosado: TCheckBox; bElegirProveedor: TBitBtn; edtProveedor: TcxTextEdit; + dxLayoutControl1: TdxLayoutControl; + dxLayoutGroup1: TdxLayoutGroup; + dxLayoutGroup2: TdxLayoutGroup; + dxLayoutItem1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; + dxLayoutControl1Item4: TdxLayoutItem; + dxLayoutControl1Item5: TdxLayoutItem; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; procedure rbTodosProveedoresClick(Sender: TObject); procedure rbUnProveedorClick(Sender: TObject); procedure CustomViewCreate(Sender: TObject); diff --git a/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.dfm b/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.dfm index 4f725f38..9fdb9152 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.dfm @@ -1,82 +1,24 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas - Width = 451 - Height = 248 - Align = alTop - ExplicitWidth = 451 - ExplicitHeight = 248 - object TBXAlignmentPanel2: TTBXAlignmentPanel - AlignWithMargins = True - Left = 3 - Top = 32 - Width = 445 - Height = 97 - Margins.Left = 5 - Margins.Top = 5 - Margins.Right = 5 - Align = alTop - AutoSize = True + Width = 781 + Height = 280 + ExplicitWidth = 781 + ExplicitHeight = 280 + object dxLayoutControl1: TdxLayoutControl + Left = 0 + Top = 0 + Width = 781 + Height = 280 + Align = alClient TabOrder = 0 + TabStop = False + AutoContentSizes = [acsWidth] + LookAndFeel = dxLayoutOfficeLookAndFeel1 DesignSize = ( - 445 - 97) - object Label3: TLabel - Left = 5 - Top = 5 - Width = 435 - Height = 13 - Align = alTop - Caption = 'Rango de fechas:' - Transparent = True - ExplicitWidth = 85 - end - object Label1: TLabel - Left = 29 - Top = 52 - Width = 34 - Height = 13 - Caption = 'Desde:' - Transparent = True - end - object Label2: TLabel - Left = 32 - Top = 79 - Width = 31 - Height = 13 - Caption = 'hasta:' - Transparent = True - end - object edtFechaFin: TcxDateEdit - Left = 69 - Top = 76 - Anchors = [akLeft, akTop, akRight] - Properties.DateButtons = [btnToday] - Properties.PostPopupValueOnTab = True - Properties.SaveTime = False - Properties.ShowTime = False - Properties.OnValidate = edtFechaFinPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 0 - Width = 362 - end + 781 + 280) object edtFechaIni: TcxDateEdit Left = 72 - Top = 49 + Top = 76 Anchors = [akLeft, akTop, akRight] Properties.DateButtons = [btnToday] Properties.PostPopupValueOnTab = True @@ -88,24 +30,45 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 360 end + object edtFechaFin: TcxDateEdit + Left = 72 + Top = 103 + Anchors = [akLeft, akTop, akRight] + Properties.DateButtons = [btnToday] + Properties.PostPopupValueOnTab = True + Properties.SaveTime = False + Properties.ShowTime = False + Properties.OnValidate = edtFechaFinPropertiesValidate + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 2 + Width = 362 + end object cbPeriodo: TcxComboBox - Left = 3 - Top = 21 + Left = 33 + Top = 49 RepositoryItem = cxRepositoryPeriodos Anchors = [akLeft, akTop, akRight] Properties.OnChange = cbPeriodoPropertiesChange @@ -114,114 +77,21 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 2 + TabOrder = 0 Text = 'Este mes' Width = 429 end - end - object TBXLabel2: TTBXLabel - Left = 0 - Top = 0 - Width = 451 - Height = 29 - Margins.Top = 5 - Margins.Bottom = 10 - Align = alTop - Caption = 'Periodo' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentColor = True - ParentFont = False - Underline = True - end - object TBXAlignmentPanel3: TTBXAlignmentPanel - AlignWithMargins = True - Left = 3 - Top = 135 - Width = 445 - Height = 98 - Margins.Left = 5 - Margins.Top = 5 - Margins.Right = 5 - Align = alTop - AutoSize = True - TabOrder = 2 - DesignSize = ( - 445 - 98) - object Label4: TLabel - Left = 5 - Top = 5 - Width = 435 - Height = 13 - Align = alTop - Caption = 'Rango de fechas de vencimiento:' - Transparent = True - ExplicitWidth = 160 - end - object Label5: TLabel - Left = 29 - Top = 53 - Width = 34 - Height = 13 - Caption = 'Desde:' - Transparent = True - end - object Label6: TLabel - Left = 32 - Top = 80 - Width = 31 - Height = 13 - Caption = 'hasta:' - Transparent = True - end - object edtFechaVenFin: TcxDateEdit - Left = 70 - Top = 77 - Anchors = [akLeft, akTop, akRight] - Properties.DateButtons = [btnToday] - Properties.PostPopupValueOnTab = True - Properties.SaveTime = False - Properties.ShowTime = False - Properties.OnValidate = edtFechaVenFinPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 0 - Width = 362 - end object edtFechaVenIni: TcxDateEdit Left = 72 - Top = 50 + Top = 181 Anchors = [akLeft, akTop, akRight] Properties.DateButtons = [btnToday] Properties.PostPopupValueOnTab = True @@ -233,24 +103,45 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 1 - Width = 360 + TabOrder = 4 + Width = 529 + end + object edtFechaVenFin: TcxDateEdit + Left = 72 + Top = 208 + Anchors = [akLeft, akTop, akRight] + Properties.DateButtons = [btnToday] + Properties.PostPopupValueOnTab = True + Properties.SaveTime = False + Properties.ShowTime = False + Properties.OnValidate = edtFechaVenFinPropertiesValidate + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 5 + Width = 531 end object cbPeriodo2: TcxComboBox - Left = 3 - Top = 21 + Left = 33 + Top = 154 RepositoryItem = cxRepositoryPeriodos Anchors = [akLeft, akTop, akRight] Properties.OnChange = cbPeriodo2PropertiesChange @@ -259,21 +150,74 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 2 + TabOrder = 3 Text = 'Este mes' - Width = 429 + Width = 598 + end + object dxLayoutControl1Group_Root: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group3: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Periodo:' + object dxLayoutControl1Group1: TdxLayoutGroup + Caption = 'Rango de fechas:' + LookAndFeel = dxLayoutOfficeLookAndFeel1 + object dxLayoutControl1Item3: TdxLayoutItem + Caption = 'Rango de fechas:' + ShowCaption = False + Control = cbPeriodo + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Desde:' + Control = edtFechaIni + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'hasta:' + Control = edtFechaFin + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Group2: TdxLayoutGroup + AutoAligns = [aaHorizontal] + Caption = 'Rango de fechas de vencimiento:' + LookAndFeel = dxLayoutOfficeLookAndFeel1 + object dxLayoutControl1Item6: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Rango de fechas de vencimiento:' + ShowCaption = False + Control = cbPeriodo2 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Desde:' + Control = edtFechaVenIni + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'hasta:' + Control = edtFechaVenFin + ControlOptions.ShowBorder = False + end + end + end end end object cxRepository: TcxEditRepository @@ -286,19 +230,32 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Properties.ImmediatePost = True Properties.ImmediateUpdateText = True Properties.Items.Strings = ( - 'Hoy' - 'Ayer' - 'Esta semana' + 'Personalizado' + 'Este trimestre' + 'El trimestre anterior' + 'Primer trimestre (Ene-Mar)' + 'Segundo trimestre (Abr-Jun)' + 'Tercer trimestre (Jul-Sep)' + 'Cuarto trimestre (Sep-Dic)' 'Este mes' - 'Este a'#241'o' - #218'ltimos 7 d'#237'as' - #218'ltimos 30 d'#237'as' - #218'ltimos 3 meses' 'Mes anterior' - 'A'#241'o anterior' - 'Personalizado') + 'Este a'#241'o' + 'A'#241'o anterior') Properties.PostPopupValueOnTab = True Properties.ReadOnly = False end end + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 120 + Top = 24 + object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel + GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET + GroupOptions.CaptionOptions.Font.Color = clWindowText + GroupOptions.CaptionOptions.Font.Height = -11 + GroupOptions.CaptionOptions.Font.Name = 'Tahoma' + GroupOptions.CaptionOptions.Font.Style = [fsBold] + GroupOptions.CaptionOptions.TextColor = clHighlight + GroupOptions.CaptionOptions.UseDefaultFont = False + end + end end diff --git a/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.pas b/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.pas index d96a031e..4ab49a16 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewPeriodoFechas.pas @@ -21,19 +21,23 @@ type cxRepositoryPeriodos: TcxEditRepositoryComboBoxItem; edtFechaIni: TcxDateEdit; edtFechaFin: TcxDateEdit; - TBXLabel2: TTBXLabel; - TBXAlignmentPanel2: TTBXAlignmentPanel; - Label1: TLabel; - Label2: TLabel; - Label3: TLabel; - TBXAlignmentPanel3: TTBXAlignmentPanel; - Label4: TLabel; - Label5: TLabel; - Label6: TLabel; edtFechaVenFin: TcxDateEdit; edtFechaVenIni: TcxDateEdit; cbPeriodo: TcxComboBox; cbPeriodo2: TcxComboBox; + dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutControl1: TdxLayoutControl; + dxLayoutControl1Group1: TdxLayoutGroup; + dxLayoutControl1Group2: TdxLayoutGroup; + dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; + dxLayoutControl1Item4: TdxLayoutItem; + dxLayoutControl1Item5: TdxLayoutItem; + dxLayoutControl1Item6: TdxLayoutItem; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; + dxLayoutControl1Group3: TdxLayoutGroup; procedure cbPeriodoPropertiesChange(Sender: TObject); procedure edtFechaIni2PropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; @@ -58,6 +62,12 @@ type procedure SetFechaVenInicial(const Value: Variant); public + procedure EsteTrimestre(const ATipoFecha: TTipoFecha); + procedure TrimestreAnterior(const ATipoFecha: TTipoFecha); + procedure PrimerTrimestre(const ATipoFecha: TTipoFecha); + procedure SegundoTrimestre(const ATipoFecha: TTipoFecha); + procedure TercerTrimestre(const ATipoFecha: TTipoFecha); + procedure CuartoTrimestre(const ATipoFecha: TTipoFecha); procedure Hoy(const ATipoFecha: TTipoFecha); procedure Ayer(const ATipoFecha: TTipoFecha); procedure EstaSemana(const ATipoFecha: TTipoFecha); @@ -78,7 +88,7 @@ type implementation -uses DateUtils; +uses DateUtils, Math; {$R *.dfm} @@ -152,6 +162,20 @@ begin end; end; +procedure TfrViewPeriodoFechas.EsteTrimestre(const ATipoFecha: TTipoFecha); +var + ATrimestre : Integer; +begin + ATrimestre := Ceil(MonthOf(Today)/3); + + case ATrimestre of + 1: PrimerTrimestre(ATipoFecha); + 2: SegundoTrimestre(ATipoFecha); + 3: TercerTrimestre(ATipoFecha); + 4: CuartoTrimestre(ATipoFecha); + end; +end; + function TfrViewPeriodoFechas.GetFechaFinal: Variant; begin Result := edtFechaFin.EditValue; @@ -212,6 +236,34 @@ begin end; end; +procedure TfrViewPeriodoFechas.PrimerTrimestre(const ATipoFecha: TTipoFecha); +begin + case ATipoFecha of + TFecha: begin + edtFechaIni.Date := EncodeDate(YearOf(Today), 1, 1); + edtFechaFin.Date := EncodeDate(YearOf(Today), 3, 31); + end; + TFechaVencimiento: begin + edtFechaVenIni.Date := EncodeDate(YearOf(Today), 1, 1); + edtFechaVenFin.Date := EncodeDate(YearOf(Today), 3, 31);; + end; + end; +end; + +procedure TfrViewPeriodoFechas.SegundoTrimestre(const ATipoFecha: TTipoFecha); +begin + case ATipoFecha of + TFecha: begin + edtFechaIni.Date := EncodeDate(YearOf(Today), 4, 1); + edtFechaFin.Date := EncodeDate(YearOf(Today), 6, 30); + end; + TFechaVencimiento: begin + edtFechaVenIni.Date := EncodeDate(YearOf(Today), 4, 1); + edtFechaVenFin.Date := EncodeDate(YearOf(Today), 6, 30);; + end; + end; +end; + procedure TfrViewPeriodoFechas.SetFechaFinal(const Value: Variant); begin edtFechaFin.EditValue := Value; @@ -232,6 +284,34 @@ begin edtFechaVenIni.EditValue := Value; end; +procedure TfrViewPeriodoFechas.TercerTrimestre(const ATipoFecha: TTipoFecha); +begin + case ATipoFecha of + TFecha: begin + edtFechaIni.Date := EncodeDate(YearOf(Today), 7, 1); + edtFechaFin.Date := EncodeDate(YearOf(Today), 9, 30); + end; + TFechaVencimiento: begin + edtFechaVenIni.Date := EncodeDate(YearOf(Today), 7, 1); + edtFechaVenFin.Date := EncodeDate(YearOf(Today), 9, 30);; + end; + end; +end; + +procedure TfrViewPeriodoFechas.TrimestreAnterior(const ATipoFecha: TTipoFecha); +var + ATrimestre : Integer; +begin + ATrimestre := Ceil(MonthOf(Today)/3)-1; + + case ATrimestre of + 0: CuartoTrimestre(ATipoFecha); + 1: PrimerTrimestre(ATipoFecha); + 2: SegundoTrimestre(ATipoFecha); + 3: TercerTrimestre(ATipoFecha); + end; +end; + procedure TfrViewPeriodoFechas.Ultimos30dias(const ATipoFecha: TTipoFecha); begin case ATipoFecha of @@ -277,16 +357,17 @@ end; procedure TfrViewPeriodoFechas.cbPeriodo2PropertiesChange(Sender: TObject); begin case (Sender as TcxComboBox).ItemIndex of - 0 : Hoy(TFechaVencimiento); - 1 : Ayer(TFechaVencimiento); - 2 : EstaSemana(TFechaVencimiento); - 3 : EsteMes(TFechaVencimiento); - 4 : EsteAno(TFechaVencimiento); - 5 : Ultimos7dias(TFechaVencimiento); - 6 : Ultimos30dias(TFechaVencimiento); - 7 : Ultimos3meses(TFechaVencimiento); - 8 : MesAnterior(TFechaVencimiento); - 9 : AnoAnterior(TFechaVencimiento); + 0 : Personalizado(TFechaVencimiento); + 1 : EsteTrimestre(TFechaVencimiento); + 2 : TrimestreAnterior(TFechaVencimiento); + 3 : PrimerTrimestre(TFechaVencimiento); + 4 : SegundoTrimestre(TFechaVencimiento); + 5 : TercerTrimestre(TFechaVencimiento); + 6 : CuartoTrimestre(TFechaVencimiento); + 7 : EsteMes(TFechaVencimiento); + 8 : MesAnterior(TFecha); + 9 : EsteAno(TFechaVencimiento); + 10 : AnoAnterior(TFechaVencimiento); else Personalizado(TFechaVencimiento); end; @@ -295,16 +376,17 @@ end; procedure TfrViewPeriodoFechas.cbPeriodoPropertiesChange(Sender: TObject); begin case (Sender as TcxComboBox).ItemIndex of - 0 : Hoy(TFecha); - 1 : Ayer(TFecha); - 2 : EstaSemana(TFecha); - 3 : EsteMes(TFecha); - 4 : EsteAno(TFecha); - 5 : Ultimos7dias(TFecha); - 6 : Ultimos30dias(TFecha); - 7 : Ultimos3meses(TFecha); + 0 : Personalizado(TFecha); + 1 : EsteTrimestre(TFecha); + 2 : TrimestreAnterior(TFecha); + 3 : PrimerTrimestre(TFecha); + 4 : SegundoTrimestre(TFecha); + 5 : TercerTrimestre(TFecha); + 6 : CuartoTrimestre(TFecha); + 7 : EsteMes(TFecha); 8 : MesAnterior(TFecha); - 9 : AnoAnterior(TFecha); + 9 : EsteAno(TFecha); + 10 : AnoAnterior(TFecha); else Personalizado(TFecha); end; @@ -313,9 +395,23 @@ end; constructor TfrViewPeriodoFechas.Create(AOwner: TComponent); begin inherited; - cbPeriodo.ItemIndex := -1; + cbPeriodo.ItemIndex := 1; cbPeriodo2.ItemIndex := -1; - EsteAno(TFecha); + EsteTrimestre(TFecha); +end; + +procedure TfrViewPeriodoFechas.CuartoTrimestre(const ATipoFecha: TTipoFecha); +begin + case ATipoFecha of + TFecha: begin + edtFechaIni.Date := EncodeDate(YearOf(Today), 10, 1); + edtFechaFin.Date := EncodeDate(YearOf(Today), 12, 31); + end; + TFechaVencimiento: begin + edtFechaVenIni.Date := EncodeDate(YearOf(Today), 10, 1); + edtFechaVenFin.Date := EncodeDate(YearOf(Today), 12, 31);; + end; + end; end; procedure TfrViewPeriodoFechas.edtFechaIni2PropertiesValidate(