Ticket #345 -> Fallo retorcido en un albarán con incidencia

git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@25 f33bb606-9f5c-448d-9c99-757f00063c96
This commit is contained in:
David Arranz 2010-01-18 11:33:41 +00:00
parent f82a40f165
commit 401fec1992
7 changed files with 86 additions and 48 deletions

View File

@ -178,6 +178,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
Left = 0 Left = 0
Top = 0 Top = 0
@ -198,9 +202,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitHeight = 354 ExplicitHeight = 354
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 841 Width = 841
Height = 73 Height = 46
ExplicitWidth = 841 ExplicitWidth = 841
ExplicitHeight = 73 ExplicitHeight = 46
inherited ToolButton3: TToolButton inherited ToolButton3: TToolButton
Wrap = False Wrap = False
end end
@ -210,56 +214,87 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitLeft = 278 ExplicitLeft = 278
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontName: TJvFontComboBox inherited ToolButton14: TToolButton
Left = 334 Left = 334
Top = 0 Top = 0
ExplicitLeft = 334 ExplicitLeft = 334
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton14: TToolButton inherited FontName: TJvFontComboBox
Left = 479 Top = 22
Top = 0 ExplicitTop = 22
Wrap = True
ExplicitLeft = 479
ExplicitTop = 0
end end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 0 Top = 22
Width = 202 Width = 202
ExplicitLeft = 0 ExplicitTop = 22
ExplicitWidth = 202 ExplicitWidth = 202
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 202 Left = 347
ExplicitLeft = 202 Top = 22
end ExplicitLeft = 347
inherited ToolButton9: TToolButton ExplicitTop = 22
Left = 219
ExplicitLeft = 219
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 341 Left = 364
Wrap = False Top = 22
ExplicitLeft = 341 ExplicitLeft = 364
ExplicitHeight = 22 ExplicitTop = 22
end
inherited ToolButton6: TToolButton
Left = 372
Top = 22
ExplicitLeft = 372
ExplicitTop = 22
end
inherited ToolButton7: TToolButton
Left = 438
Top = 22
ExplicitLeft = 438
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Left = 505
Top = 22
ExplicitLeft = 505
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 588
Top = 22
ExplicitLeft = 588
ExplicitTop = 22
end
inherited ToolButton9: TToolButton
Left = 596
Top = 22
ExplicitLeft = 596
ExplicitTop = 22
end
inherited ToolButton10: TToolButton
Left = 741
Top = 22
ExplicitLeft = 741
ExplicitTop = 22
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 349 Left = 866
Top = 49 Top = 22
ExplicitLeft = 349 ExplicitLeft = 866
ExplicitTop = 49 ExplicitTop = 22
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 99 Top = 72
Width = 841 Width = 841
Height = 255 Height = 282
ExplicitTop = 99 ExplicitTop = 99
ExplicitWidth = 841 ExplicitWidth = 841
ExplicitHeight = 255 ExplicitHeight = 255
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 73 Top = 46
Width = 841 Width = 841
ExplicitTop = 73 ExplicitTop = 73
ExplicitWidth = 841 ExplicitWidth = 841
@ -281,6 +316,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0

View File

@ -228,8 +228,8 @@ begin
end; end;
procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject); procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject);
var {var
ADireccion : IBizDireccionesContacto; ADireccion : IBizDireccionesContacto;}
begin begin
if Assigned(FAlbaran) then if Assigned(FAlbaran) then
begin begin

View File

@ -225,10 +225,11 @@ procedure TfrViewAlbaranesCliente.cxGridViewINCIDENCIAS_ACTIVASGetCellHint(
var AHintTextRect: TRect); var AHintTextRect: TRect);
begin begin
inherited; inherited;
if (ARecord.Values[Sender.Index] = '1') then if (not VarIsNull(ARecord.Values[Sender.Index])) and
(ARecord.Values[Sender.Index] = '1') then
begin begin
AIsHintMultiLine := True; AIsHintMultiLine := True;
AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index] AHintText := VarToStr(ARecord.Values[cxGridViewINCIDENCIAS.Index]);
end; end;
end; end;

View File

@ -171,24 +171,22 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
Width = 188 Width = 188
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 292 Left = 210
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 292 ExplicitLeft = 210
ExplicitWidth = 294 ExplicitWidth = 294
Width = 294 Width = 294
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 623 Left = 447
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 623 ExplicitLeft = 447
ExplicitWidth = 215
Width = 215
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel

View File

@ -12,7 +12,7 @@ uses
uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
cxGrid, uBizAlbaranesProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, cxGrid, uBizAlbaranesProveedor, cxCurrencyEdit, Forms, uViewFiltroBase,
ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit,
uDAInterfaces; uDAInterfaces, uCustomView, uViewBase;
type type
IViewAlbaranesProveedor = interface(IViewGrid) IViewAlbaranesProveedor = interface(IViewGrid)
@ -189,10 +189,11 @@ procedure TfrViewAlbaranesProveedor.cxGridViewINCIDENCIAS_ACTIVASGetCellHint(
begin begin
inherited; inherited;
if (ARecord.Values[Sender.Index] = '1') then if (not VarIsNull(ARecord.Values[Sender.Index])) and
(ARecord.Values[Sender.Index] = '1') then
begin begin
AIsHintMultiLine := True; AIsHintMultiLine := True;
AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index] AHintText := VarToStr(ARecord.Values[cxGridViewINCIDENCIAS.Index]);
end; end;
end; end;

View File

@ -197,24 +197,22 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
Width = 243 Width = 243
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 347 Left = 271
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 347 ExplicitLeft = 271
ExplicitWidth = 482 ExplicitWidth = 482
Width = 482 Width = 482
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 866 Left = 673
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 866 ExplicitLeft = 673
ExplicitWidth = 215
Width = 215
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel

View File

@ -11,7 +11,8 @@ uses
cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
cxGrid, uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, cxGrid, uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList,
TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces,
uCustomView, uViewBase;
type type
IViewPedidosProveedor = interface(IViewGrid) IViewPedidosProveedor = interface(IViewGrid)