diff --git a/Output/Debug/Cliente/AlbaranesCliente_view.bpl b/Output/Debug/Cliente/AlbaranesCliente_view.bpl index 3b67503d..fe130702 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_view.bpl and b/Output/Debug/Cliente/AlbaranesCliente_view.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl index 47323f2b..16fa43cc 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/FactuGES.exe b/Output/Debug/Cliente/FactuGES.exe index 162ac3b1..680668db 100644 Binary files a/Output/Debug/Cliente/FactuGES.exe and b/Output/Debug/Cliente/FactuGES.exe differ diff --git a/Output/Debug/Cliente/PedidosCliente_view.bpl b/Output/Debug/Cliente/PedidosCliente_view.bpl index 255c8668..bfb16547 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_view.bpl and b/Output/Debug/Cliente/PedidosCliente_view.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_view.bpl b/Output/Debug/Cliente/PedidosProveedor_view.bpl index 199e30bc..7ad8343a 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_view.bpl and b/Output/Debug/Cliente/PedidosProveedor_view.bpl differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index 470ae78b..686972f4 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -7,10 +7,11 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 596 Height = 351 RootLevelOptions.DetailTabsPosition = dtpTop - OnActiveTabChanged = cxGridActiveTabChanged + OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 inherited cxGridView: TcxGridDBTableView + OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -171,7 +172,17 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente inherited dxLayoutControl1: TdxLayoutControl Width = 596 ExplicitWidth = 596 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit + Left = 251 + ExplicitLeft = 251 ExplicitWidth = 294 Width = 294 end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index d4da1854..da3149b9 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -70,6 +70,8 @@ type procedure actClientesUpdate(Sender: TObject); procedure actAlmacenesExecute(Sender: TObject); procedure actAlmacenesUpdate(Sender: TObject); + procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, + Y: Integer); private //Filtros relativos a la vista @@ -211,6 +213,37 @@ begin ADone := True; end; +procedure TfrViewAlbaranesCliente.cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); +var + Site : TcxGridSite; + HitTest : TcxCustomGridHitTest; + Item : TcxCustomGridTableItem; + Rec : TcxCustomGridRecord; + sNewHint : string; +begin +{Este método desaparecerá cuando se migre la aplicación, es para sacar la causa de la incidencia sin necesidad de entrar en el documento} + Site := Sender as TcxGridSite; + HitTest := Site.GridView.ViewInfo.GetHitTest(X, Y); + if HitTest is TcxGridRecordCellHitTest then begin + Item := TcxGridRecordCellHitTest(HitTest).Item; + Rec := TcxGridRecordCellHitTest(HitTest).GridRecord; + + if (Item.Index = cxGridView.GetColumnByFieldName(fld_AlbaranesClienteINCIDENCIAS_ACTIVAS).Index) + and (Rec.Selected) + and (Albaranes.DataTable.FieldByName(fld_AlbaranesClienteINCIDENCIAS_ACTIVAS).AsInteger = 1) then begin + sNewHint := Albaranes.DataTable.FieldByName(fld_AlbaranesClienteINCIDENCIAS).AsString; + if (cxGrid.Hint <> sNewHint) then begin + cxGrid.ShowHint := false; + cxGrid.Hint := sNewHint; + end + else cxGrid.ShowHint := true; + end + else begin + cxGrid.ShowHint := false; + end; + end; +end; + procedure TfrViewAlbaranesCliente.cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index cab035cf..e0a1359e 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -10,11 +10,12 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor ExplicitWidth = 596 ExplicitHeight = 351 inherited cxGridView: TcxGridDBTableView + OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < item - Format = ',0.00 '#8364';-,0.00 '#8364 + Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter Column = cxGridViewIMPORTE_TOTAL @@ -152,12 +153,19 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 292 + ExplicitLeft = 292 ExplicitWidth = 217 Width = 217 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 596 + ExplicitWidth = 596 + inherited tbxBotones: TTBXToolbar + Width = 586 + ExplicitWidth = 586 + end end end end @@ -171,8 +179,6 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor ExplicitWidth = 596 inherited TBXToolbar1: TTBXToolbar Width = 586 - ExplicitLeft = 3 - ExplicitTop = 6 ExplicitWidth = 586 object TBXSeparatorItem2: TTBXSeparatorItem end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas index e24014c0..4fe86c32 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas @@ -57,6 +57,8 @@ type procedure actProveedorUpdate(Sender: TObject); procedure actAlmacenExecute(Sender: TObject); procedure actAlmacenUpdate(Sender: TObject); + procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, + Y: Integer); private //Filtros relativos a la vista @@ -170,6 +172,37 @@ begin ADone := True; end; +procedure TfrViewAlbaranesProveedor.cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); +var + Site : TcxGridSite; + HitTest : TcxCustomGridHitTest; + Item : TcxCustomGridTableItem; + Rec : TcxCustomGridRecord; + sNewHint : string; +begin +{Este método desaparecerá cuando se migre la aplicación, es para sacar la causa de la incidencia sin necesidad de entrar en el documento} + Site := Sender as TcxGridSite; + HitTest := Site.GridView.ViewInfo.GetHitTest(X, Y); + if HitTest is TcxGridRecordCellHitTest then begin + Item := TcxGridRecordCellHitTest(HitTest).Item; + Rec := TcxGridRecordCellHitTest(HitTest).GridRecord; + + if (Item.Index = cxGridView.GetColumnByFieldName(fld_AlbaranesProveedorINCIDENCIAS_ACTIVAS).Index) + and (Rec.Selected) + and (Albaranes.DataTable.FieldByName(fld_AlbaranesProveedorINCIDENCIAS_ACTIVAS).AsInteger = 1) then begin + sNewHint := Albaranes.DataTable.FieldByName(fld_AlbaranesProveedorINCIDENCIAS).AsString; + if (cxGrid.Hint <> sNewHint) then begin + cxGrid.ShowHint := false; + cxGrid.Hint := sNewHint; + end + else cxGrid.ShowHint := true; + end + else begin + cxGrid.ShowHint := false; + end; + end; +end; + procedure TfrViewAlbaranesProveedor.cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Lib/AlbaranesCliente_view.dcp b/Source/Modulos/Lib/AlbaranesCliente_view.dcp index dd72ce54..b135073b 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_view.dcp and b/Source/Modulos/Lib/AlbaranesCliente_view.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp index 3660887b..97e87cad 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_view.dcp b/Source/Modulos/Lib/PedidosCliente_view.dcp index de74779e..831ef343 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_view.dcp and b/Source/Modulos/Lib/PedidosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_view.dcp b/Source/Modulos/Lib/PedidosProveedor_view.dcp index 71619116..dc8cebbc 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_view.dcp and b/Source/Modulos/Lib/PedidosProveedor_view.dcp differ diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index fff85559..ebe189ca 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -6,11 +6,12 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor inherited cxGrid: TcxGrid Width = 596 Height = 351 - RootLevelOptions.DetailTabsPosition = dtpTop + RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 inherited cxGridView: TcxGridDBTableView + OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -160,7 +161,17 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor inherited dxLayoutControl1: TdxLayoutControl Width = 596 ExplicitWidth = 596 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit + Left = 251 + ExplicitLeft = 251 ExplicitWidth = 294 Width = 294 end @@ -170,6 +181,7 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor ExplicitWidth = 596 inherited tbxBotones: TTBXToolbar Width = 586 + ExplicitWidth = 586 end end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index 6865593a..f8c209a9 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -67,6 +67,8 @@ type procedure actProveedorUpdate(Sender: TObject); procedure actAlmacenExecute(Sender: TObject); procedure actAlmacenUpdate(Sender: TObject); + procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, + Y: Integer); private //Filtros relativos a la vista @@ -194,6 +196,37 @@ begin ADone := True; end; +procedure TfrViewPedidosProveedor.cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); +var + Site : TcxGridSite; + HitTest : TcxCustomGridHitTest; + Item : TcxCustomGridTableItem; + Rec : TcxCustomGridRecord; + sNewHint : string; +begin +{Este método desaparecerá cuando se migre la aplicación, es para sacar la causa de la incidencia sin necesidad de entrar en el documento} + Site := Sender as TcxGridSite; + HitTest := Site.GridView.ViewInfo.GetHitTest(X, Y); + if HitTest is TcxGridRecordCellHitTest then begin + Item := TcxGridRecordCellHitTest(HitTest).Item; + Rec := TcxGridRecordCellHitTest(HitTest).GridRecord; + + if (Item.Index = cxGridView.GetColumnByFieldName(fld_PedidosProveedorINCIDENCIAS_ACTIVAS).Index) + and (Rec.Selected) + and (Pedidos.DataTable.FieldByName(fld_PedidosProveedorINCIDENCIAS_ACTIVAS).AsInteger = 1) then begin + sNewHint := Pedidos.DataTable.FieldByName(fld_PedidosProveedorINCIDENCIAS).AsString; + if (cxGrid.Hint <> sNewHint) then begin + cxGrid.ShowHint := false; + cxGrid.Hint := sNewHint; + end + else cxGrid.ShowHint := true; + end + else begin + cxGrid.ShowHint := false; + end; + end; +end; + procedure TfrViewPedidosProveedor.cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm index 7bb57082..560dac0c 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm @@ -10,7 +10,8 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 - inherited cxGridView: TcxGridDBTableView + inherited cxGridView: TcxGridDBTableView + OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -161,7 +162,17 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente inherited dxLayoutControl1: TdxLayoutControl Width = 596 ExplicitWidth = 596 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit + Left = 251 + ExplicitLeft = 251 ExplicitWidth = 294 Width = 294 end @@ -171,6 +182,7 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente ExplicitWidth = 596 inherited tbxBotones: TTBXToolbar Width = 586 + ExplicitWidth = 586 end end end diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas index c9a589fb..915e5971 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas +++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas @@ -67,6 +67,8 @@ type procedure cxGridViewTIENDAWEBCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, + Y: Integer); private //Filtros relativos a la vista @@ -195,6 +197,37 @@ begin ADone := True; end; +procedure TfrViewPedidosCliente.cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); +var + Site : TcxGridSite; + HitTest : TcxCustomGridHitTest; + Item : TcxCustomGridTableItem; + Rec : TcxCustomGridRecord; + sNewHint : string; +begin +{Este método desaparecerá cuando se migre la aplicación, es para sacar la causa de la incidencia sin necesidad de entrar en el documento} + Site := Sender as TcxGridSite; + HitTest := Site.GridView.ViewInfo.GetHitTest(X, Y); + if HitTest is TcxGridRecordCellHitTest then begin + Item := TcxGridRecordCellHitTest(HitTest).Item; + Rec := TcxGridRecordCellHitTest(HitTest).GridRecord; + + if (Item.Index = cxGridView.GetColumnByFieldName(fld_PedidosClienteINCIDENCIAS_ACTIVAS).Index) + and (Rec.Selected) + and (Pedidos.DataTable.FieldByName(fld_PedidosClienteINCIDENCIAS_ACTIVAS).AsInteger = 1) then begin + sNewHint := Pedidos.DataTable.FieldByName(fld_PedidosClienteINCIDENCIAS).AsString; + if (cxGrid.Hint <> sNewHint) then begin + cxGrid.ShowHint := false; + cxGrid.Hint := sNewHint; + end + else cxGrid.ShowHint := true; + end + else begin + cxGrid.ShowHint := false; + end; + end; +end; + procedure TfrViewPedidosCliente.cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);