diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 62ef90ca..98a24cbe 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm index ee96403a..02783127 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm +++ b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm @@ -6,8 +6,9 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo ClientWidth = 899 OnCreate = CustomEditorCreate OnGetModified = CustomEditorGetModified + ExplicitTop = -35 ExplicitWidth = 907 - ExplicitHeight = 705 + ExplicitHeight = 698 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -191,39 +192,36 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitWidth = 891 - ExplicitHeight = 522 + ExplicitTop = 102 + ExplicitWidth = 899 + ExplicitHeight = 550 inherited TBXMultiDock1: TTBXMultiDock Height = 440 - ExplicitTop = 110 - ExplicitHeight = 412 + ExplicitHeight = 440 inherited pnlParametros: TTBXDockablePanel ExplicitHeight = 205 inherited pcParametros: TPageControl - Height = 116 - ExplicitHeight = 102 + Height = 118 + ExplicitHeight = 118 inherited TabSheet5: TTabSheet - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 29 + ExplicitHeight = 31 end inherited tsColumnas: TTabSheet - ExplicitHeight = 92 + ExplicitHeight = 108 inherited frViewColumnas1: TfrViewColumnas - Height = 106 - ExplicitHeight = 92 + Height = 108 + ExplicitHeight = 108 inherited lbColumnas: TcxCheckListBox - Height = 77 - ExplicitHeight = 63 + Height = 79 + ExplicitHeight = 79 end end end inherited tsAgrupacion: TTabSheet - ExplicitHeight = 29 + ExplicitHeight = 31 inherited frViewAgrupaciones1: TfrViewAgrupaciones - Height = 29 - ExplicitHeight = 29 + Height = 31 + ExplicitHeight = 31 end end end @@ -234,34 +232,34 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo ExplicitTop = 205 ExplicitHeight = 219 inherited TBXPageScroller1: TTBXPageScroller - Height = 197 - ExplicitHeight = 183 + Height = 199 + ExplicitHeight = 199 inherited pcTareas: TPageControl - Height = 149 - ExplicitHeight = 135 + Height = 151 + ExplicitHeight = 151 inherited tsSumarios: TTabSheet - ExplicitHeight = 48 + ExplicitHeight = 50 inherited frViewSumarios1: TfrViewSumarios - Height = 48 - ExplicitHeight = 48 + Height = 50 + ExplicitHeight = 50 inherited vgSumarios: TcxVerticalGrid - Height = 19 - ExplicitHeight = 19 + Height = 21 + ExplicitHeight = 21 end end end inherited tsFiltros: TTabSheet - ExplicitHeight = 125 + ExplicitHeight = 141 inherited frViewFiltros1: TfrViewFiltros - Height = 139 - ExplicitHeight = 125 + Height = 141 + ExplicitHeight = 141 inherited cxFilterControl1: TcxFilterControl - Height = 80 - ExplicitHeight = 66 + Height = 82 + ExplicitHeight = 82 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 109 - ExplicitTop = 95 + Top = 111 + ExplicitTop = 111 end end end @@ -272,13 +270,13 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo inherited frViewInfVentasArticuloGrid1: TfrViewInfVentasArticuloGrid Width = 677 Height = 440 - ExplicitWidth = 669 - ExplicitHeight = 412 + ExplicitWidth = 677 + ExplicitHeight = 440 inherited cxGrid: TcxGrid Width = 677 Height = 440 - ExplicitWidth = 669 - ExplicitHeight = 412 + ExplicitWidth = 677 + ExplicitHeight = 440 end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle @@ -293,22 +291,21 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end inherited TBXMultiDock2: TTBXMultiDock Width = 899 - ExplicitWidth = 891 + ExplicitWidth = 899 inherited pnlIntervaloFechas: TTBXDockablePanel ExplicitWidth = 883 inherited TBXAlignmentPanel3: TTBXAlignmentPanel Width = 879 - ExplicitTop = 76 - ExplicitWidth = 871 + ExplicitWidth = 879 end inherited frViewPeriodoFechas1: TfrViewPeriodoFechas Width = 879 - ExplicitWidth = 871 + ExplicitWidth = 879 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 871 + ExplicitWidth = 879 inherited dxLayoutControl1: TdxLayoutControl Width = 879 - ExplicitWidth = 871 + ExplicitWidth = 879 end end end diff --git a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas index 9f1140d7..23280627 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas @@ -42,7 +42,6 @@ type procedure actPrevisualizarExecute(Sender: TObject); procedure actImprimirExecute(Sender: TObject); procedure actConfPaginaExecute(Sender: TObject); - procedure frViewInfVentasArticulo1bRefrescarClick(Sender: TObject); private FInformesController: IInformesController; procedure RestaurarConfiguracion; @@ -297,13 +296,6 @@ begin frViewInfVentasArticulo1.frViewInfVentasArticuloGrid1.PrintSetup; end; -procedure TfEditorInfVentasArticulo.frViewInfVentasArticulo1bRefrescarClick( - Sender: TObject); -begin - inherited; - frViewInfVentasArticulo1.actRefrescarExecute(Sender); -end; - constructor TfEditorInfVentasArticulo.Create(AOwner: TComponent); begin inherited; diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm index eefd8c89..51d4a6a0 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm @@ -4,35 +4,35 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo inherited TBXMultiDock1: TTBXMultiDock Top = 110 Height = 399 - ExplicitTop = 170 - ExplicitHeight = 339 + ExplicitTop = 110 + ExplicitHeight = 399 inherited pnlParametros: TTBXDockablePanel ExplicitHeight = 184 inherited pcParametros: TPageControl - Height = 95 - ExplicitHeight = 65 + Height = 97 + ExplicitHeight = 97 inherited TabSheet5: TTabSheet ExplicitLeft = 4 ExplicitTop = 6 ExplicitWidth = 210 - ExplicitHeight = 55 + ExplicitHeight = 87 end inherited tsColumnas: TTabSheet - ExplicitHeight = 55 + ExplicitHeight = 87 inherited frViewColumnas1: TfrViewColumnas - Height = 85 - ExplicitHeight = 55 + Height = 87 + ExplicitHeight = 87 inherited lbColumnas: TcxCheckListBox - Height = 56 - ExplicitHeight = 26 + Height = 58 + ExplicitHeight = 58 end end end inherited tsAgrupacion: TTabSheet - ExplicitHeight = 55 + ExplicitHeight = 87 inherited frViewAgrupaciones1: TfrViewAgrupaciones - Height = 85 - ExplicitHeight = 55 + Height = 87 + ExplicitHeight = 87 end end end @@ -43,34 +43,34 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo ExplicitTop = 184 ExplicitHeight = 199 inherited TBXPageScroller1: TTBXPageScroller - Height = 177 - ExplicitHeight = 147 + Height = 179 + ExplicitHeight = 179 inherited pcTareas: TPageControl - Height = 129 - ExplicitHeight = 99 + Height = 131 + ExplicitHeight = 131 inherited tsSumarios: TTabSheet - ExplicitHeight = 89 + ExplicitHeight = 121 inherited frViewSumarios1: TfrViewSumarios - Height = 119 - ExplicitHeight = 89 + Height = 121 + ExplicitHeight = 121 inherited vgSumarios: TcxVerticalGrid - Height = 90 - ExplicitHeight = 60 + Height = 92 + ExplicitHeight = 92 end end end inherited tsFiltros: TTabSheet - ExplicitHeight = 89 + ExplicitHeight = 121 inherited frViewFiltros1: TfrViewFiltros - Height = 119 - ExplicitHeight = 89 + Height = 121 + ExplicitHeight = 121 inherited cxFilterControl1: TcxFilterControl - Height = 60 - ExplicitHeight = 30 + Height = 62 + ExplicitHeight = 62 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 89 - ExplicitTop = 59 + Top = 91 + ExplicitTop = 91 end end end @@ -93,14 +93,22 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo TabOrder = 1 ReadOnly = False ExplicitLeft = 222 - ExplicitTop = 170 + ExplicitTop = 110 ExplicitWidth = 477 - ExplicitHeight = 339 + ExplicitHeight = 399 inherited cxGrid: TcxGrid Width = 477 Height = 399 ExplicitWidth = 477 - ExplicitHeight = 339 + ExplicitHeight = 399 + inherited cxGridView: TcxGridDBTableView + inherited cxGridViewCANTIDAD: TcxGridDBColumn + OnHeaderClick = frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick + end + inherited cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn + OnHeaderClick = frViewInfVentasArticuloGrid1cxGridViewIMPORTE_TOTAL_VENTAHeaderClick + end + end end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle @@ -124,7 +132,7 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo inherited TBXAlignmentPanel3: TTBXAlignmentPanel Top = 76 Width = 679 - ExplicitTop = 136 + ExplicitTop = 76 ExplicitWidth = 679 end inline frViewPeriodoFechas1: TfrViewPeriodoFechas @@ -142,15 +150,15 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo TabOrder = 1 ReadOnly = False ExplicitWidth = 679 - ExplicitHeight = 66 + ExplicitHeight = 76 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 679 - ExplicitHeight = 136 + ExplicitHeight = 76 inherited dxLayoutControl1: TdxLayoutControl Width = 679 Height = 76 ExplicitWidth = 679 - ExplicitHeight = 136 + ExplicitHeight = 76 inherited cbPeriodo: TcxComboBox Left = 54 ExplicitLeft = 54 diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas index 1450b13a..3c89a9e9 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas @@ -28,6 +28,11 @@ 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); protected FDatos : IBizInfVentasArticulo; FModificado : Boolean; @@ -45,14 +50,14 @@ type end; implementation +{$R *.dfm} +{ TfrViewInfVentasArticulo } + +uses schInfVentasArticuloClient_Intf; const PERIODO = 0; -{$R *.dfm} - -{ TfrViewInfVentasArticulo } - constructor TfrViewInfVentasArticulo.Create(AOwner: TComponent); begin inherited; @@ -65,6 +70,25 @@ begin pcParametros.ActivePage := TabSheet5; end; +procedure TfrViewInfVentasArticulo.frViewInfVentasArticuloGrid1cxGridViewCANTIDADHeaderClick( + Sender: TObject); +begin + inherited; + frViewInfVentasArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfVentasArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfVentasArticuloCANTIDAD).SortIndex := 1; + frViewInfVentasArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfVentasArticuloCANTIDAD).Summary.SortByGroupFooterSummary := True; + frViewInfVentasArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + +procedure TfrViewInfVentasArticulo.frViewInfVentasArticuloGrid1cxGridViewIMPORTE_TOTAL_VENTAHeaderClick(Sender: TObject); +begin + inherited; + frViewInfVentasArticuloGrid1.cxGridView.DataController.Groups.DataController.BeginUpdate; + frViewInfVentasArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfVentasArticuloIMPORTE_TOTAL_VENTA).SortOrder := soAscending; + frViewInfVentasArticuloGrid1.cxGridView.GetColumnByFieldName(fld_InfVentasArticuloIMPORTE_TOTAL_VENTA).Summary.SortByGroupFooterSummary := True; + frViewInfVentasArticuloGrid1.cxGridView.DataController.Groups.DataController.EndUpdate; +end; + function TfrViewInfVentasArticulo.GetDatos: IBizInfVentasArticulo; begin Result := FDatos; @@ -150,6 +174,12 @@ begin Refresh; end; +procedure TfrViewInfVentasArticulo.Button1Click(Sender: TObject); +begin + inherited; +// +end; + procedure TfrViewInfVentasArticulo.OnViewInformeBaseGridChanged( Sender: TObject); begin