diff --git a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm index b49d277a..620c995e 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm @@ -302,112 +302,6 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo ExplicitWidth = 457 ExplicitHeight = 347 inherited cxGridView: TcxGridDBTableView - DataController.Summary.DefaultGroupSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end> - DataController.Summary.FooterSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end> inherited cxGridViewREFERENCIA: TcxGridDBColumn [9] end inherited cxGridViewFAMILIA: TcxGridDBColumn [10] diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm index 741101b2..2557576c 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm @@ -165,112 +165,6 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo ExplicitWidth = 578 ExplicitHeight = 462 inherited cxGridView: TcxGridDBTableView - DataController.Summary.DefaultGroupSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end> - DataController.Summary.FooterSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = frViewInfMargenArticuloGrid1.cxGridViewPOR_MARGEN_PRO_COMP - end> inherited cxGridViewID_EMPRESA: TcxGridDBColumn Width = 20 end diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm index 0aa8bf5e..884ec772 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm @@ -1,19 +1,17 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid - Width = 774 - Height = 480 - ExplicitWidth = 774 - ExplicitHeight = 480 + Width = 794 + Height = 508 + ExplicitWidth = 794 + ExplicitHeight = 508 object cxGrid: TcxGrid [0] Left = 0 Top = 0 - Width = 774 - Height = 480 + Width = 794 + Height = 508 Align = alClient TabOrder = 0 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True - ExplicitWidth = 583 - ExplicitHeight = 378 object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.CustomizeDialog = False @@ -23,113 +21,9 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid DataController.KeyFieldNames = 'RecID' DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText] DataController.Summary.DefaultGroupSummaryItems.OnSummary = cxGridViewDataControllerSummaryDefaultGroupSummaryItemsSummary - DataController.Summary.DefaultGroupSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Position = spFooter - Column = cxGridViewPOR_MARGEN_PRO_COMP - end> + DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems.OnSummary = cxGridViewDataControllerSummaryFooterSummaryItemsSummary - DataController.Summary.FooterSummaryItems = < - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_COMPRA - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_ULT_COMP - end - item - Format = ',0.00 %;-,0.00 %' - Column = cxGridViewPOR_MARGEN_PRO_COMP - end> + DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> DataController.Summary.OnAfterSummary = cxGridViewDataControllerSummaryAfterSummary DataController.OnGroupingChanged = cxGridViewDataControllerGroupingChanged @@ -477,9 +371,8 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid object cxGridViewPOR_MARGEN_ULT_COMP: TcxGridDBColumn Caption = '% margen venta - ult. compra' DataBinding.FieldName = 'POR_MARGEN_ULT_COMP' - PropertiesClassName = 'TcxSpinEditProperties' + PropertiesClassName = 'TcxCalcEditProperties' Properties.DisplayFormat = ',0.00 %;-,0.00 %' - Properties.EditFormat = ',0.00 %;-,0.00 %' FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -494,14 +387,13 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid object cxGridViewPOR_MARGEN_PRO_COMP: TcxGridDBColumn Caption = '% margen venta - compra pro.' DataBinding.FieldName = 'POR_MARGEN_PRO_COMP' - PropertiesClassName = 'TcxSpinEditProperties' - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - Properties.EditFormat = ',0.00 %;-,0.00 %' + PropertiesClassName = 'TcxCurrencyEditProperties' FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end object cxGridViewID_DETALLE: TcxGridDBColumn DataBinding.FieldName = 'ID_DETALLE' + PropertiesClassName = 'TcxMaskEditProperties' VisibleForCustomization = False end object cxGridViewIMP_UNIDAD: TcxGridDBColumn diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas index 36dfaa0b..2cdc828d 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas @@ -11,7 +11,7 @@ uses cxCurrencyEdit, cxCalendar, dxPSGlbl, dxPSUtl, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSEngn, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPgsDlg, - cxDropDownEdit, StdCtrls, cxSpinEdit; + cxDropDownEdit, StdCtrls, cxSpinEdit, cxMaskEdit, cxCalc; type IViewInfMargenArticuloGrid = interface(IViewInformeBaseGrid)