diff --git a/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.dfm b/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.dfm index 037ce6c..144215c 100644 --- a/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.dfm +++ b/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.dfm @@ -1,16 +1,19 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso Left = 231 Top = 105 - Width = 687 - Height = 607 ActiveControl = frViewControlVentaProceso1.bRefrescar Caption = 'fEditorControlVentaProceso' + ClientHeight = 580 + ClientWidth = 679 OnCreate = CustomEditorCreate OnGetModified = CustomEditorGetModified + ExplicitWidth = 687 + ExplicitHeight = 607 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 679 + ExplicitWidth = 679 inherited Image1: TImage Left = 652 Picture.Data = { @@ -121,11 +124,14 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso C10A81CB3473FC0DB2225DFCB9A5A4F503AA278C2F5BBE2DBBC71ADDBA002CF8 F13D59B8E9F7F066177AA5A3F33360CC4F636672CA84D06667415206ECF2771B AB353ACBD60C48D5FE0066D96D9CD7814D110000000049454E44AE426082} + ExplicitLeft = 652 end end inherited TBXDock: TTBXDock Width = 679 + ExplicitWidth = 679 inherited tbxMain: TTBXToolbar + ExplicitWidth = 679 object TBXSeparatorItem16: TTBXSeparatorItem [13] end object tbxiExpandir: TTBXItem [14] @@ -140,6 +146,7 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso end end inherited tbxMenu: TTBXToolbar + ExplicitWidth = 679 inherited TBXSubmenuItem6: TTBXSubmenuItem object TBXItem37: TTBXItem [0] Action = actExpandir @@ -156,14 +163,16 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso end end inherited StatusBar: TStatusBar - Top = 554 + Top = 561 Width = 679 + ExplicitTop = 561 + ExplicitWidth = 679 end inline frViewControlVentaProceso1: TfrViewControlVentaProceso [3] Left = 0 Top = 76 Width = 679 - Height = 478 + Height = 485 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -173,110 +182,157 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso ParentFont = False TabOrder = 3 ReadOnly = False + ExplicitTop = 76 + ExplicitWidth = 679 + ExplicitHeight = 485 inherited TBXMultiDock1: TTBXMultiDock Width = 238 - Height = 478 + Height = 485 + ExplicitWidth = 238 + ExplicitHeight = 485 inherited pnlParametros: TTBXDockablePanel DockedWidth = 234 SplitHeight = 240 + ExplicitWidth = 238 + ExplicitHeight = 244 inherited TBXAlignmentPanel2: TTBXAlignmentPanel Width = 234 + ExplicitWidth = 234 inherited TBXLink1: TTBXLink Width = 226 + ExplicitWidth = 226 end inherited TBXLink5: TTBXLink Width = 226 + ExplicitWidth = 226 end inherited TBXLink2: TTBXLink Width = 226 + ExplicitWidth = 226 end end inherited pcParametros: TPageControl Width = 234 - Height = 121 + Height = 127 + ExplicitWidth = 234 + ExplicitHeight = 127 inherited tsColumnas: TTabSheet + ExplicitHeight = 1 inherited frViewColumnas1: TfrViewColumnas - Height = 0 + Height = 1 + ExplicitHeight = 1 inherited lbColumnas: TcxCheckListBox Height = 0 + ExplicitHeight = 0 end end end inherited tsAgrupacion: TTabSheet + ExplicitWidth = 226 + ExplicitHeight = 117 inherited frViewAgrupaciones1: TfrViewAgrupaciones Width = 226 - Height = 111 + Height = 117 + ExplicitWidth = 226 + ExplicitHeight = 117 inherited TBXLabel1: TTBXLabel Width = 226 + ExplicitWidth = 226 end inherited pnlAgrupaciones: TTBXAlignmentPanel Width = 226 + ExplicitWidth = 226 inherited TBXButton1: TTBXButton Width = 114 + ExplicitWidth = 114 end inherited TBXButton3: TTBXButton Width = 114 + ExplicitWidth = 114 end inherited TBXButton2: TTBXButton Width = 114 + ExplicitWidth = 114 end end end end end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 188 + Top = 194 Width = 234 - inherited bRefrescar: TButton - OnClick = frViewControlVentaProceso1bRefrescarClick - end + ExplicitTop = 194 + ExplicitWidth = 234 end end inherited pnlTareas: TTBXDockablePanel - Top = 240 + Top = 244 DockedWidth = 234 - DockPos = 240 + DockPos = 244 SplitHeight = 222 + ExplicitTop = 244 + ExplicitWidth = 238 + ExplicitHeight = 225 inherited TBXPageScroller1: TTBXPageScroller Width = 234 - Height = 200 + Height = 205 + ExplicitWidth = 234 + ExplicitHeight = 205 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 234 + ExplicitWidth = 234 inherited bFiltros: TTBXLink Width = 226 + ExplicitWidth = 226 end inherited bSumarios: TTBXLink Width = 226 + ExplicitWidth = 226 end end inherited pcTareas: TPageControl Width = 234 - Height = 152 + Height = 157 + ExplicitWidth = 234 + ExplicitHeight = 157 inherited tsSumarios: TTabSheet + ExplicitHeight = 50 inherited frViewSumarios1: TfrViewSumarios - Height = 48 + Height = 50 + ExplicitHeight = 50 inherited vgSumarios: TcxVerticalGrid - Height = 19 + Height = 21 + ExplicitHeight = 19 end end end inherited tsFiltros: TTabSheet + ExplicitWidth = 226 + ExplicitHeight = 147 inherited frViewFiltros1: TfrViewFiltros Width = 226 - Height = 142 + Height = 147 + ExplicitWidth = 226 + ExplicitHeight = 147 inherited vgFiltros: TcxVerticalGrid Height = 130 + ExplicitHeight = 130 end inherited TBXLabel1: TTBXLabel Width = 226 + ExplicitWidth = 226 end inherited cxFilterControl1: TcxFilterControl Width = 226 - Height = 83 + Height = 88 + ExplicitWidth = 226 + ExplicitHeight = 88 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 112 + Top = 117 Width = 226 + ExplicitTop = 117 + ExplicitWidth = 226 end inherited cxStyleRepository1: TcxStyleRepository Left = 24 @@ -291,10 +347,15 @@ inherited fEditorControlVentaProceso: TfEditorControlVentaProceso inherited frViewControlGridVentaProceso1: TfrViewControlGridVentaProceso Left = 238 Width = 441 - Height = 478 + Height = 485 + ExplicitLeft = 238 + ExplicitWidth = 441 + ExplicitHeight = 485 inherited cxGrid: TcxGrid Width = 441 - Height = 478 + Height = 485 + ExplicitWidth = 441 + ExplicitHeight = 485 inherited cxGridView: TcxGridDBTableView DataController.DataSource = dsVentasProceso end diff --git a/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.pas b/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.pas index b35e453..664c32c 100644 --- a/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.pas +++ b/Source/Modulos/VentasProceso/Cliente/uEditorControlVentaProceso.pas @@ -9,7 +9,7 @@ uses PngImageList, StdActns, ActnList, ComCtrls, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uBizControlesBase, uCustomView, uViewBase, uViewControlBase, uViewControlVentaProceso, - Grids, DBGrids, pngimage; + Grids, DBGrids, pngimage, uDAInterfaces; type IEditorControlVentaProceso = interface(IEditorControlBase) diff --git a/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.dfm b/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.dfm index 8004f66..03cda1a 100644 --- a/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.dfm +++ b/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.dfm @@ -1,6 +1,8 @@ inherited frViewControlGridVentaProceso: TfrViewControlGridVentaProceso Width = 632 Height = 419 + ExplicitWidth = 632 + ExplicitHeight = 419 object cxGrid: TcxGrid [0] Left = 0 Top = 0 diff --git a/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.pas b/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.pas index b4637dd..a3336b0 100644 --- a/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.pas +++ b/Source/Modulos/VentasProceso/Cliente/uViewControGridlVentaProceso.pas @@ -134,7 +134,10 @@ begin Exit; AColumn := FocusedView.GetColumnByFieldName('FECHA'); - if Assigned(AColumn) and (AColumn.Visible) then + if Assigned(AColumn) and (AColumn.Visible) + //Esta opción se añade para evitar un error cuando fecha sea nula, en tal caso, comprobar la vista RDX_V_VENTASEDI_RESUELTAS + //porque esta devolviendo tuplas sin valor en la columna PRODUTO + and not VarIsNull(ARecord.Values[AColumn.Index]) then begin try AFecha := VarToDateTime(ARecord.Values[AColumn.Index]); diff --git a/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.dfm b/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.dfm index 1c5d52e..49c3dad 100644 --- a/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.dfm +++ b/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.dfm @@ -1,2 +1,8 @@ inherited frViewControlesVentaProceso: TfrViewControlesVentaProceso + inherited EasyListview: TEasyListview + Header.Columns.Items = { + 0500000001000000110000005445617379436F6C756D6E53746F726564FFFECE + 0005000000800800010000010000000000000121010000000000000000000000 + 00000000000000} + end end diff --git a/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.pas b/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.pas index 637f1e4..c9e069b 100644 --- a/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.pas +++ b/Source/Modulos/VentasProceso/Cliente/uViewControlesVentaProceso.pas @@ -7,7 +7,7 @@ uses Dialogs, uViewControlesBase, cxGraphics, cxCustomData, cxStyles, cxTL, cxImageComboBox, cxMaskEdit, cxTextEdit, DB, uDADataTable, ImgList, PngImageList, cxInplaceContainer, cxDBTL, cxControls, cxTLData, - MPCommonObjects, MPCommonUtilities, EasyListview; + MPCommonObjects, MPCommonUtilities, EasyListview, uDAInterfaces; type IViewControlesVentaProceso = interface(IViewControlesBase)