diff --git a/Source/Base/GUIBase/GUIBase.res b/Source/Base/GUIBase/GUIBase.res index 8b251f31..1641339f 100644 Binary files a/Source/Base/GUIBase/GUIBase.res and b/Source/Base/GUIBase/GUIBase.res differ diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm index 4afdccc8..741101b2 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm @@ -366,9 +366,11 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo end inherited cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn Width = 32 + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMPHeaderClick end inherited cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn Width = 32 + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMPHeaderClick end inherited cxGridViewIMP_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn Width = 32 @@ -390,13 +392,24 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo end inherited cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn Width = 31 + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMPHeaderClick end inherited cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn Width = 33 + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMPHeaderClick + end + inherited cxGridViewPOR_MARGEN_PRO_COMP: TcxGridDBColumn + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_COMPHeaderClick end inherited cxGridViewID_DETALLE: TcxGridDBColumn Caption = '-' end + inherited cxGridViewCANTIDAD: TcxGridDBColumn + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewCANTIDADHeaderClick + end + inherited cxGridViewIMP_MARGEN_PRO_COMP_TOTAL: TcxGridDBColumn + OnHeaderClick = frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_COMP_TOTALHeaderClick + end end end inherited dxPrintStyleManager1: TdxPrintStyleManager diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas index 91380479..00b2f1da 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas @@ -29,6 +29,20 @@ type frViewPeriodoFechas1: TfrViewPeriodoFechas; procedure actRefrescarExecute(Sender: TObject); procedure actPeriodoFechasExecute(Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_COMPHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewCANTIDADHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_COMP_TOTALHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMPHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMPHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMPHeaderClick( + Sender: TObject); + procedure frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMPHeaderClick( + Sender: TObject); protected FDatos : IBizInfMargenArticulo; @@ -47,11 +61,14 @@ type end; implementation +{$R *.dfm} + +uses schInfMargenArticuloClient_Intf; const PERIODO = 0; -{$R *.dfm} + { TfrViewInfMargenArticulo } @@ -68,6 +85,76 @@ begin end; +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewCANTIDADHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaCANTIDAD).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaCANTIDAD).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_COMP_TOTALHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaIMP_MARGEN_PRO_COMP_TOTAL).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaIMP_MARGEN_PRO_COMP_TOTAL).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMPHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClienteIMP_MARGEN_PRO_VENT_PRO_COMP).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMPHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClienteIMP_MARGEN_ULT_VENT_ULT_COMP).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_COMPHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaPOR_MARGEN_PRO_COMP).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorFacturaPOR_MARGEN_PRO_COMP).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMPHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClientePOR_MARGEN_PRO_VENT_PRO_COMP).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfMargenArticulo.frViewInfMargenArticuloGrid1cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMPHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP).SortOrder := soAscending; + frViewInfMargenArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfMargenPorClientePOR_MARGEN_ULT_VENT_ULT_COMP).Summary.SortByGroupFooterSummary := True; + frViewInfMargenArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + function TfrViewInfMargenArticulo.GetDatos: IBizInfMargenArticulo; begin Result := FDatos; diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas index 3c89a9e9..cc94c564 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas @@ -28,11 +28,8 @@ type frViewInfVentasArticuloGrid1: TfrViewInfVentasArticuloGrid; procedure actRefrescarExecute(Sender: TObject); procedure actPeriodoFechasExecute(Sender: TObject); - procedure Button1Click(Sender: TObject); - procedure frViewInfVentasArticuloGrid1cxGridViewIMPORTE_TOTAL_VENTAHeaderClick( - Sender: TObject); - procedure frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick( - Sender: TObject); + procedure frViewInfVentasArticuloGrid1cxGridViewIMPORTE_TOTAL_VENTAHeaderClick(Sender: TObject); + procedure frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick(Sender: TObject); protected FDatos : IBizInfVentasArticulo; FModificado : Boolean; @@ -70,8 +67,7 @@ begin pcParametros.ActivePage := TabSheet5; end; -procedure TfrViewInfVentasArticulo.frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick( - Sender: TObject); +procedure TfrViewInfVentasArticulo.frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick(Sender: TObject); begin inherited; frViewInfVentasArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; @@ -174,12 +170,6 @@ begin Refresh; end; -procedure TfrViewInfVentasArticulo.Button1Click(Sender: TObject); -begin - inherited; -// -end; - procedure TfrViewInfVentasArticulo.OnViewInformeBaseGridChanged( Sender: TObject); begin diff --git a/Source/Modulos/Informes base/Views/uViewInformeBaseGrid.dfm b/Source/Modulos/Informes base/Views/uViewInformeBaseGrid.dfm index b81e865c..b0574b74 100644 --- a/Source/Modulos/Informes base/Views/uViewInformeBaseGrid.dfm +++ b/Source/Modulos/Informes base/Views/uViewInformeBaseGrid.dfm @@ -73,7 +73,6 @@ inherited frViewInformeBaseGrid: TfrViewInformeBaseGrid ReportDocument.CreationDate = 38877.461868113420000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 - OptionsExpanding.ExpandGroupRows = True OptionsFormatting.SuppressBackgroundBitmaps = True OptionsFormatting.UseNativeStyles = True OptionsFormatting.ConsumeSelectionStyle = True @@ -95,6 +94,7 @@ inherited frViewInformeBaseGrid: TfrViewInformeBaseGrid object cxStyleRepositoryInforme: TcxStyleRepository Left = 112 Top = 48 + PixelsPerInch = 96 object cxStyleContentInforme: TcxStyle AssignedValues = [svColor, svFont, svTextColor] Color = clWhite