diff --git a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm index 7f96b730..1a309735 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm @@ -2,11 +2,17 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos Left = 489 Top = 325 Caption = 'Cajas / Bancos' + ClientHeight = 497 + ClientWidth = 774 + ExplicitWidth = 782 + ExplicitHeight = 531 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader + Width = 774 Caption = 'Cajas / Bancos' inherited Image1: TImage + Left = 747 Picture.Data = { 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741 @@ -31,23 +37,21 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos end end inherited TBXDock: TTBXDock + Width = 774 inherited tbxMain: TTBXToolbar - ExplicitWidth = 543 + ExplicitWidth = 561 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end - inherited TBXItem37: TTBXItem - Visible = False - end + end + inherited tbxMenu: TTBXToolbar + ExplicitWidth = 774 end inherited TBXTMain2: TTBXToolbar - Left = 275 DockPos = 275 Visible = True - ExplicitLeft = 275 ExplicitWidth = 129 object TBXItem38: TTBXItem Action = actCerrarCaja @@ -55,11 +59,15 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos end end end + inherited StatusBar: TJvStatusBar + Top = 478 + Width = 774 + end inline frViewExtractoMovimientos1: TfrViewExtractoMovimientos [3] Left = 0 Top = 102 - Width = 543 - Height = 323 + Width = 774 + Height = 376 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -73,8 +81,8 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos ExplicitWidth = 543 ExplicitHeight = 323 inherited cxGrid: TcxGrid - Width = 543 - Height = 195 + Width = 774 + Height = 248 ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView @@ -100,47 +108,47 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 543 + Width = 774 ExplicitWidth = 543 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 543 inherited dxLayoutControl1: TdxLayoutControl - Width = 543 + Width = 774 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 468 - Width = 468 + ExplicitWidth = 446 + Width = 446 end inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 239 - Width = 239 + ExplicitWidth = 232 + Width = 232 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 336 - ExplicitLeft = 336 - ExplicitWidth = 201 - Width = 201 + Left = 474 + ExplicitLeft = 474 + ExplicitWidth = 197 + Width = 197 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 774 ExplicitWidth = 543 inherited tbxBotones: TTBXToolbar - Width = 533 + Width = 764 ExplicitWidth = 533 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 297 + Top = 350 ExplicitTop = 297 ExplicitWidth = 543 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 774 ExplicitWidth = 543 inherited TBXToolbar1: TTBXToolbar - Width = 533 + Width = 764 ExplicitWidth = 533 end end diff --git a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm index b438f186..ca9fbf4d 100644 --- a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm @@ -112,24 +112,24 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 468 - Width = 468 + ExplicitWidth = 273 + Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 246 - Width = 246 + ExplicitWidth = 242 + Width = 242 end inherited edtFechaFinFiltro: TcxDateEdit Left = 346 ExplicitLeft = 346 - ExplicitWidth = 201 - Width = 201 + ExplicitWidth = 198 + Width = 198 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 + ExplicitWidth = 128 end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink diff --git a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas index bed08f8b..6ae9b2cf 100644 --- a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas +++ b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas @@ -14,7 +14,13 @@ uses dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit, cxCurrencyEdit, uBizSubCuentas, uAsientosController; + cxImageComboBox, cxTextEdit, cxCurrencyEdit, uBizSubCuentas, uAsientosController, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, + dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinXmas2008Blue, dxSkinscxPCPainter; type IViewExtractoMovimientos = interface(IViewGrid) @@ -64,7 +70,7 @@ type FOnExtractoChange: TNotifyEvent; function GetExtractoChange: TNotifyEvent; procedure SetExtractoChange(const Value: TNotifyEvent); - + procedure AnadirFiltroFechas; protected FSubCuentas: IBizSubCuenta; FDiario: IBizDiario; @@ -77,6 +83,7 @@ type procedure SetController (const Value : IAsientosController); virtual; public + procedure AnadirOtrosFiltros; override; property OnExtractoChange: TNotifyEvent read GetExtractoChange write SetExtractoChange; property Diario: IBizDiario read GetDiario write SetDiario; property SubCuentas: IBizSubCuenta read GetSubCuentas write SetSubCuentas; @@ -178,6 +185,39 @@ begin end; end; +procedure TfrViewExtractoMovimientos.AnadirFiltroFechas; +var + Columna: TcxGridDBColumn; + Fecha1, Fecha2: Variant; + FFiltro : TcxFilterCriteriaItemList; +begin + Fecha1 := frViewFiltroBase1.edtFechaIniFiltro.EditValue; + Fecha2 := frViewFiltroBase1.edtFechaFinFiltro.EditValue; + + if not VarIsNull(Fecha1) and not VarIsNull(Fecha2) then + begin + _FocusedView.DataController.Filter.Options := [fcoCaseInsensitive, fcoSoftCompare]; + FFiltro := AddFilterGrid(fboAnd); + + Columna := _FocusedView.GetColumnByFieldName('FECHA_ASIENTO'); + FFiltro.AddItem(Columna, foBetween, varArrayOf([Fecha1, Fecha2]), VarToStr(Fecha1) + ' and ' + VarToStr(Fecha2)); + end; +end; + +procedure TfrViewExtractoMovimientos.AnadirOtrosFiltros; +begin + inherited; + + AnadirFiltroFechas; + + //Finalmente activamos el filtro si tenemos algo + if _FocusedView.DataController.Filter.IsEmpty then + _FocusedView.DataController.Filter.Active := False + else + _FocusedView.DataController.Filter.Active := True; + cxGrid.ActiveLevel.GridView := _FocusedView; +end; + procedure TfrViewExtractoMovimientos.CustomViewDestroy(Sender: TObject); begin FSubCuentas := Nil;