diff --git a/Source/Modulos/Articulos/Data/Articulos_data.res b/Source/Modulos/Articulos/Data/Articulos_data.res index 02236de8..8b251f31 100644 Binary files a/Source/Modulos/Articulos/Data/Articulos_data.res and b/Source/Modulos/Articulos/Data/Articulos_data.res differ diff --git a/Source/Modulos/Articulos/Model/Articulos_model.res b/Source/Modulos/Articulos/Model/Articulos_model.res index 1641339f..8b251f31 100644 Binary files a/Source/Modulos/Articulos/Model/Articulos_model.res and b/Source/Modulos/Articulos/Model/Articulos_model.res differ diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas index 0311cafa..801176ec 100644 --- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas @@ -3,7 +3,7 @@ unit schArticulosClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -254,7 +254,7 @@ type end; { TArticulosDataTableRules } - TArticulosDataTableRules = class(TDADataTableRules, IArticulos) + TArticulosDataTableRules = class(TIntfObjectDADataTableRules, IArticulos) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); @@ -541,7 +541,7 @@ type end; { TArticulosParaClienteDataTableRules } - TArticulosParaClienteDataTableRules = class(TDADataTableRules, IArticulosParaCliente) + TArticulosParaClienteDataTableRules = class(TIntfObjectDADataTableRules, IArticulosParaCliente) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm index 4d3a0ba5..c9050f3f 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm @@ -2,12 +2,15 @@ inherited fEditorArticulos: TfEditorArticulos Left = 489 Top = 325 Caption = 'Lista de art'#237'culos' - ExplicitHeight = 471 + ClientWidth = 657 + ExplicitWidth = 665 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader + Width = 657 Caption = 'Lista de articulos' inherited Image1: TImage + Left = 630 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00 00001C0806000000720DDF940000000970485973000017120000171201679FD2 @@ -26,8 +29,9 @@ inherited fEditorArticulos: TfEditorArticulos end end inherited TBXDock: TTBXDock + Width = 657 inherited tbxMain: TTBXToolbar - ExplicitWidth = 543 + ExplicitWidth = 632 end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 @@ -38,11 +42,17 @@ inherited fEditorArticulos: TfEditorArticulos Visible = False end end - inherited TBXTMain2: TTBXToolbar - Left = 275 - DockPos = 275 - ExplicitLeft = 275 + inherited tbxMenu: TTBXToolbar + ExplicitWidth = 657 end + inherited TBXTMain2: TTBXToolbar + Left = 269 + DockPos = 267 + ExplicitLeft = 269 + end + end + inherited StatusBar: TJvStatusBar + Width = 657 end inherited EditorActionList: TActionList inherited actNuevo: TAction diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 549a5c3d..06408c47 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -3,6 +3,7 @@ inherited frViewArticulos: TfrViewArticulos ExplicitWidth = 539 inherited cxGrid: TcxGrid Width = 539 + ExplicitWidth = 539 inherited cxGridView: TcxGridDBTableView OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' @@ -66,9 +67,11 @@ inherited frViewArticulos: TfrViewArticulos end> Properties.PostPopupValueOnTab = True Properties.ShowDescriptions = False + Visible = False BestFitMaxWidth = 22 MinWidth = 22 Options.HorzSizing = False + VisibleForCustomization = False Width = 22 end object cxGridViewREFERENCIA: TcxGridDBColumn @@ -80,16 +83,17 @@ inherited frViewArticulos: TfrViewArticulos object cxGridViewFABRICANTE: TcxGridDBColumn Caption = 'Fabricante' DataBinding.FieldName = 'FABRICANTE' + BestFitMaxWidth = 80 end object cxGridViewDESCRIPCION: TcxGridDBColumn Caption = 'Descripci'#243'n' DataBinding.FieldName = 'DESCRIPCION' - BestFitMaxWidth = 120 Width = 120 end object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn Caption = 'Unid. medida' DataBinding.FieldName = 'UNIDAD_MEDIDA' + BestFitMaxWidth = 45 Width = 60 end object cxGridViewFAMILIA: TcxGridDBColumn @@ -115,6 +119,7 @@ inherited frViewArticulos: TfrViewArticulos DataBinding.FieldName = 'PRECIO_COSTE' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -124,6 +129,7 @@ inherited frViewArticulos: TfrViewArticulos PropertiesClassName = 'TcxSpinEditProperties' Properties.Alignment.Horz = taRightJustify Properties.DisplayFormat = ',0.00 %;-,0.00 %' + BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -132,6 +138,7 @@ inherited frViewArticulos: TfrViewArticulos DataBinding.FieldName = 'PRECIO_NETO' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -140,6 +147,7 @@ inherited frViewArticulos: TfrViewArticulos DataBinding.FieldName = 'PRECIO_PORTE' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -147,9 +155,12 @@ inherited frViewArticulos: TfrViewArticulos end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 539 + ExplicitWidth = 539 inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 539 inherited dxLayoutControl1: TdxLayoutControl Width = 539 + ExplicitWidth = 539 inherited txtFiltroTodo: TcxTextEdit ExplicitWidth = 273 Width = 273 @@ -167,18 +178,23 @@ inherited frViewArticulos: TfrViewArticulos end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 539 + ExplicitWidth = 539 inherited tbxBotones: TTBXToolbar Width = 529 + ExplicitWidth = 529 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Visible = True + ExplicitWidth = 539 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 539 + ExplicitWidth = 539 inherited TBXToolbar1: TTBXToolbar Width = 529 + ExplicitWidth = 529 object TBXSeparatorItem1: TTBXSeparatorItem end object TBXItem3: TTBXItem