From 14b6706da368aaa17d5d94bcfdae6500716b8ec0 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 15 Sep 2008 11:14:58 +0000 Subject: [PATCH] =?UTF-8?q?Ticket=20#109=20->=20En=20un=20pedido,=20error?= =?UTF-8?q?=20al=20imprimir=20la=20direcci=C3=B3n=20de=20entrega=20al=20el?= =?UTF-8?q?egir=20una=20obra?= 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.Tecsitel_FactuGES2/trunk@588 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Views/uViewDireccionEntregaPedidoProv.dfm | 14 ++ .../Views/uViewDireccionEntregaPedidoProv.pas | 4 +- .../Views/uViewPedidoProveedor.dfm | 139 ++++++++++-------- 3 files changed, 98 insertions(+), 59 deletions(-) diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm index caba3502..beb115aa 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm @@ -59,15 +59,20 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv Properties.ListOptions.SyncMode = True Properties.ListSource = dsAlmacenes Properties.PostPopupValueOnTab = True + Properties.OnValidate = cbListaAlmacenesPropertiesValidate Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 551 end @@ -117,15 +122,20 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv Properties.ListOptions.SyncMode = True Properties.ListSource = dsObras Properties.PostPopupValueOnTab = True + Properties.OnValidate = cbListaObrasPropertiesValidate Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 Width = 551 end @@ -146,13 +156,17 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv Style.Color = clWindow Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 Width = 334 end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas index 4f043109..83e7811d 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas @@ -177,6 +177,7 @@ begin FObras := FObrasController.BuscarTodos; FObras.DataTable.Active := True; dsObras.DataTable := FObras.DataTable; + end; destructor TfrViewDireccionEntregaPedidoProv.Destroy; @@ -268,8 +269,9 @@ begin FPedido := Value; dsPedido.DataTable := FPedido.DataTable; + cbListaAlmacenes.Properties.OnValidate := cbListaAlmacenesPropertiesValidate; - cbListaObras.Properties.OnValidate := cbListaAlmacenesPropertiesValidate; + cbListaObras.Properties.OnValidate := cbListaObrasPropertiesValidate; if (FPedido.EsNuevo) then CambioDireccionAlmacen diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm index 12ea195a..af59fa10 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm @@ -30,13 +30,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.Color = clInfoBk Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 333 end @@ -51,13 +55,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 Width = 344 end @@ -72,11 +80,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 Width = 344 end @@ -91,9 +103,13 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 12 Height = 200 Width = 459 @@ -112,11 +128,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.Color = clInfoBk Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.Color = clMenuBar StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 333 end @@ -137,56 +157,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ExplicitTop = 168 ExplicitWidth = 432 ExplicitHeight = 248 - inherited dxLayoutControl1: TdxLayoutControl - Width = 432 - Height = 248 - ExplicitWidth = 432 - ExplicitHeight = 270 - inherited Bevel1: TBevel - Top = 204 - Width = 412 - ExplicitTop = 204 - ExplicitWidth = 412 - end - inherited rdxDestino1: TRadioButton - Width = 412 - ExplicitWidth = 412 - end - inherited rdxDestino2: TRadioButton - Width = 412 - ExplicitWidth = 412 - end - inherited cbListaAlmacenes: TcxDBLookupComboBox - ExplicitWidth = 397 - Width = 397 - end - inherited bModificar: TBitBtn - Left = 294 - Top = 168 - ExplicitLeft = 294 - ExplicitTop = 168 - end - inherited txtDireccion: TStaticText - Width = 397 - Height = 29 - ExplicitWidth = 397 - ExplicitHeight = 29 - end - inherited RadioButton1: TRadioButton - Width = 412 - ExplicitWidth = 412 - end - inherited cbListaObras: TcxDBLookupComboBox - ExplicitWidth = 397 - Width = 397 - end - inherited edtEntregarA: TcxDBButtonEdit - Top = 217 - ExplicitTop = 217 - ExplicitWidth = 180 - Width = 180 - end - end inherited ActionList1: TActionList Left = 72 end @@ -217,14 +187,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 Width = 195 end @@ -248,13 +222,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 Width = 344 end @@ -271,13 +249,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 Width = 195 end @@ -309,51 +291,81 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor inherited dxLayoutControl1: TdxLayoutControl Width = 459 Height = 266 - ExplicitWidth = 486 + ExplicitWidth = 459 ExplicitHeight = 266 inherited edtlNombre: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 331 Width = 331 end inherited edtNIFCIF: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 331 Width = 331 end inherited edtCalle: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 331 Width = 331 end inherited edtPoblacion: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 213 Width = 213 end inherited edtProvincia: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 331 Width = 331 end inherited edtCodigoPostal: TcxDBTextEdit Left = 367 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 367 end - inherited Button1: TBitBtn - OnClick = frViewProveedorPedidoButton1Click - end - inherited Button2: TBitBtn - OnClick = frViewProveedorPedidoButton2Click - end inherited Button3: TBitBtn Left = 251 ExplicitLeft = 251 end inherited edtPersonaContacto: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 331 Width = 331 end inherited edtReferenciaAsignada: TcxDBTextEdit Left = 328 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 328 end inherited edtFax: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 138 Width = 138 end @@ -375,9 +387,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ExplicitLeft = 22 ExplicitTop = 452 ExplicitWidth = 432 + ExplicitHeight = 72 inherited dxLayoutControl1: TdxLayoutControl Width = 432 - ExplicitWidth = 331 + Height = 72 + ExplicitWidth = 432 + ExplicitHeight = 72 DesignSize = ( 432 72) @@ -386,9 +401,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ExplicitWidth = 235 end inherited cbListaObrasReserva: TcxDBLookupComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 397 Width = 397 end + inherited Button3: TBitBtn + Left = 278 + ExplicitLeft = 278 + end end end object dxLayoutControl1Group_Root: TdxLayoutGroup