From 74aa4beb6a61ebc6bcceb823542a60b192d629e2 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 1 Aug 2016 09:15:07 +0000 Subject: [PATCH] =?UTF-8?q?Tarea=20#1438=20->=20Los=20albaranes=20de=20cli?= =?UTF-8?q?ente=20no=20tienen=20IVA=20-=20Copiar=20la=20tienda=20del=20con?= =?UTF-8?q?trato=20al=20albar=C3=A1n=20generado=20a=20partir=20de=20=C3=A9?= =?UTF-8?q?l=20-=20Ocultar=20en=20la=20ficha=20del=20albar=C3=A1n=20el=20i?= =?UTF-8?q?mporte=20neto=20porque=20no=20tiene=20sentido.=20S=C3=B3lo=20se?= =?UTF-8?q?=20muestra=20el=20importe=20total.?= 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.Acana_FactuGES2/trunk@647 f4e31baf-9722-1c47-927c-6f952f962d4b --- .../Views/uEditorAlbaranCliente.dfm | 113 ++++++++++++------ .../Servidor/srvReferencias_Impl.pas | 2 +- .../uGenerarAlbaranesCliUtils.pas | 2 +- 3 files changed, 78 insertions(+), 39 deletions(-) diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 4e4c1438..3e551a99 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -129,7 +129,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 765 ExplicitWidth = 765 inherited tbxMain: TTBXToolbar - ExplicitWidth = 488 + ExplicitWidth = 634 inherited TBXItem2: TTBXItem Visible = False end @@ -156,16 +156,16 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end inherited pgPaginas: TPageControl Width = 759 - Height = 376 + Height = 367 TabOrder = 1 OnChanging = pgPaginasChanging ExplicitWidth = 759 - ExplicitHeight = 376 + ExplicitHeight = 367 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 751 - ExplicitHeight = 348 + ExplicitHeight = 339 end object pagContenido: TTabSheet Caption = 'Contenido' @@ -174,7 +174,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Left = 0 Top = 0 Width = 751 - Height = 348 + Height = 339 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -187,22 +187,60 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 751 - ExplicitHeight = 348 + ExplicitHeight = 339 inherited ToolBar1: TToolBar Width = 751 ExplicitWidth = 751 + inherited UpDown1: TUpDown + Left = 241 + ExplicitLeft = 241 + end + inherited ToolButton13: TToolButton + Left = 258 + ExplicitLeft = 258 + end + inherited ToolButton6: TToolButton + Left = 266 + ExplicitLeft = 266 + end + inherited ToolButton7: TToolButton + Left = 300 + ExplicitLeft = 300 + end + inherited ToolButton8: TToolButton + Left = 334 + ExplicitLeft = 334 + end + inherited ToolButton12: TToolButton + Left = 368 + ExplicitLeft = 368 + end + inherited ToolButton9: TToolButton + Left = 376 + ExplicitLeft = 376 + end + inherited ToolButton10: TToolButton + Left = 410 + ExplicitLeft = 410 + end + inherited ToolButton11: TToolButton + Left = 444 + ExplicitLeft = 444 + end end inherited cxGrid: TcxGrid Width = 751 - Height = 276 + Height = 264 + ExplicitTop = 75 ExplicitWidth = 751 - ExplicitHeight = 276 + ExplicitHeight = 264 end inherited TBXDock1: TTBXDock Width = 751 + ExplicitTop = 46 ExplicitWidth = 751 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 548 + ExplicitWidth = 731 end end end @@ -210,15 +248,11 @@ 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 Width = 751 - Height = 348 + Height = 339 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -229,7 +263,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 751 - ExplicitHeight = 348 + ExplicitHeight = 339 inherited pnlSup: TPanel Width = 751 ExplicitWidth = 751 @@ -239,13 +273,13 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end inherited GroupBox1: TGroupBox Width = 751 - Height = 320 + Height = 311 ExplicitWidth = 751 - ExplicitHeight = 320 + ExplicitHeight = 311 inherited eIncidencias: TcxDBMemo ExplicitWidth = 747 - ExplicitHeight = 303 - Height = 303 + ExplicitHeight = 294 + Height = 294 Width = 747 end end @@ -277,20 +311,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitWidth = 765 ExplicitHeight = 78 inherited Bevel3: TBevel - Left = 368 + Left = 366 Top = 11 Width = 7 Height = 54 - ExplicitLeft = 368 + ExplicitLeft = 366 ExplicitTop = 11 ExplicitWidth = 7 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 484 + Left = 482 Top = 53 Width = 210 - ExplicitLeft = 484 + ExplicitLeft = 482 ExplicitTop = 53 ExplicitWidth = 210 end @@ -304,20 +338,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 188 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 555 + Left = 553 Top = 88 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 555 + ExplicitLeft = 553 ExplicitTop = 88 ExplicitWidth = 182 Width = 182 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 485 + Left = 483 Top = 142 Style.IsFontAssigned = True - ExplicitLeft = 485 + ExplicitLeft = 483 ExplicitTop = 142 ExplicitWidth = 252 Width = 252 @@ -330,36 +364,36 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitTop = 38 end inherited edtIVA: TcxDBSpinEdit - Left = 484 + Left = 482 Top = 88 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 484 + ExplicitLeft = 482 ExplicitTop = 88 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 484 + Left = 482 Top = 11 Style.IsFontAssigned = True - ExplicitLeft = 484 + ExplicitLeft = 482 ExplicitTop = 11 ExplicitWidth = 253 Width = 253 end inherited edtRE: TcxDBSpinEdit - Left = 484 + Left = 482 Top = 115 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 484 + ExplicitLeft = 482 ExplicitTop = 115 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 555 + Left = 553 Top = 115 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 555 + ExplicitLeft = 553 ExplicitTop = 115 ExplicitWidth = 182 Width = 182 @@ -393,9 +427,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 121 end inherited bTiposIVA: TButton - Left = 220 + Left = 218 Top = 92 - ExplicitLeft = 220 + ExplicitLeft = 218 ExplicitTop = 92 end inherited cbRecargoEquivalencia: TcxDBCheckBox @@ -413,6 +447,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ShowCaption = False ShowBorder = False inherited dxLayoutControl1Group2: TdxLayoutGroup + Visible = False inherited dxLayoutControl1Group7: TdxLayoutGroup Visible = False end @@ -448,6 +483,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente inherited PnlComentario: TPanel [5] Width = 765 ExplicitWidth = 765 + inherited lbComentario: TLabel + Width = 755 + Height = 25 + end end inherited EditorActionList: TActionList [9] Left = 32 diff --git a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas index 34309f1c..41abe966 100644 --- a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas +++ b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas @@ -111,7 +111,7 @@ begin dsData.Active := True; if dsData.IsEmpty then - RaiseError('No existe la referencia ' + NombreReferencia + ' en la tabla REFERENCIAS.'); + RaiseError('No existe la referencia ' + NombreReferencia + ' en la tabla REFERENCIAS (Empresa ' + IntToStr(EmpresaID) + ', Tienda ' + IntToStr(TiendaID) + ')'); Result := dsData.FieldByName('VALOR').AsString; finally diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas index c464d9b6..48b9beae 100644 --- a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas +++ b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas @@ -75,7 +75,7 @@ begin // AAlbaran.IMPORTE_IVA := AContrato.IMPORTE_IVA; AAlbaran.IMPORTE_TOTAL := AContrato.BASE_IMPONIBLE; -// AAlbaran.ID_TIENDA := AContrato.ID_TIENDA; + AAlbaran.ID_TIENDA := AContrato.ID_TIENDA; AAlbaran.ID_CONTRATO := AContrato.ID; // AAlbaran.ID_VENDEDOR := AContrato.ID_VENDEDOR;