From c84fc47eb6f42c994a67c9ac087448c0e2889dc4 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 23 Mar 2008 10:51:09 +0000 Subject: [PATCH] Facturas de cliente: repaso general git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@346 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Views/uEditorFacturaCliente.dfm | 50 +++++++++---------- .../Views/uViewFacturaCliente.dfm | 29 ++++++----- .../Views/uViewFacturaCliente.pas | 3 -- 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 6812a3c0..0137cfc1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -13,7 +13,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited JvNavPanelHeader: TJvNavPanelHeader Width = 829 Caption = 'Nueva factura de cliente' - ExplicitWidth = 788 + ExplicitWidth = 829 inherited Image1: TImage Left = 802 Picture.Data = { @@ -40,7 +40,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inherited TBXDock: TTBXDock Width = 829 - ExplicitWidth = 788 + ExplicitWidth = 829 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 inherited TBXItem2: TTBXItem @@ -72,13 +72,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 823 Height = 344 OnChanging = pgPaginasChanging - ExplicitWidth = 782 - ExplicitHeight = 311 + ExplicitWidth = 823 + ExplicitHeight = 344 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 774 - ExplicitHeight = 283 + ExplicitWidth = 815 + ExplicitHeight = 316 inline frViewFacturaCliente1: TfrViewFacturaCliente Left = 0 Top = 0 @@ -93,13 +93,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 774 - ExplicitHeight = 283 + ExplicitWidth = 815 + ExplicitHeight = 316 inherited dxLayoutControl1: TdxLayoutControl Width = 815 Height = 316 - ExplicitWidth = 774 - ExplicitHeight = 283 + ExplicitWidth = 815 + ExplicitHeight = 316 DesignSize = ( 815 316) @@ -176,8 +176,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitWidth = 774 - ExplicitHeight = 283 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 @@ -194,12 +192,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 774 - ExplicitHeight = 283 + ExplicitWidth = 815 + ExplicitHeight = 316 inherited ToolBar1: TToolBar Width = 815 Height = 51 - ExplicitWidth = 774 + ExplicitWidth = 815 ExplicitHeight = 51 inherited ToolButton3: TToolButton Wrap = False @@ -225,10 +223,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited FontSize: TEdit Left = 544 Top = 0 - Width = 57 + Width = 72 ExplicitLeft = 544 ExplicitTop = 0 - ExplicitWidth = 57 + ExplicitWidth = 72 end inherited ToolButton13: TToolButton [7] Left = 0 @@ -253,6 +251,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited ToolButton7: TToolButton [10] Left = 83 Top = 27 + Wrap = False ExplicitLeft = 83 ExplicitTop = 27 end @@ -265,6 +264,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited ToolButton12: TToolButton [12] Left = 233 Top = 27 + Wrap = False ExplicitLeft = 233 ExplicitTop = 27 ExplicitHeight = 22 @@ -293,14 +293,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 815 Height = 239 ExplicitTop = 72 - ExplicitWidth = 774 - ExplicitHeight = 211 + ExplicitWidth = 815 + ExplicitHeight = 244 end inherited TBXDock1: TTBXDock Top = 51 Width = 815 ExplicitTop = 51 - ExplicitWidth = 774 + ExplicitWidth = 815 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 702 end @@ -315,8 +315,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente item Width = 200 end> - ExplicitTop = 556 - ExplicitWidth = 788 + ExplicitTop = 589 + ExplicitWidth = 829 end inline frViewTotales1: TfrViewTotales [4] Left = 0 @@ -332,13 +332,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 393 - ExplicitWidth = 788 + ExplicitTop = 426 + ExplicitWidth = 829 ExplicitHeight = 163 inherited dxLayoutControl1: TdxLayoutControl Width = 829 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 788 + ExplicitWidth = 829 inherited Bevel1: TBevel Top = 111 Width = 73 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index cb965335..7a1bfb9d 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 822 - Height = 317 + Width = 451 + Height = 304 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,24 +9,23 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 822 - Height = 317 + Width = 451 + Height = 304 Align = alClient ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 451 - ExplicitHeight = 304 DesignSize = ( - 822 - 317) + 451 + 304) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = DADataSource + Enabled = False Properties.ReadOnly = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -81,7 +80,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 301 end inline frViewClienteFactura: TfrViewDatosYSeleccionCliente - Left = 427 + Left = 310 Top = 30 Width = 314 Height = 215 @@ -93,7 +92,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 5 ReadOnly = False - ExplicitLeft = 427 + ExplicitLeft = 310 ExplicitTop = 30 ExplicitWidth = 314 ExplicitHeight = 215 @@ -128,13 +127,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 281 + Left = 192 DataBinding.DataSource = DADataSource - ExplicitLeft = 281 + ExplicitLeft = 192 end inherited Button3: TBitBtn - Left = 171 - ExplicitLeft = 171 + Left = 82 + ExplicitLeft = 82 end end end @@ -171,7 +170,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 267 + Left = 150 Top = 84 Width = 132 Height = 23 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas index fce43d1b..4e779fd5 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas @@ -105,9 +105,6 @@ begin dsFormaPago.DataTable := FFormasPago.DataTable; dsFormaPago.DataTable.Active := True; - //Solo se deshabilita al insertar, luego la referencia será modificable - //eReferencia.Enabled := (FFactura.DataTable.State = dsInsert); - if FFactura.TIPO = CTE_TIPO_ABONO then begin dxLayoutControl1Group1.Caption := 'Datos del abono:';