diff --git a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.rc b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.rc index e69de29..153736a 100644 --- a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.rc +++ b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.res b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.res index 86c94e6..8b251f3 100644 Binary files a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.res and b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.res differ diff --git a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.dproj b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.dproj index 1977a2e..3081c5f 100644 --- a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.dproj +++ b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.dproj @@ -55,15 +55,15 @@ MainSource - - - - - - - - - + + + + + + + + +
fEditorRemesaCliente
TfEditorRemesaCliente diff --git a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.rc b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.rc index e69de29..153736a 100644 --- a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.rc +++ b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.res b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.res index 36f26e2..8b251f3 100644 Binary files a/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.res and b/Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.res differ diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm index d5bf5aa..545947e 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm @@ -4,12 +4,12 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente HorzScrollBar.Visible = False VertScrollBar.Visible = False Caption = 'Ficha de remesa de cobro' - ClientHeight = 583 + ClientHeight = 483 ClientWidth = 676 Scaled = False OnClose = CustomEditorClose ExplicitWidth = 684 - ExplicitHeight = 617 + ExplicitHeight = 517 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -51,21 +51,21 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente AnchorY = 14 end end - inherited TBXDock: TTBXDock + inherited TBXDock: TSpTBXDock Width = 676 ExplicitWidth = 676 - inherited tbxMain: TTBXToolbar + inherited tbxMain: TSpTBXToolbar DockPos = 0 ExplicitWidth = 569 - inherited TBXItem2: TTBXItem + inherited TBXItem2: TSpTBXItem Visible = False end - inherited TBXItem5: TTBXItem + inherited TBXItem5: TSpTBXItem Visible = False end - object TBXSeparatorItem6: TTBXSeparatorItem [11] + object TBXSeparatorItem6: TSpTBXSeparatorItem [11] end - object TBXSubmenuItem3: TTBXSubmenuItem [12] + object TBXSubmenuItem3: TSpTBXSubmenuItem [12] Caption = 'Volcar a disco' object TBItem1: TTBItem Action = actNorma19 @@ -75,43 +75,43 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente end end end - inherited tbxMenu: TTBXToolbar + inherited tbxMenu: TSpTBXToolbar DockPos = 0 ExplicitWidth = 676 - inherited TBXSubmenuItem4: TTBXSubmenuItem - inherited TBXItem8: TTBXItem + inherited TBXSubmenuItem4: TSpTBXSubmenuItem + inherited TBXItem8: TSpTBXItem Visible = False end - inherited TBXSeparatorItem5: TTBXSeparatorItem + inherited TBXSeparatorItem5: TSpTBXSeparatorItem Visible = False end - inherited TBXItem10: TTBXItem + inherited TBXItem10: TSpTBXItem Visible = False end - inherited TBXItem21: TTBXItem + inherited TBXItem21: TSpTBXItem Visible = False end - inherited TBXItem22: TTBXItem + inherited TBXItem22: TSpTBXItem Visible = False end - inherited TBXItem9: TTBXItem + inherited TBXItem9: TSpTBXItem Visible = False end end - inherited TBXSubmenuItem1: TTBXSubmenuItem - inherited TBXItem32: TTBXItem + inherited TBXSubmenuItem1: TSpTBXSubmenuItem + inherited TBXItem32: TSpTBXItem Visible = False end - inherited TBXItem31: TTBXItem + inherited TBXItem31: TSpTBXItem Visible = False end - inherited TBXSeparatorItem13: TTBXSeparatorItem + inherited TBXSeparatorItem13: TSpTBXSeparatorItem Visible = False end end - object TBXSubmenuItem2: TTBXSubmenuItem [4] + object TBXSubmenuItem2: TSpTBXSubmenuItem [4] Caption = 'A&cciones' - object TBXItem7: TTBXItem + object TBXItem7: TSpTBXItem Action = actNorma19 end end @@ -119,15 +119,15 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente end inherited pgPaginas: TPageControl Width = 670 - Height = 436 + Height = 336 MultiLine = True ExplicitWidth = 670 - ExplicitHeight = 436 + ExplicitHeight = 336 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 662 - ExplicitHeight = 408 + ExplicitHeight = 308 inline frViewRemesaCliente1: TfrViewRemesaCliente Left = 0 Top = 0 @@ -146,13 +146,12 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente ExplicitHeight = 145 inherited dxLayoutControlRemesaCliente: TdxLayoutControl Width = 662 - Height = 160 Align = alTop ExplicitWidth = 662 - ExplicitHeight = 160 + ExplicitHeight = 304 DesignSize = ( 662 - 160) + 304) inherited eReferencia: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -208,7 +207,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 0 Top = 145 Width = 662 - Height = 263 + Height = 163 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -223,11 +222,11 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente ReadOnly = False ExplicitTop = 145 ExplicitWidth = 662 - ExplicitHeight = 263 + ExplicitHeight = 163 inherited cxGrid: TcxGrid Left = 15 Width = 632 - Height = 223 + Height = 123 ExplicitLeft = 15 ExplicitWidth = 632 ExplicitHeight = 223 @@ -254,12 +253,24 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Width = 632 ExplicitLeft = 15 ExplicitWidth = 632 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end end inherited StatusBar: TJvStatusBar - Top = 564 + Top = 464 Width = 676 Panels = < item @@ -270,7 +281,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 518 + Top = 418 Width = 676 Height = 46 Align = alBottom @@ -291,10 +302,10 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente ExplicitWidth = 676 ExplicitHeight = 46 inherited Bevel3: TBevel - Left = 328 + Left = 327 Top = 10 Height = 30 - ExplicitLeft = 328 + ExplicitLeft = 327 ExplicitTop = 10 ExplicitHeight = 30 end @@ -302,9 +313,11 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 440 Top = 52 Width = 192 + Height = 9 ExplicitLeft = 440 ExplicitTop = 52 ExplicitWidth = 192 + ExplicitHeight = 9 end inherited ImporteDto: TcxDBCurrencyEdit Left = 163 @@ -335,14 +348,14 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Width = 147 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 441 + Left = 440 Top = 141 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 441 + ExplicitLeft = 440 ExplicitTop = 141 ExplicitWidth = 217 Width = 217 @@ -453,9 +466,9 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Width = 90 end inherited bTiposIVA: TButton - Left = 180 + Left = 179 Top = 91 - ExplicitLeft = 180 + ExplicitLeft = 179 ExplicitTop = 91 end inherited cbRecargoEquivalencia: TcxDBCheckBox @@ -473,7 +486,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False ShowBorder = False inherited dxLayoutControl1Group2: TdxLayoutGroup Visible = False diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.pas b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.pas index b97365d..f737bfe 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.pas @@ -6,16 +6,17 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uEditorDBItem, ToolWin, ComCtrls, JvExControls, JvComponent, uViewRemesaCliente, uBizRemesasCliente, JvNavigationPane, ActnList, - uEditorBase, StdActns, TB2Dock, TB2Toolbar, TBX, ImgList, PngImageList, + uEditorBase, StdActns, TB2Dock, TB2Toolbar, ImgList, PngImageList, TB2Item, uEditorItem, DB, uDADataTable, uEditorDBBase, JvFormAutoSize, uDAScriptingProvider, uDACDSDataTable, StdCtrls, pngimage, ExtCtrls, - TBXDkPanels, JvButton, AppEvnts, uCustomView, uViewBase, + SpTBXDkPanels, JvButton, AppEvnts, uCustomView, uViewBase, JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase, cxCustomData, uViewRemesasCliente, uIEditorRemesaCliente, uRemesasClienteController, JvExComCtrls, JvStatusBar, dxLayoutLookAndFeels, uViewGridBase, uViewGrid, uViewRecibosRemesaCliente, uViewTotales, uViewDetallesGenerico, uDAInterfaces, - cxControls, cxContainer, cxEdit, cxLabel; + cxControls, cxContainer, cxEdit, cxLabel, cxGraphics, cxLookAndFeels, + cxLookAndFeelPainters, SpTBXItem; type TfEditorRemesaCliente = class(TfEditorDBItem, IEditorRemesaCliente) @@ -25,11 +26,11 @@ type frViewTotales1: TfrViewTotales; frViewRecibosRemesaCliente1: TfrViewRecibosRemesaCliente; actNorma19: TAction; - TBXSubmenuItem2: TTBXSubmenuItem; - TBXItem7: TTBXItem; - TBXSeparatorItem6: TTBXSeparatorItem; + TBXSubmenuItem2: TSpTBXSubmenuItem; + TBXItem7: TSpTBXItem; + TBXSeparatorItem6: TSpTBXSeparatorItem; actNorma32: TAction; - TBXSubmenuItem3: TTBXSubmenuItem; + TBXSubmenuItem3: TSpTBXSubmenuItem; TBItem1: TTBItem; TBItem2: TTBItem; procedure FormShow(Sender: TObject); diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.dfm index 064b260..a8a556b 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.dfm @@ -1,5 +1,7 @@ inherited fEditorRemesaClientePreview: TfEditorRemesaClientePreview Caption = 'Previsualizar la remesa' + ExplicitWidth = 320 + ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 end diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.pas b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.pas index 549fa9c..99b2840 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.pas +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaClienteReport.pas @@ -6,11 +6,12 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uEditorPreview, JvAppStorage, JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls, - TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, + TB2ExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorRemesasClientePreview, JvExComCtrls, JvStatusBar, frxExportText, frxExportRTF, frxExportMail, frxExportXLS, frxExportImage, frxExportPDF, frxClass, frxDCtrl, frxGradient, - frxChBox, frxCross, frxRich, frxOLE, frxBarcode; + frxChBox, frxCross, frxRich, frxOLE, frxBarcode, StdCtrls, TntStdCtrls, + SpTBXEditors, SpTBXItem; type TfEditorRemesaClientePreview = class(TfEditorPreview, IEditorRemesasClientePreview) diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm index eb56795..33fe91c 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm @@ -41,44 +41,42 @@ inherited fEditorRemesasCliente: TfEditorRemesasCliente ExplicitLeft = 516 end end - inherited TBXDock: TTBXDock + inherited TBXDock: TSpTBXDock Width = 785 ExplicitWidth = 785 - inherited tbxMain: TTBXToolbar + inherited tbxMain: TSpTBXToolbar ExplicitWidth = 561 - object TBXSeparatorItem17: TTBXSeparatorItem [12] + object TBXSeparatorItem17: TSpTBXSeparatorItem [12] end end - inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 359 - inherited lblAno: TTBXLabelItem + inherited tbxFiltro: TSpTBXToolbar + ExplicitWidth = 326 + inherited lblAno: TSpTBXLabelItem Visible = True end - inherited cbxListaAnos: TTBXComboBoxItem + inherited sepAno: TSpTBXSeparatorItem Visible = True end - inherited sepAno: TTBXSeparatorItem - Visible = True - end - inherited tbxEditFiltro: TTBXEditItem - EditOptions = [tboUseEditWhenVertical] - end - inherited TBXItem37: TTBXItem + inherited TBXItem37: TSpTBXItem Visible = False end + inherited cbxListaAnos: TSpTBXComboBox + Left = 33 + ExplicitLeft = 33 + end end - inherited tbxMenu: TTBXToolbar + inherited tbxMenu: TSpTBXToolbar ExplicitWidth = 785 - object TBXSubmenuItem2: TTBXSubmenuItem [4] + object TBXSubmenuItem2: TSpTBXSubmenuItem [4] Caption = 'A&cciones' - object TBXItem38: TTBXItem + object TBXItem38: TSpTBXItem Action = actVolcarDisco end end end - inherited TBXTMain2: TTBXToolbar - Left = 359 - ExplicitLeft = 359 + inherited TBXTMain2: TSpTBXToolbar + Left = 326 + ExplicitLeft = 326 end end inherited StatusBar: TJvStatusBar @@ -1529,6 +1527,10 @@ inherited fEditorRemesasCliente: TfEditorRemesasCliente end> Bitmap = {} end + inherited StatusBarImages: TPngImageList + Left = 48 + Top = 352 + end inherited GridPopupMenu: TPopupMenu object N4: TMenuItem [8] Caption = '-' diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas index 9a49143..3859fbb 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas @@ -6,29 +6,30 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uEditorBase, ToolWin, ComCtrls, JvExControls, JvComponent, JvNavigationPane, uViewRemesasCliente, uBizRemesasCliente, ActnList, DBActns, uViewGrid, - Menus, uDataModuleBase, ImgList, PngImageList, TB2Dock, TB2Toolbar, TBX, - TB2Item, StdActns, TB2ExtItems, TBXExtItems, TB2MRU, DB, uDADataTable, + Menus, uDataModuleBase, ImgList, PngImageList, TB2Dock, TB2Toolbar, + TB2Item, StdActns, TB2ExtItems, TB2MRU, DB, uDADataTable, JvFormAutoSize, uDAScriptingProvider, uDACDSDataTable, JvAppStorage, JvAppRegistryStorage, JvFormPlacement, ExtCtrls, uCustomView, uViewBase, uViewBarraSeleccion, pngimage, uIEditorRemesasCliente, uEditorGridBase, JvComponentBase, uViewGridBase, uRemesasClienteController, JvExComCtrls, - JvStatusBar, JSDialog, uDAInterfaces; + JvStatusBar, JSDialog, uDAInterfaces, SpTBXItem, StdCtrls, TntStdCtrls, + SpTBXEditors; type TfEditorRemesasCliente = class(TfEditorGridBase, IEditorRemesasCliente) actVolcarDisco: TAction; - TBXSeparatorItem17: TTBXSeparatorItem; + TBXSeparatorItem17: TSpTBXSeparatorItem; N4: TMenuItem; Volcaradisco1: TMenuItem; - TBXSubmenuItem2: TTBXSubmenuItem; - TBXItem38: TTBXItem; + TBXSubmenuItem2: TSpTBXSubmenuItem; + TBXItem38: TSpTBXItem; JsListaRemesasNoEliminadas: TJSDialog; JsPrevisualizarDialog: TJSDialog; JsImprimirDialog: TJSDialog; procedure FormShow(Sender: TObject); procedure actVolcarDiscoExecute(Sender: TObject); procedure actVolcarDiscoUpdate(Sender: TObject); - procedure OnListaAnosChange(Sender: TObject; const Text: string); + procedure OnListaAnosChange(Sender: TObject); private FRemesasCliente: IBizRemesaCliente; @@ -154,9 +155,9 @@ begin FController.Ver(RemesasCliente); end; -procedure TfEditorRemesasCliente.OnListaAnosChange(Sender: TObject; const Text: string); +procedure TfEditorRemesasCliente.OnListaAnosChange(Sender: TObject); begin - Controller.FiltrarAno(RemesasCliente, DynWhereDataTable, Text); + Controller.FiltrarAno(RemesasCliente, DynWhereDataTable, cbxListaAnos.Text); if RemesasCliente.DataTable.Active then RefrescarInterno; end; @@ -336,4 +337,3 @@ end; end. - \ No newline at end of file diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.dfm index 9c59b2d..aaf7a27 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.dfm @@ -1,12 +1,12 @@ inherited frViewRecibosRemesaCliente: TfrViewRecibosRemesaCliente - Width = 549 - Height = 376 + Width = 570 + Height = 193 OnShow = CustomViewShow - ExplicitWidth = 549 - ExplicitHeight = 376 + ExplicitWidth = 570 + ExplicitHeight = 193 inherited cxGrid: TcxGrid - Width = 549 - Height = 351 + Width = 570 + Height = 168 ExplicitWidth = 549 ExplicitHeight = 351 inherited cxGridView: TcxGridDBTableView @@ -137,7 +137,7 @@ inherited frViewRecibosRemesaCliente: TfrViewRecibosRemesaCliente end end inherited ToolBar1: TToolBar - Width = 549 + Width = 570 ExplicitWidth = 549 inherited ToolButton1: TToolButton ExplicitWidth = 62 diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.pas b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.pas index ac52267..ca966ce 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente.pas @@ -9,7 +9,8 @@ uses uDADataTable, ComCtrls, ToolWin, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxImageComboBox, cxCurrencyEdit, - uBizRemesasCliente, uRemesasClienteController, uDAInterfaces; + uBizRemesasCliente, uRemesasClienteController, uDAInterfaces, cxLookAndFeels, + cxLookAndFeelPainters; type IViewRecibosRemesaCliente = interface diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm index 80c59c4..34b0616 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm @@ -1,32 +1,30 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente - Width = 725 - Height = 167 + Width = 525 + Height = 160 Align = alClient ExplicitWidth = 451 ExplicitHeight = 304 object dxLayoutControlRemesaCliente: TdxLayoutControl Left = 0 Top = 0 - Width = 725 - Height = 167 + Width = 525 + Height = 160 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False - AutoContentSizes = [acsWidth, acsHeight] - LookAndFeel = dxLayoutOfficeLookAndFeel1 + LayoutLookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 725 - 167) + 525 + 160) object eReferencia: TcxDBTextEdit Left = 110 Top = 30 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = dsDataTable - Enabled = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.Color = 14745599 @@ -72,7 +70,7 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Width = 108 end object edtFechaRemesa: TcxDBDateEdit - Left = 448 + Left = 348 Top = 30 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_REMESA' @@ -161,63 +159,65 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Width = 121 end object dxLayoutControlRemesaClienteGroup_Root: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avParentManaged + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControlRemesaClienteGroup1: TdxLayoutGroup - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Datos de la remesa' + CaptionOptions.Text = 'Datos de la remesa' + ButtonOptions.Buttons = <> object dxLayoutControlRemesaClienteGroup5: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControlRemesaClienteItem3: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Referencia:' + CaptionOptions.Text = 'Referencia:' Control = eReferencia ControlOptions.ShowBorder = False end object dxLayoutControlRemesaClienteItem4: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Fecha de cargo:' + CaptionOptions.Text = 'Fecha de cargo:' Control = edtFechaRemesa ControlOptions.ShowBorder = False end end object dxLayoutControlRemesaClienteGroup2: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControlRemesaClienteItem9: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Cuenta bancaria:' + CaptionOptions.Text = 'Cuenta bancaria:' Control = cbCuentaBancaria ControlOptions.ShowBorder = False end object dxLayoutControlRemesaClienteItem1: TdxLayoutItem - Caption = 'Forma de cobro:' + CaptionOptions.Text = 'Forma de cobro:' Enabled = False Visible = False Control = cbTipo ControlOptions.ShowBorder = False end object dxLayoutControlRemesaClienteItem8: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Descripci'#243'n:' + CaptionOptions.Text = 'Descripci'#243'n:' Control = eDescripcion ControlOptions.ShowBorder = False end end end object dxLayoutControlRemesaClienteGroup3: TdxLayoutGroup - Caption = 'New Group' - ShowCaption = False + CaptionOptions.Text = 'New Group' + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> LayoutDirection = ldHorizontal ShowBorder = False end diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas index b89b532..c386c8d 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas @@ -13,7 +13,8 @@ uses cxSpinEdit, cxCurrencyEdit, uBizRemesasCliente, uRemesasClienteController, cxCalendar, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, - cxImageComboBox, uDAInterfaces; + cxImageComboBox, uDAInterfaces, cxLookAndFeels, cxLookAndFeelPainters, + dxLayoutcxEditAdapters; type IViewRemesaCliente = interface(IViewBase) diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm index 25c2356..499fd20 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm @@ -1,8 +1,11 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente - Height = 420 - ExplicitHeight = 420 + Width = 622 + Height = 259 + ExplicitWidth = 622 + ExplicitHeight = 259 inherited cxGrid: TcxGrid - Height = 292 + Width = 622 + Height = 131 ExplicitHeight = 292 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'RecID' @@ -85,8 +88,11 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDockablePanel1: TTBXDockablePanel + Width = 622 + inherited TBXDockablePanel1: TSpTBXDockablePanel + Width = 622 inherited dxLayoutControl1: TdxLayoutControl + Width = 622 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -102,27 +108,44 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 276 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 276 ExplicitWidth = 221 Width = 221 end inherited eLista: TcxComboBox + Left = 467 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 467 ExplicitWidth = 215 Width = 215 end end + inherited TBXAlignmentPanel1: TSpTBXDockablePanel + Width = 612 + inherited tbxBotones: TSpTBXToolbar + Width = 612 + end + end end end - inherited pnlAgrupaciones: TTBXDockablePanel - Top = 394 + inherited pnlAgrupaciones: TSpTBXDockablePanel + Top = 233 + Width = 622 ExplicitTop = 394 + inherited TBXAlignmentPanel1: TSpTBXDockablePanel + Width = 622 + inherited TBXToolbar1: TSpTBXToolbar + Width = 622 + end + end end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink @@ -130,4 +153,7 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente BuiltInReportLink = True end end + inherited dxPSEngineController1: TdxPSEngineController + Active = True + end end diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas index 8fbddfa..c9822ac 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas @@ -11,10 +11,13 @@ uses cxGridBandedTableView, cxGridDBBandedTableView, JvComponent, JvFormAutoSize, PngImageList, ImgList, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, + dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox, - cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels, - TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces, uCustomView, uViewBase; + cxCheckComboBox, cxImageComboBox, TB2Item, TB2Toolbar, SpTBXDkPanels, + TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces, uCustomView, uViewBase, + cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore, dxPSPDFExport, + cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv, dxPScxEditorProducers, + dxPScxExtEditorProducers, dxPScxPageControlProducer, SpTBXItem; type IViewRemesasCliente = interface(IViewGrid) diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas index b2efcbb..4ddb1d6 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas @@ -156,7 +156,7 @@ end; procedure TfEditorRemesasProveedor.OnListaAnosChange(Sender: TObject); begin - Controller.FiltrarAno(RemesasProveedor, DynWhereDataTable, Text); + Controller.FiltrarAno(RemesasProveedor, DynWhereDataTable, cbxListaAnos.Text); if RemesasProveedor.DataTable.Active then RefrescarInterno; end;