From 65f49931fb8a7425b2f61e2760d2b92cf1ba2dd3 Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 4 Jul 2014 10:01:54 +0000 Subject: [PATCH] =?UTF-8?q?Error=20Delphi=20en=20=C3=B3rdenes=20de=20devol?= =?UTF-8?q?uci=C3=B3n.?= 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.LuisLeon_FactuGES2/trunk@228 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2 --- .../Views/uEditorAlbaranDevCliente.dfm | 174 ++++++++++----- .../Views/uViewAlbaranDevCliente.dfm | 202 +++++++++++------- .../Views/uViewAlbaranDevCliente.pas | 1 - 3 files changed, 240 insertions(+), 137 deletions(-) diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm index 7578811..5846fec 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm @@ -40,56 +40,112 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente end end inherited pgPaginas: TPageControl - inherited pagGeneral: TTabSheet - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 - end inherited pagContenido: TTabSheet inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente inherited ToolBar1: TToolBar - inherited ToolButton14: TToolButton [5] - Left = 479 + Height = 73 + ExplicitHeight = 73 + inherited ToolButton1: TToolButton + Enabled = False + end + inherited ToolButton13: TToolButton [1] + Left = 109 + Wrap = False + ExplicitLeft = 109 + ExplicitHeight = 22 + end + inherited UpDown1: TUpDown [2] + Left = 117 + ExplicitLeft = 117 + end + inherited ToolButton12: TToolButton [3] + Left = 0 Top = 0 - ExplicitLeft = 479 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitHeight = 27 end - inherited FontSize: TEdit [6] - Left = 544 - ExplicitLeft = 544 + inherited ToolButton2: TToolButton [4] + Left = 0 + Top = 27 + Enabled = False + ExplicitLeft = 0 + ExplicitTop = 27 end - inherited ToolButton13: TToolButton [7] + inherited ToolButton3: TToolButton [5] + Left = 114 + Top = 27 + Enabled = False + ExplicitLeft = 114 + ExplicitTop = 27 end - inherited UpDown1: TUpDown [8] + inherited ToolButton4: TToolButton [6] + Left = 169 + Top = 27 + ExplicitLeft = 169 + ExplicitTop = 27 end - inherited ToolButton11: TToolButton [9] - Left = 17 - ExplicitLeft = 17 + inherited ToolButton14: TToolButton [7] + Left = 225 + Top = 27 + ExplicitLeft = 225 + ExplicitTop = 27 end - inherited ToolButton12: TToolButton [10] - Left = 158 - ExplicitLeft = 158 + inherited FontName: TJvFontComboBox [8] + Left = 290 + Top = 27 + ExplicitLeft = 290 + ExplicitTop = 27 end - inherited ToolButton9: TToolButton [11] - Left = 166 - ExplicitLeft = 166 + inherited FontSize: TEdit [9] + Left = 435 + Top = 27 + ExplicitLeft = 435 + ExplicitTop = 27 end - inherited ToolButton10: TToolButton [12] - Left = 311 - ExplicitLeft = 311 + inherited ToolButton7: TToolButton + Left = 621 + Enabled = True + ExplicitLeft = 621 end - inherited ToolButton6: TToolButton [13] - Left = 436 - ExplicitLeft = 436 + inherited ToolButton10: TToolButton [11] + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 end - inherited ToolButton7: TToolButton [14] - Left = 502 - ExplicitLeft = 502 + inherited ToolButton6: TToolButton [12] + Left = 125 + Top = 49 + ExplicitLeft = 125 + ExplicitTop = 49 end - inherited ToolButton8: TToolButton [15] - Left = 569 - ExplicitLeft = 569 + inherited ToolButton8: TToolButton [13] + Left = 191 + Top = 49 + ExplicitLeft = 191 + ExplicitTop = 49 end + inherited ToolButton9: TToolButton [14] + Left = 274 + Top = 49 + ExplicitLeft = 274 + ExplicitTop = 49 + end + inherited ToolButton11: TToolButton + Left = 419 + Top = 49 + ExplicitLeft = 419 + ExplicitTop = 49 + end + end + inherited cxGrid: TcxGrid + Top = 99 + Height = 279 + end + inherited TBXDock1: TTBXDock + Top = 73 end inherited cxGridPopupMenu: TcxGridPopupMenu PopupMenus = < @@ -119,20 +175,20 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente inherited dxLayoutControl1: TdxLayoutControl LookAndFeel = dxLayoutOfficeLookAndFeel1 inherited Bevel3: TBevel - Left = 380 + Left = 412 Height = 54 - ExplicitLeft = 380 + ExplicitLeft = 412 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 496 + Left = 528 Width = 285 - ExplicitLeft = 496 + ExplicitLeft = 528 ExplicitWidth = 285 end inherited Bevel1: TBevel - Left = 496 - ExplicitLeft = 496 + Left = 528 + ExplicitLeft = 528 end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -144,24 +200,24 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 151 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 567 + Left = 599 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 567 + ExplicitLeft = 599 ExplicitWidth = 219 Width = 219 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 497 + Left = 529 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 497 + ExplicitLeft = 529 ExplicitWidth = 289 Width = 289 end @@ -173,42 +229,42 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 496 + Left = 528 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 496 + ExplicitLeft = 528 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 496 + Left = 528 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 496 + ExplicitLeft = 528 ExplicitWidth = 290 Width = 290 end inherited edtRE: TcxDBSpinEdit - Left = 496 + Left = 528 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 496 + ExplicitLeft = 528 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 567 + Left = 599 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 567 + ExplicitLeft = 599 ExplicitWidth = 219 Width = 219 end @@ -239,8 +295,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 84 end inherited bTiposIVA: TButton - Left = 232 - ExplicitLeft = 232 + Left = 264 + ExplicitLeft = 264 end inherited cbRecargoEquivalencia: TcxDBCheckBox Style.LookAndFeel.SkinName = '' @@ -251,22 +307,22 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 222 end inherited edtRetencion: TcxDBSpinEdit - Left = 496 + Left = 528 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 496 + ExplicitLeft = 528 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Left = 567 + Left = 599 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 567 + ExplicitLeft = 599 end inherited edtFechaRetencion: TcxDBDateEdit Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm index 2b48e0b..80a47f3 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm @@ -3,30 +3,41 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente ExplicitHeight = 531 inherited dxLayoutControl1: TdxLayoutControl Height = 531 + ExplicitHeight = 531 inherited Label1: TLabel - Top = 479 - ExplicitTop = 479 + Top = 506 + Width = 299 + ExplicitTop = 506 + ExplicitWidth = 299 end inherited edtFechaAlbaran: TcxDBDateEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 336 + Width = 336 end inherited memObservaciones: TcxDBMemo - Left = 469 + Left = 472 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 23 - ExplicitLeft = 469 + ExplicitLeft = 472 + ExplicitWidth = 403 + ExplicitHeight = 69 + Height = 69 + Width = 403 end inherited eReferencia: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 336 + Width = 336 end inherited eCalle: TcxDBTextEdit Top = 253 @@ -34,39 +45,12 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 + TabOrder = 9 ExplicitTop = 253 + ExplicitWidth = 336 + Width = 336 end - inherited eCodigoPostal: TcxDBTextEdit - Left = 374 - Top = 280 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 - ExplicitLeft = 374 - ExplicitTop = 280 - end - inherited ePersonaContacto: TcxDBTextEdit - Top = 334 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - ExplicitTop = 334 - end - inherited eTlfTrabajo: TcxDBTextEdit - Top = 361 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 15 - ExplicitTop = 361 - end - object eReferenciaAlbaranCli: TcxTextEdit [8] + object eReferenciaAlbaranCli: TcxTextEdit [5] Left = 116 Top = 167 Anchors = [akLeft, akTop, akRight] @@ -86,65 +70,106 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 24 Width = 165 end - object Button2: TButton [9] - Left = 307 + object Button2: TButton [6] + Left = 22 Top = 167 Width = 132 Height = 23 - TabOrder = 8 + TabOrder = 7 + end + inherited eCodigoPostal: TcxDBTextEdit + Left = 377 + Top = 280 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 11 + ExplicitLeft = 377 + ExplicitTop = 280 + end + inherited ePersonaContacto: TcxDBTextEdit + Top = 361 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 14 + ExplicitTop = 361 + ExplicitWidth = 336 + Width = 336 + end + inherited eTlfTrabajo: TcxDBTextEdit + Top = 388 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 15 + ExplicitTop = 388 + ExplicitWidth = 336 + Width = 336 end inherited bElegirDireccion: TBitBtn - Left = 267 - Top = 388 + Left = 270 + Top = 415 TabOrder = 16 - ExplicitLeft = 267 - ExplicitTop = 388 + ExplicitLeft = 270 + ExplicitTop = 415 end inherited Button1: TButton - Left = 307 - ExplicitLeft = 307 + Left = 310 + ExplicitLeft = 310 end inherited eReferenciaPedidoCli: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 198 + Width = 198 end inherited cbFormaPago: TcxDBLookupComboBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 198 + Width = 198 end inherited bFormasPago: TButton - Left = 307 - ExplicitLeft = 307 + Left = 310 + ExplicitLeft = 310 end inherited eFechaRecepcion: TcxDBDateEdit - Left = 603 + Left = 606 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 22 - ExplicitLeft = 603 + ExplicitLeft = 606 + ExplicitWidth = 265 + Width = 265 end inherited cbConAlmacen: TCheckBox - Top = 447 + Top = 474 TabOrder = 17 - ExplicitTop = 447 + ExplicitTop = 474 end inherited cbAlmacen: TcxDBLookupComboBox - Top = 447 + Top = 474 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 - ExplicitTop = 447 + ExplicitTop = 474 + ExplicitWidth = 235 + Width = 235 end inherited eRefFacturaCli: TcxDBTextEdit Top = 196 @@ -152,32 +177,40 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 8 ExplicitTop = 196 + ExplicitWidth = 336 + Width = 336 end inherited eFechaPrevista: TcxDBDateEdit - Left = 603 + Left = 606 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 20 - ExplicitLeft = 603 + ExplicitLeft = 606 + ExplicitWidth = 265 + Width = 265 end inherited eRefCliente: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 336 + Width = 336 end inherited eFechaEnvio: TcxDBDateEdit - Left = 603 + Left = 606 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 21 - ExplicitLeft = 603 + ExplicitLeft = 606 + ExplicitWidth = 265 + Width = 265 end inherited cbProvincia: TcxDBComboBox Top = 280 @@ -185,8 +218,10 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 + TabOrder = 10 ExplicitTop = 280 + ExplicitWidth = 235 + Width = 235 end inherited cbPoblacion: TcxDBComboBox Top = 307 @@ -194,54 +229,74 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 + TabOrder = 12 ExplicitTop = 307 + ExplicitWidth = 336 + Width = 336 end inherited frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran - Left = 469 + Left = 472 + Width = 406 TabOrder = 19 - ExplicitLeft = 469 + ExplicitLeft = 472 + ExplicitWidth = 406 inherited dxLayoutControl1: TdxLayoutControl + Width = 406 inherited edtlNombre: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 224 + Width = 224 end inherited edtNIFCIF: TcxDBTextEdit - Left = 282 + Left = 283 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 282 + ExplicitLeft = 283 end inherited Button3: TBitBtn - Left = 193 - ExplicitLeft = 193 + Left = 194 + ExplicitLeft = 194 end inherited edtPersonaContacto: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 283 + Width = 283 end inherited edtDireccion: TcxMemo Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 287 + Width = 287 end inherited Button4: TButton - Left = 362 - ExplicitLeft = 362 + Left = 363 + ExplicitLeft = 363 end inherited Button5: TButton - Left = 362 - ExplicitLeft = 362 + Left = 363 + ExplicitLeft = 363 end end end + inherited cbPais: TcxDBComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 13 + ExplicitWidth = 263 + Width = 263 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group6: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup @@ -259,13 +314,6 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente Hidden = True LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item17: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Ref. alb. origen:' - Control = eReferenciaAlbaranCli - ControlOptions.ShowBorder = False - end object dxLayoutControl1Item25: TdxLayoutItem ShowCaption = False Control = Button2 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas index 6403b33..de8f222 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas @@ -13,7 +13,6 @@ uses type TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente) - dxLayoutControl1Item17: TdxLayoutItem; eReferenciaAlbaranCli: TcxTextEdit; dxLayoutControl1Item25: TdxLayoutItem; Button2: TButton;