diff --git a/Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.dfm index 20196b5b..74d9d834 100644 --- a/Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Plugin/uPluginHistoricoMovimientos.dfm @@ -144,6 +144,7 @@ object PluginHistoricoMovimientos: TPluginHistoricoMovimientos object actHistoricoMovimientos: TAction Category = 'Log'#237'stica' Caption = 'Hist'#243'rico de movimiento' + Enabled = False ImageIndex = 0 OnExecute = actHistoricoMovimientosExecute end diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm index a6c5d459..ece75e88 100644 --- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm @@ -5,7 +5,7 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos ClientHeight = 620 ClientWidth = 902 ExplicitWidth = 910 - ExplicitHeight = 654 + ExplicitHeight = 647 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -149,8 +149,9 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos ExplicitWidth = 902 end inherited TBXTMain2: TTBXToolbar - Left = 334 - ExplicitLeft = 334 + Left = 275 + DockPos = 275 + ExplicitLeft = 275 end end inherited StatusBar: TJvStatusBar diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm index 63968094..9e09812e 100644 --- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm @@ -113,12 +113,6 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos end end inherited cxStyleRepository1: TcxStyleRepository - inherited cxStyleEven: TcxStyle - AssignedValues = [svFont] - end - inherited cxStyleOdd: TcxStyle - AssignedValues = [svColor, svFont] - end inherited cxStyleSelection: TcxStyle AssignedValues = [svColor, svFont, svTextColor] end diff --git a/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm b/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm index cbf19ee5..44eea858 100644 --- a/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm +++ b/Source/Modulos/Inventario/Plugin/uPluginInventario.dfm @@ -50,6 +50,7 @@ object PluginInventario: TPluginInventario object actInventario: TAction Category = 'Log'#237'stica' Caption = 'Inventario' + Enabled = False ImageIndex = 0 OnExecute = actInventarioExecute end diff --git a/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm b/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm index 45c441c9..6582fe49 100644 --- a/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm +++ b/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm @@ -5,7 +5,7 @@ inherited fEditorDetalleReservas: TfEditorDetalleReservas ClientHeight = 540 ClientWidth = 669 ExplicitWidth = 677 - ExplicitHeight = 574 + ExplicitHeight = 567 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm index 1b0de772..272426a3 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm @@ -2,6 +2,7 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen Caption = 'Seleccionar art'#237'culos' ClientWidth = 656 ExplicitWidth = 664 + ExplicitHeight = 567 PixelsPerInch = 96 TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] @@ -48,12 +49,14 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen inherited TBXDock: TTBXDock Top = 87 Width = 656 + Height = 49 ExplicitTop = 87 ExplicitWidth = 656 + ExplicitHeight = 49 inherited tbxMain: TTBXToolbar Align = alLeft DockPos = -6 - ExplicitWidth = 284 + ExplicitWidth = 274 inherited TBXItem2: TTBXItem Visible = False end @@ -68,12 +71,12 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end end inherited tbxFiltro: TTBXToolbar - Left = 284 + Left = 274 Top = 23 Align = alLeft DockPos = 101 DockRow = 1 - ExplicitLeft = 284 + ExplicitLeft = 274 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -83,8 +86,12 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen ExplicitWidth = 656 end inherited TBXTMain2: TTBXToolbar - Left = 264 - ExplicitLeft = 264 + Left = 543 + Top = 23 + DockPos = 559 + DockRow = 1 + ExplicitLeft = 543 + ExplicitTop = 23 end end inherited StatusBar: TJvStatusBar @@ -133,15 +140,15 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end end inherited frViewInventario1: TfrViewInventario [5] - Top = 162 + Top = 136 Width = 656 - Height = 310 + Height = 336 ExplicitTop = 162 ExplicitWidth = 656 ExplicitHeight = 310 inherited cxGrid: TcxGrid Width = 656 - Height = 182 + Height = 208 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 656 ExplicitHeight = 182 @@ -182,20 +189,24 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen Width = 246 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 381 + ExplicitLeft = 381 ExplicitWidth = 241 Width = 241 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 656 + ExplicitWidth = 656 inherited tbxBotones: TTBXToolbar Width = 646 + ExplicitWidth = 646 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 284 + Top = 310 ExplicitTop = 284 ExplicitWidth = 656 inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas index 42fc5339..fd31962d 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas @@ -12,7 +12,7 @@ uses JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls, uEditorArticulos, uBizArticulos, uIEditorElegirArticulosAlmacen, JvExComCtrls, JvStatusBar, uEditorInventario, uViewInventario, uBizInventario, - JSDialog; + JSDialog, uDAInterfaces; type TfEditorElegirArticulosAlmacen = class(TfEditorInventario, IEditorElegirArticulosAlmacen) diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm index 96af0d4a..615a67ae 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm @@ -1,5 +1,18 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo Caption = 'fEditorElegirArticulosCatalogo' + ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 + inherited TBXDock: TTBXDock + Height = 49 + ExplicitHeight = 49 + inherited TBXTMain2: TTBXToolbar + Left = 401 + Top = 23 + DockPos = 401 + DockRow = 1 + ExplicitLeft = 401 + ExplicitTop = 23 + end + end end diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas index b01a6fba..b659c1b8 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas @@ -9,7 +9,7 @@ uses StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls, JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, - JvgWizardHeader, uIEditorElegirArticulosCatalogo; + JvgWizardHeader, uIEditorElegirArticulosCatalogo, uDAInterfaces; type TfEditorElegirArticulosCatalogo = class(TfEditorElegirArticulos, IEditorElegirArticulosCatalogo) diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas index 1567247b..89b5dd3a 100644 --- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas +++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas @@ -13,7 +13,8 @@ uses uIEditorEntradaSalidaArticulos, uInventarioController, JvExComCtrls, JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin, - dxLayoutControl, cxStyles, StdCtrls, Buttons, TBXDkPanels, uBizPedidosProveedor; + dxLayoutControl, cxStyles, StdCtrls, Buttons, TBXDkPanels, uBizPedidosProveedor, + uDAInterfaces; type TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos) diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.pas b/Source/Modulos/Inventario/Views/uEditorInventario.pas index f37a4e8e..a6e191eb 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.pas +++ b/Source/Modulos/Inventario/Views/uEditorInventario.pas @@ -11,7 +11,8 @@ uses JvAppRegistryStorage, JvFormPlacement, pngimage, ExtCtrls, uCustomView, uViewBase, uViewBarraSeleccion, JvComponentBase, uEditorGridBase, uIEditorInventario, uBizInventario, uViewGridBase, uInventarioController, - JvExComCtrls, JvStatusBar, uViewGrid2Niveles, JSDialog, uBizAlmacenes; + JvExComCtrls, JvStatusBar, uViewGrid2Niveles, JSDialog, uBizAlmacenes, + uDAInterfaces; type diff --git a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas index e8ad9c31..cb8d63b2 100644 --- a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas +++ b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas @@ -11,7 +11,8 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, - ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase; + ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, + uDAInterfaces; type IViewElegirArticulosCatalogo = interface(IViewArticulos) diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm index 66abad7f..d1481e4a 100644 --- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm +++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm @@ -72,9 +72,6 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos end end end - inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 39253.500748333330000000 diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas index 7429ca1b..883c2cbe 100644 --- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas +++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas @@ -14,11 +14,11 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uAlmacenesController, uBizAlmacenes, TB2Item, TBX, TB2Dock, TB2Toolbar, uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, TBXDkPanels, - uViewFiltroBase, cxSpinEdit; + uViewFiltroBase, cxSpinEdit, uDAInterfaces; type IViewViewEntradaSalidaArticulos = interface(IViewGrid) - ['{71338ADF-30FD-44AA-974F-8270D228268B}'] + ['{C195FC01-604A-484E-A809-0ED49890DBBE}'] // function GetAlmacenes: IBizAlmacen; // property Almacenes: IBizAlmacen read GetAlmacenes; end; diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm index f26ec0aa..3f42b4b9 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.dfm +++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm @@ -9,7 +9,7 @@ inherited frViewInventario: TfrViewInventario Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter - Column = cxGridViewCOSTE_UNIDADES + Column = cxGridViewCOSTE_UNIDADES end> DataController.Summary.FooterSummaryItems = < item @@ -168,12 +168,6 @@ inherited frViewInventario: TfrViewInventario end end inherited cxStyleRepository1: TcxStyleRepository - inherited cxStyleEven: TcxStyle - AssignedValues = [svFont] - end - inherited cxStyleOdd: TcxStyle - AssignedValues = [svColor, svFont] - end inherited cxStyleSelection: TcxStyle AssignedValues = [svColor, svFont, svTextColor] end diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas index 83fdce17..1f8a7b95 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.pas +++ b/Source/Modulos/Inventario/Views/uViewInventario.pas @@ -14,7 +14,7 @@ uses cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox, cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid, uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces; type IViewInventario = interface(IViewGrid)