From 929485d207df35103655861f3424baa43ecf3d99 Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 22 Sep 2008 10:15:39 +0000 Subject: [PATCH] =?UTF-8?q?Se=20modifica=20la=20opci=C3=B3n=20de=20expandi?= =?UTF-8?q?r=20las=20filas=20del=20grupo=20siempre=20que=20se=20imprima,?= =?UTF-8?q?=20para=20que=20los=20informes=20salgan=20igual=20que=20el=20lo?= =?UTF-8?q?s=20ve.=20Se=20=C3=B1aaden=20ordenes=20de=20grupo=20en=20los=20?= =?UTF-8?q?informes=20de=20margen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@283 c93665c3-c93d-084d-9b98-7d5f4a9c3376 --- Source/Base/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes .../Views/uViewInfMargenArticulo.dfm | 13 +++ .../Views/uViewInfMargenArticulo.pas | 89 +++++++++++++++++- .../Views/uViewInfVentasArticulo.pas | 16 +--- .../Views/uViewInformeBaseGrid.dfm | 2 +- 5 files changed, 105 insertions(+), 15 deletions(-) diff --git a/Source/Base/GUIBase/GUIBase.res b/Source/Base/GUIBase/GUIBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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