Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tarea #1438 -> Los albaranes de cliente no tienen IVA

Browse Source 
- Copiar la tienda del contrato al albarán generado a partir de él
- Ocultar en la ficha del albarán el importe neto porque no tiene sentido. Sólo se muestra el importe total.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@647 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
David Arranz 2016-08-01 09:15:07 +00:00
parent eb0febd5ce
commit 74aa4beb6a
3 changed files with 78 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
View File

@ -129,7 +129,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 765 Width = 765
ExplicitWidth = 765 ExplicitWidth = 765
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 488 ExplicitWidth = 634
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -156,16 +156,16 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 759 Width = 759
Height = 376 Height = 367
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 759 ExplicitWidth = 759
ExplicitHeight = 376 ExplicitHeight = 367
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 751 ExplicitWidth = 751
ExplicitHeight = 348 ExplicitHeight = 339
end end
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
@ -174,7 +174,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 751 Width = 751
Height = 348 Height = 339
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -187,22 +187,60 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 751 ExplicitWidth = 751
ExplicitHeight = 348 ExplicitHeight = 339
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 751 Width = 751
ExplicitWidth = 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 end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 751 Width = 751
Height = 276 Height = 264
ExplicitTop = 75
ExplicitWidth = 751 ExplicitWidth = 751
ExplicitHeight = 276 ExplicitHeight = 264
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Width = 751 Width = 751
ExplicitTop = 46
ExplicitWidth = 751 ExplicitWidth = 751
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 548 ExplicitWidth = 731
end end
end end
end end
@ -210,15 +248,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
Width = 751 Width = 751
Height = 348 Height = 339
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -229,7 +263,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 751 ExplicitWidth = 751
ExplicitHeight = 348 ExplicitHeight = 339
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 751 Width = 751
ExplicitWidth = 751 ExplicitWidth = 751
@ -239,13 +273,13 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 751 Width = 751
Height = 320 Height = 311
ExplicitWidth = 751 ExplicitWidth = 751
ExplicitHeight = 320 ExplicitHeight = 311
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 747 ExplicitWidth = 747
ExplicitHeight = 303 ExplicitHeight = 294
Height = 303 Height = 294
Width = 747 Width = 747
end end
end end
@ -277,20 +311,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitWidth = 765 ExplicitWidth = 765
ExplicitHeight = 78 ExplicitHeight = 78
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 368 Left = 366
Top = 11 Top = 11
Width = 7 Width = 7
Height = 54 Height = 54
ExplicitLeft = 368 ExplicitLeft = 366
ExplicitTop = 11 ExplicitTop = 11
ExplicitWidth = 7 ExplicitWidth = 7
ExplicitHeight = 54 ExplicitHeight = 54
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 484 Left = 482
Top = 53 Top = 53
Width = 210 Width = 210
ExplicitLeft = 484 ExplicitLeft = 482
ExplicitTop = 53 ExplicitTop = 53
ExplicitWidth = 210 ExplicitWidth = 210
end end
@ -304,20 +338,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 188 Width = 188
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 555 Left = 553
Top = 88 Top = 88
DataBinding.DataField = '' DataBinding.DataField = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 555 ExplicitLeft = 553
ExplicitTop = 88 ExplicitTop = 88
ExplicitWidth = 182 ExplicitWidth = 182
Width = 182 Width = 182
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 485 Left = 483
Top = 142 Top = 142
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 485 ExplicitLeft = 483
ExplicitTop = 142 ExplicitTop = 142
ExplicitWidth = 252 ExplicitWidth = 252
Width = 252 Width = 252
@ -330,36 +364,36 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitTop = 38 ExplicitTop = 38
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 484 Left = 482
Top = 88 Top = 88
DataBinding.DataField = '' DataBinding.DataField = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 484 ExplicitLeft = 482
ExplicitTop = 88 ExplicitTop = 88
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 484 Left = 482
Top = 11 Top = 11
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 484 ExplicitLeft = 482
ExplicitTop = 11 ExplicitTop = 11
ExplicitWidth = 253 ExplicitWidth = 253
Width = 253 Width = 253
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 484 Left = 482
Top = 115 Top = 115
DataBinding.DataField = '' DataBinding.DataField = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 484 ExplicitLeft = 482
ExplicitTop = 115 ExplicitTop = 115
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 555 Left = 553
Top = 115 Top = 115
DataBinding.DataField = '' DataBinding.DataField = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 555 ExplicitLeft = 553
ExplicitTop = 115 ExplicitTop = 115
ExplicitWidth = 182 ExplicitWidth = 182
Width = 182 Width = 182
@ -393,9 +427,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 121 Width = 121
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 220 Left = 218
Top = 92 Top = 92
ExplicitLeft = 220 ExplicitLeft = 218
ExplicitTop = 92 ExplicitTop = 92
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
@ -413,6 +447,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ShowCaption = False ShowCaption = False
ShowBorder = False ShowBorder = False
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
Visible = False
inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Group7: TdxLayoutGroup
Visible = False Visible = False
end end
@ -448,6 +483,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 765 Width = 765
ExplicitWidth = 765 ExplicitWidth = 765
inherited lbComentario: TLabel
Width = 755
Height = 25
end
end end
inherited EditorActionList: TActionList [9] inherited EditorActionList: TActionList [9]
Left = 32 Left = 32

2
Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas
View File

@ -111,7 +111,7 @@ begin
dsData.Active := True; dsData.Active := True;
if dsData.IsEmpty then 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; Result := dsData.FieldByName('VALOR').AsString;
finally finally

2
Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas
View File

@ -75,7 +75,7 @@ begin
// AAlbaran.IMPORTE_IVA := AContrato.IMPORTE_IVA; // AAlbaran.IMPORTE_IVA := AContrato.IMPORTE_IVA;
AAlbaran.IMPORTE_TOTAL := AContrato.BASE_IMPONIBLE; 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_CONTRATO := AContrato.ID;
// AAlbaran.ID_VENDEDOR := AContrato.ID_VENDEDOR; // AAlbaran.ID_VENDEDOR := AContrato.ID_VENDEDOR;