diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 917b31d..374b10d 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -178,6 +178,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente Left = 0 Top = 0 @@ -198,9 +202,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitHeight = 354 inherited ToolBar1: TToolBar Width = 841 - Height = 73 + Height = 46 ExplicitWidth = 841 - ExplicitHeight = 73 + ExplicitHeight = 46 inherited ToolButton3: TToolButton Wrap = False end @@ -210,56 +214,87 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitLeft = 278 ExplicitTop = 0 end - inherited FontName: TJvFontComboBox + inherited ToolButton14: TToolButton Left = 334 Top = 0 ExplicitLeft = 334 ExplicitTop = 0 end - inherited ToolButton14: TToolButton - Left = 479 - Top = 0 - Wrap = True - ExplicitLeft = 479 - ExplicitTop = 0 + inherited FontName: TJvFontComboBox + Top = 22 + ExplicitTop = 22 end inherited FontSize: TEdit - Left = 0 + Top = 22 Width = 202 - ExplicitLeft = 0 + ExplicitTop = 22 ExplicitWidth = 202 end inherited UpDown1: TUpDown - Left = 202 - ExplicitLeft = 202 - end - inherited ToolButton9: TToolButton - Left = 219 - ExplicitLeft = 219 + Left = 347 + Top = 22 + ExplicitLeft = 347 + ExplicitTop = 22 end inherited ToolButton13: TToolButton - Left = 341 - Wrap = False - ExplicitLeft = 341 - ExplicitHeight = 22 + Left = 364 + Top = 22 + ExplicitLeft = 364 + 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 inherited ToolButton11: TToolButton - Left = 349 - Top = 49 - ExplicitLeft = 349 - ExplicitTop = 49 + Left = 866 + Top = 22 + ExplicitLeft = 866 + ExplicitTop = 22 end end inherited cxGrid: TcxGrid - Top = 99 + Top = 72 Width = 841 - Height = 255 + Height = 282 ExplicitTop = 99 ExplicitWidth = 841 ExplicitHeight = 255 end inherited TBXDock1: TTBXDock - Top = 73 + Top = 46 Width = 841 ExplicitTop = 73 ExplicitWidth = 841 @@ -281,6 +316,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas index fdaa7f2..33441ce 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas @@ -228,8 +228,8 @@ begin end; procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject); -var - ADireccion : IBizDireccionesContacto; +{var + ADireccion : IBizDireccionesContacto;} begin if Assigned(FAlbaran) then begin diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index 569bdfd..6f5cd3c 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -225,10 +225,11 @@ procedure TfrViewAlbaranesCliente.cxGridViewINCIDENCIAS_ACTIVASGetCellHint( var AHintTextRect: TRect); begin inherited; - if (ARecord.Values[Sender.Index] = '1') then + if (not VarIsNull(ARecord.Values[Sender.Index])) and + (ARecord.Values[Sender.Index] = '1') then begin AIsHintMultiLine := True; - AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index] + AHintText := VarToStr(ARecord.Values[cxGridViewINCIDENCIAS.Index]); end; end; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 81f5c65..98fa1e8 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -171,24 +171,22 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Width = 188 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 292 + Left = 210 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 292 + ExplicitLeft = 210 ExplicitWidth = 294 Width = 294 end inherited eLista: TcxComboBox - Left = 623 + Left = 447 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 623 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 447 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas index 97b2d5a..9813796 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas @@ -12,7 +12,7 @@ uses uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizAlbaranesProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit, - uDAInterfaces; + uDAInterfaces, uCustomView, uViewBase; type IViewAlbaranesProveedor = interface(IViewGrid) @@ -189,10 +189,11 @@ procedure TfrViewAlbaranesProveedor.cxGridViewINCIDENCIAS_ACTIVASGetCellHint( begin inherited; - if (ARecord.Values[Sender.Index] = '1') then + if (not VarIsNull(ARecord.Values[Sender.Index])) and + (ARecord.Values[Sender.Index] = '1') then begin AIsHintMultiLine := True; - AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index] + AHintText := VarToStr(ARecord.Values[cxGridViewINCIDENCIAS.Index]); end; end; diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index e9b4809..7fe251a 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -197,24 +197,22 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor Width = 243 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 347 + Left = 271 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 347 + ExplicitLeft = 271 ExplicitWidth = 482 Width = 482 end inherited eLista: TcxComboBox - Left = 866 + Left = 673 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 866 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 673 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index c8e9600..335d49d 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -11,7 +11,8 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, - TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, + uCustomView, uViewBase; type IViewPedidosProveedor = interface(IViewGrid)