From 375e5eeb84a9827f9eacabac7a4eb2837edcd752 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 6 Nov 2013 11:54:10 +0000
Subject: [PATCH] Tarea #1278 -> Trasladar el IVA a los detalles de las
 facturas de proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1082 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Build/Build.fbpInf                            |   2 +-
 Database/scripts/factuges.sql                 |   3 +
 .../Controladores/uControllerDetallesBase.pas |  15 +-
 Source/Cliente/FactuGES.rc                    |   2 +-
 Source/GUIBase/uViewDetallesBase.dfm          |  53 +-
 Source/GUIBase/uViewTotales.dfm               |  38 +-
 .../Views/FacturasCliente_view.dproj          |  36 +-
 .../Views/uViewDetallesFacturaCliente.dfm     | 142 +--
 .../uDetallesFacturaProveedorController.pas   | 108 ++-
 .../uFacturasProveedorController.pas          |   9 +-
 .../Data/uDataModuleFacturasProveedor.dfm     |  22 +
 .../Model/schFacturasProveedorClient_Intf.pas | 153 +++-
 .../Model/schFacturasProveedorServer_Intf.pas | 145 ++-
 .../Model/uBizDetallesFacturaProveedor.pas    |  20 +-
 .../Model/uBizFacturasProveedor.pas           |  16 +-
 .../Servidor/srvFacturasProveedor_Impl.dfm    | 155 +++-
 .../Views/FacturasProveedor_view.dpk          | Bin 2309 -> 2463 bytes
 .../Views/FacturasProveedor_view.dproj        |  69 +-
 .../Views/uEditorFacturaProveedor.dfm         | 466 ++++------
 .../Views/uEditorFacturaProveedor.pas         |  97 +-
 .../Views/uViewDetallesFacturaProveedor.dfm   | 144 ++-
 .../Views/uViewDetallesFacturaProveedor.pas   |  90 +-
 .../Views/uViewFacturasProveedor.dfm          |   1 +
 .../Views/uViewTotalesVariosIVA.dfm           | 863 ++++++++++++++++++
 .../Views/uViewTotalesVariosIVA.pas           |  85 ++
 Source/Servidor/FactuGES_Server.RES           | Bin 23212 -> 23216 bytes
 Source/Servidor/FactuGES_Server.dpr           |   6 +-
 Source/Servidor/FactuGES_Server.rc            |   4 +-
 Source/Servidor/uDataModuleServer.dfm         |   4 +-
 29 files changed, 2163 insertions(+), 585 deletions(-)
 create mode 100644 Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm
 create mode 100644 Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas

diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf
index 5b7ef20b..1a0b5bc5 100644
--- a/Build/Build.fbpInf
+++ b/Build/Build.fbpInf
@@ -6,7 +6,7 @@
   <propertysets/>
   <variables>
     <project_path>
-      <![CDATA[C:\Codigo tecsitel]]>
+      <![CDATA[C:\Codigo Tecsitel]]>
     </project_path>
   </variables>
   <properties>
diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index dae25d0c..6fede1c5 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -759,6 +759,9 @@ CREATE TABLE FACTURAS_PROVEEDOR_DETALLES (
     DESCUENTO           TIPO_PORCENTAJE,
     IMPORTE_PORTE       TIPO_IMPORTE,
     IMPORTE_TOTAL       TIPO_IMPORTE,
+	ID_TIPO_IVA 		TIPO_ID,
+	IVA 				TIPO_PORCENTAJE,
+	IMPORTE_IVA 		TIPO_IMPORTE
     VISIBLE             TIPO_BOOLEANO,
     FECHA_ALTA          TIMESTAMP,
     FECHA_MODIFICACION  TIMESTAMP
diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas
index dbda2ed5..fa211565 100644
--- a/Source/Base/Controladores/uControllerDetallesBase.pas
+++ b/Source/Base/Controladores/uControllerDetallesBase.pas
@@ -638,12 +638,15 @@ procedure TControllerDetallesBase.TratamientoDetalleConcepto(DataTable: TDADataT
 begin
   with DataTable do
   begin
-    if not Editing then Edit;
-    //Si alguno de los campos de calculo de total es nulo el total tambien será nulo
-    if (VarIsNull(FieldByName(CAMPO_CANTIDAD).AsVariant)
-    or VarIsNull(FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant))
-    then FieldByName(CAMPO_IMPORTE_TOTAL).AsVariant := Null
-    else FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat := CalcularImporteTotalConcepto(DataTable);
+    if not Editing then
+      Edit;
+
+    // Si alguno de los campos de calculo de total es nulo el total tambien será nulo
+    if (VarIsNull(FieldByName(CAMPO_CANTIDAD).AsVariant) or VarIsNull(FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant)) then
+      FieldByName(CAMPO_IMPORTE_TOTAL).AsVariant := Null
+    else
+      FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat := CalcularImporteTotalConcepto(DataTable);
+      
     Post;
   end;
 end;
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 75ebc557..0a9025b4 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
+MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
 FILEVERSION 2,0,2,0
 PRODUCTVERSION 2,0,2,0
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 59cf4c93..03b8add7 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Left = 0
     Top = 0
     Width = 451
-    Height = 73
+    Height = 68
     AutoSize = True
     ButtonWidth = 141
     Caption = 'ToolBar1'
@@ -42,29 +42,30 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = actSubir
       AutoSize = True
+      Wrap = True
     end
     object ToolButton4: TToolButton
-      Left = 184
-      Top = 0
+      Left = 0
+      Top = 22
       Action = actBajar
       AutoSize = True
     end
     object ToolButton14: TToolButton
-      Left = 240
-      Top = 0
+      Left = 56
+      Top = 22
       Action = FontEdit1
       AutoSize = True
       Wrap = True
     end
     object FontName: TJvFontComboBox
       Left = 0
-      Top = 22
+      Top = 44
       Width = 145
       Height = 22
       DroppedDownWidth = 145
       MaxMRUCount = 0
       FontName = 'Tahoma'
-      ItemIndex = 42
+      ItemIndex = 39
       Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
       Sorted = True
       TabOrder = 2
@@ -74,7 +75,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object FontSize: TEdit
       Left = 145
-      Top = 22
+      Top = 44
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -85,7 +86,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object UpDown1: TUpDown
       Left = 171
-      Top = 22
+      Top = 44
       Width = 16
       Height = 22
       Associate = FontSize
@@ -94,7 +95,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton13: TToolButton
       Left = 187
-      Top = 22
+      Top = 44
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
@@ -102,55 +103,54 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton6: TToolButton
       Left = 195
-      Top = 22
+      Top = 44
       Action = RichEditBold1
       AutoSize = True
     end
     object ToolButton7: TToolButton
       Left = 261
-      Top = 22
+      Top = 44
       Action = RichEditItalic1
       AutoSize = True
     end
     object ToolButton8: TToolButton
       Left = 328
-      Top = 22
+      Top = 44
       Action = RichEditUnderline1
       AutoSize = True
     end
     object ToolButton12: TToolButton
-      Left = 0
-      Top = 22
+      Left = 411
+      Top = 44
       Width = 8
       Caption = 'ToolButton12'
       ImageIndex = 10
-      Wrap = True
       Style = tbsSeparator
     end
     object ToolButton9: TToolButton
-      Left = 0
-      Top = 49
+      Left = 419
+      Top = 44
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 145
-      Top = 49
+      Left = 564
+      Top = 44
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 270
-      Top = 49
+      Left = 689
+      Top = 44
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 99
+    Top = 94
     Width = 451
-    Height = 205
+    Height = 210
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -161,6 +161,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
+    ExplicitTop = 99
+    ExplicitHeight = 205
     object cxGridView: TcxGridDBTableView
       OnKeyDown = cxGridViewKeyDown
       NavigatorButtons.ConfirmDelete = False
@@ -349,11 +351,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 73
+    Top = 68
     Width = 451
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
+    ExplicitTop = 73
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm
index 0ef60739..8a62fd4f 100644
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@@ -1,9 +1,9 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 451
-  Height = 252
+  Width = 899
+  Height = 267
   Align = alBottom
-  ExplicitWidth = 451
-  ExplicitHeight = 252
+  ExplicitWidth = 899
+  ExplicitHeight = 267
   object Bevel5: TBevel
     Left = 666
     Top = 109
@@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
     AlignWithMargins = True
     Left = 0
     Top = 0
-    Width = 451
-    Height = 252
+    Width = 899
+    Height = 267
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -26,22 +26,24 @@ inherited frViewTotales: TfrViewTotales
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitWidth = 451
+    ExplicitHeight = 252
     object Bevel3: TBevel
-      Left = 305
+      Left = 457
       Top = 28
       Width = 3
       Height = 100
       Shape = bsRightLine
     end
     object Bevel4: TBevel
-      Left = 417
+      Left = 569
       Top = 70
       Width = 342
       Height = 9
       Shape = bsBottomLine
     end
     object Bevel1: TBevel
-      Left = 417
+      Left = 569
       Top = 186
       Width = 368
       Height = 9
@@ -90,7 +92,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 87
     end
     object ImporteIVA: TcxDBCurrencyEdit
-      Left = 488
+      Left = 640
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_IVA'
@@ -125,7 +127,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 20
     end
     object ImporteTotal: TcxDBCurrencyEdit
-      Left = 418
+      Left = 570
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -195,7 +197,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtIVA: TcxDBSpinEdit
-      Left = 417
+      Left = 569
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IVA'
@@ -236,7 +238,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object ImporteBase: TcxDBCurrencyEdit
-      Left = 417
+      Left = 569
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -271,7 +273,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 91
     end
     object edtRE: TcxDBSpinEdit
-      Left = 417
+      Left = 569
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'RE'
@@ -312,7 +314,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object ImporteRE: TcxDBCurrencyEdit
-      Left = 488
+      Left = 640
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_RE'
@@ -450,7 +452,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 20
     end
     object bTiposIVA: TButton
-      Left = 157
+      Left = 309
       Top = 109
       Width = 132
       Height = 21
@@ -488,7 +490,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 221
     end
     object edtRetencion: TcxDBSpinEdit
-      Left = 417
+      Left = 569
       Top = 206
       AutoSize = False
       DataBinding.DataSource = DADataSource
@@ -527,7 +529,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtImporteRetencion: TcxDBCurrencyEdit
-      Left = 488
+      Left = 640
       Top = 206
       AutoSize = False
       DataBinding.DataSource = DADataSource
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj
index 5f9dcd39..7025296a 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
@@ -49,23 +49,25 @@
     <DelphiCompile Include="FacturasCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="AlbCli_FacCli_relation.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="FacturasCliente_controller.dcp" />
-    <DCCReference Include="FacturasCliente_model.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="PreCli_FacCli_relation.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\AlbCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\Articulos_view.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\Contactos_view.dcp" />
+    <DCCReference Include="..\cxLibraryD11.dcp" />
+    <DCCReference Include="..\dxCoreD11.dcp" />
+    <DCCReference Include="..\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\dxThemeD11.dcp" />
+    <DCCReference Include="..\FacturasCliente_controller.dcp" />
+    <DCCReference Include="..\FacturasCliente_model.dcp" />
+    <DCCReference Include="..\GestorInformes_controller.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\PreCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\vclx.dcp" />
     <DCCReference Include="uDialogListaFacturasClienteEnvioEMail.pas">
-      <Form>DialogListaFacturasClienteEnvioEMail</Form>
+      <Form>fDialogListaFacturasClienteEnvioEMail</Form>
       <DesignClass>T</DesignClass>
     </DCCReference>
     <DCCReference Include="uDialogOpcionesImpresionFacturasCliente.pas">
@@ -112,8 +114,6 @@
       <Form>frViewFacturasCliente</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 7e3e9096..84e1ca1e 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm	
@@ -1,90 +1,108 @@
 inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
+  Width = 763
+  Height = 476
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
-    inherited FontName: TJvFontComboBox [4]
-      Left = 56
-      Top = 22
-      ExplicitLeft = 56
-      ExplicitTop = 22
-    end
-    inherited ToolButton14: TToolButton [5]
-      Left = 201
+    Width = 763
+    Height = 51
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
       Wrap = False
-      ExplicitLeft = 201
+    end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      Wrap = False
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
+      Left = 399
+      Top = 0
+      ExplicitLeft = 399
+      ExplicitTop = 0
     end
     inherited FontSize: TEdit
-      Left = 266
-      Top = 22
-      ExplicitLeft = 266
-      ExplicitTop = 22
+      Left = 544
+      Top = 0
+      ExplicitLeft = 544
+      ExplicitTop = 0
     end
     inherited UpDown1: TUpDown
-      Left = 308
-      Top = 22
-      ExplicitLeft = 308
-      ExplicitTop = 22
+      Left = 586
+      Top = 0
+      ExplicitLeft = 586
+      ExplicitTop = 0
     end
     inherited ToolButton13: TToolButton
-      Left = 325
-      Top = 22
-      ExplicitLeft = 325
-      ExplicitTop = 22
-    end
-    inherited ToolButton11: TToolButton [9]
-      Left = 333
-      Top = 22
-      ExplicitLeft = 333
-      ExplicitTop = 22
-    end
-    inherited ToolButton12: TToolButton [10]
       Left = 0
-      Top = 22
+      Top = 0
       Wrap = True
       ExplicitLeft = 0
-      ExplicitTop = 22
+      ExplicitTop = 0
       ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton [11]
+    inherited ToolButton6: TToolButton
       Left = 0
-      Top = 49
+      Top = 27
       ExplicitLeft = 0
-      ExplicitTop = 49
+      ExplicitTop = 27
     end
-    inherited ToolButton10: TToolButton [12]
-      Left = 145
-      Top = 49
-      ExplicitLeft = 145
-      ExplicitTop = 49
+    inherited ToolButton7: TToolButton
+      Left = 66
+      Top = 27
+      ExplicitLeft = 66
+      ExplicitTop = 27
     end
-    inherited ToolButton6: TToolButton [13]
-      Left = 270
-      Top = 49
-      ExplicitLeft = 270
-      ExplicitTop = 49
+    inherited ToolButton8: TToolButton
+      Left = 133
+      Top = 27
+      ExplicitLeft = 133
+      ExplicitTop = 27
     end
-    inherited ToolButton7: TToolButton [14]
-      Left = 336
-      Top = 49
-      Wrap = True
-      ExplicitLeft = 336
-      ExplicitTop = 49
+    inherited ToolButton12: TToolButton
+      Left = 216
+      Top = 27
+      ExplicitLeft = 216
+      ExplicitTop = 27
     end
-    inherited ToolButton8: TToolButton [15]
-      Left = 0
-      Top = 71
-      ExplicitLeft = 0
-      ExplicitTop = 71
+    inherited ToolButton9: TToolButton
+      Left = 224
+      Top = 27
+      ExplicitLeft = 224
+      ExplicitTop = 27
+    end
+    inherited ToolButton10: TToolButton
+      Left = 369
+      Top = 27
+      ExplicitLeft = 369
+      ExplicitTop = 27
+    end
+    inherited ToolButton11: TToolButton
+      Left = 494
+      Top = 27
+      ExplicitLeft = 494
+      ExplicitTop = 27
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
-    Height = 183
+    Top = 77
+    Width = 763
+    Height = 399
     ExplicitTop = 99
-    ExplicitHeight = 210
+    ExplicitHeight = 205
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
-    ExplicitTop = 68
+    Top = 51
+    Width = 763
+    ExplicitTop = 73
+    inherited TBXToolbar1: TTBXToolbar
+      ExplicitWidth = 763
+    end
   end
 end
diff --git a/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas
index fee9b094..72b39559 100644
--- a/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas	
+++ b/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas	
@@ -17,6 +17,8 @@ type
     procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProveedor; AReferencia: String; AFecha: String);
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
+    function CalcularTotalesIVA(DataTable: TDADataTable): TImporteIVADetallesArray;
+    function CalcularSumaIVA(ListaIVAs: TImporteIVADetallesArray): Double;
   end;
 
   TDetallesFacturaProveedorController = class(TControllerDetallesArticulos, IDetallesFacturaProveedorController)
@@ -32,13 +34,15 @@ type
     procedure ValidarCampos(DataTable: TDADataTable); override;
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
-
+    function CalcularTotalesIVA(DataTable: TDADataTable): TImporteIVADetallesArray;
+    function CalcularSumaIVA(ListaIVAs: TImporteIVADetallesArray): Double;    
   public
     function DarListaTiposDetalle: TStringList; override;
 
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor); overload;
     procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProveedor; AReferencia: String; AFecha: String);
+
     constructor Create; override;
     destructor Destroy; override;
   end;
@@ -47,9 +51,69 @@ implementation
 
 { TDetallesFacturaProveedorController }
 
-uses uDAInterfaces, Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController,
+uses DB, uDAInterfaces, Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController,
   uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, schArticulosClient_Intf,
-  schFacturasProveedorClient_Intf;
+  schFacturasProveedorClient_Intf, uDataModuleTiposIVA;
+
+
+function TDetallesFacturaProveedorController.CalcularTotalesIVA(DataTable: TDADataTable): TImporteIVADetallesArray;
+var
+  ListaIVAs: TImporteIVADetallesArray;
+  AuxPosicionIni : Integer;
+  AIndex : Integer;
+  bEncontrado : Boolean;
+begin
+  if (DataTable.State in dsEditModes) then
+      DataTable.Post;
+
+  ValidarCampos(DataTable);
+
+  DataTable.DisableControls;
+
+  AuxPosicionIni := DataTable.FieldByName(CAMPO_POSICION).AsInteger;
+
+  try
+    DataTable.First;
+    while not DataTable.EOF do
+    begin
+      bEncontrado := False;
+
+      for AIndex := 0 to Length(ListaIVAs) - 1 do
+      begin
+        if ListaIVAs[AIndex].ID = DataTable.FieldByName('ID_TIPO_IVA').AsInteger then
+        begin
+          bEncontrado := True;
+          ListaIVAs[AIndex].ImporteIVA := ListaIVAs[AIndex].ImporteIVA + DataTable.FieldByName('IMPORTE_IVA').AsFloat;
+          Break;
+        end;
+      end;
+      
+      if not bEncontrado then
+      begin
+        if (DataTable.FieldByName('IMPORTE_IVA').AsFloat > 0) then
+        begin
+          AIndex := Length(ListaIVAs);
+          SetLength(ListaIVAs, AIndex + 1);
+
+          ListaIVAs[AIndex].ID := DataTable.FieldByName('ID_TIPO_IVA').AsInteger;
+          ListaIVAs[AIndex].IVA := DataTable.FieldByName('IVA').AsFloat;
+          ListaIVAs[AIndex].ImporteIVA := DataTable.FieldByName('IMPORTE_IVA').AsFloat;
+        end;
+      end;
+
+      DataTable.Next;
+    end;
+
+  finally
+    //Dejamos el puntero en la misma posición que la que partió
+    DataTable.First;
+    DataTable.Locate(CAMPO_POSICION, AuxPosicionIni, []);
+    DataTable.EnableControls;
+  end;
+
+  Result := ListaIVAs;
+end;
+
 
 procedure TDetallesFacturaProveedorController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor);
 var
@@ -107,8 +171,28 @@ begin
 end;
 
 function TDetallesFacturaProveedorController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
+var
+  AResult : Double;
 begin
-  Result := CalcularLineaConcepto(DataTable);
+  AResult := CalcularLineaConcepto(DataTable);
+
+  if not DataTable.Editing then
+    DataTable.Edit;
+  DataTable.FieldByName('IMPORTE_IVA').AsFloat := AResult * (DataTable.FieldByName('IVA').AsFloat/100);
+  
+  Result := AResult;  // No se suma el IVA al total del detalle
+end;
+
+function TDetallesFacturaProveedorController.CalcularSumaIVA(
+  ListaIVAs: TImporteIVADetallesArray): Double;
+var
+  aSuma : Double;
+  I : integer;
+begin
+  aSuma := 0;
+  for I := 0 to Length(ListaIVAs) - 1 do
+    aSuma := aSuma + ListaIVAs[I].ImporteIVA;
+  Result := aSuma;
 end;
 
 constructor TDetallesFacturaProveedorController.Create;
@@ -168,9 +252,25 @@ begin
 end;
 
 procedure TDetallesFacturaProveedorController.ValidarCampos(DataTable: TDADataTable);
+var
+  AField: TDAField;
 begin
   inherited;
   ValidarCamposLineaConcepto(DataTable);
+
+  //Validamos la existencia de todos los campos IVA
+  AField := DataTable.FindField('ID_TIPO_IVA');
+  if not Assigned(AField) then
+     raise Exception.Create('Campo ' + 'ID_TIPO_IVA' + ' no encontrado (validarCampos)');
+
+  AField := DataTable.FindField('IVA');
+  if not Assigned(AField) then
+     raise Exception.Create('Campo ' + 'IVA' + ' no encontrado (validarCampos)');
+
+  AField := DataTable.FindField('IMPORTE_IVA');
+  if not Assigned(AField) then
+     raise Exception.Create('Campo ' + 'IMPORTE_IVA' + ' no encontrado (validarCampos)');
+
 end;
 
 procedure TDetallesFacturaProveedorController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas
index 56f16c46..01297a8c 100644
--- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas	
+++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas	
@@ -724,7 +724,8 @@ procedure TFacturasProveedorController.RecalcularImportes(
   FFactura: IBizFacturaProveedor);
 var
   bEnEdicion : Boolean;
-  ADetallePosAct : Integer;  
+  ADetallePosAct : Integer;
+  AListaIVAs : TImporteIVADetallesArray;
 begin
   if not Assigned(FFactura) then
     raise Exception.Create ('Factura no asignada (RecalcularImportes)');
@@ -747,6 +748,12 @@ begin
   try
     FFactura.IMPORTE_NETO := FDetallesController.DarTotalImporteTotal(FFactura.Detalles);
     FFactura.IMPORTE_PORTE := FDetallesController.DarTotalPorteTotal(FFactura.Detalles);
+
+    {AListaIVAs := FDetallesController.CalcularTotalesIVA(FFactura.Detalles.DataTable);
+    FFactura.IMPORTE_IVA := FDetallesController.CalcularSumaIVA(AListaIVAs);
+    FFactura.DataTable.FieldByName('IVA').Clear;}
+
+
     if not bEnEdicion then
       FFactura.Post;
   finally
diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm
index 8a953682..70624720 100644
--- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm	
@@ -261,6 +261,24 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
   object tbl_FacturasProveedor_Detalles: TDAMemDataTable
     RemoteUpdatesOptions = []
     Fields = <
+      item
+        Name = 'ID_TIPO_IVA'
+        DataType = datInteger
+        DictionaryEntry = 'FacturasProveedor_Detalles_ID_TIPO_IVA'
+      end
+      item
+        Name = 'IVA'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'FacturasProveedor_Detalles_IVA'
+      end
+      item
+        Name = 'IMPORTE_IVA'
+        DataType = datCurrency
+        DisplayLabel = 'Importe IVA'
+        Alignment = taRightJustify
+        DictionaryEntry = 'FacturasProveedor_Detalles_IMPORTE_IVA'
+      end
       item
         Name = 'ID'
         DataType = datAutoInc
@@ -305,6 +323,8 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
         Name = 'UNIDAD_MEDIDA'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasProveedor_Detalles_UNIDAD_MEDIDA'
+        DictionaryEntry = 'FacturasProveedor_Detalles_UNIDAD_MEDIDA'
       end
       item
         Name = 'IMPORTE_UNIDAD'
@@ -357,6 +377,8 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
         Name = 'REFERENCIA_FABRICANTE'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasProveedor_Detalles_REFERENCIA_FABRICANTE'
+        DictionaryEntry = 'FacturasProveedor_Detalles_REFERENCIA_FABRICANTE'
       end>
     Params = <>
     MasterMappingMode = mmWhere
diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
index 0d26a034..cea6457b 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
@@ -9,10 +9,10 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturas = '{94FBDA60-1B7A-4466-BCB5-A78D474F0270}';
-  RID_FacturasProveedor = '{757861F8-67CC-46FA-A3A3-094DF0532D43}';
-  RID_FacturasProveedor_Detalles = '{26D28A28-EDBA-4AF9-8516-96BC332BF817}';
-  RID_FacturasProveedor_Pedidos = '{F267AF62-2197-4F19-A71E-E511CE687790}';
+  RID_ListaAnosFacturas = '{808B7CB0-1C43-42C9-91A4-D748FAA7F572}';
+  RID_FacturasProveedor = '{29AC430E-100E-43BC-A978-30313D8902B6}';
+  RID_FacturasProveedor_Detalles = '{1BF06DAC-27E7-418F-B98C-F9C098C52DF9}';
+  RID_FacturasProveedor_Pedidos = '{7005038D-FBAA-4C82-A86D-1B4A04AC45E7}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -99,6 +99,9 @@ const
   idx_FacturasProveedorDATOS_BANCARIOS = 33;
 
   { FacturasProveedor_Detalles fields }
+  fld_FacturasProveedor_DetallesID_TIPO_IVA = 'ID_TIPO_IVA';
+  fld_FacturasProveedor_DetallesIVA = 'IVA';
+  fld_FacturasProveedor_DetallesIMPORTE_IVA = 'IMPORTE_IVA';
   fld_FacturasProveedor_DetallesID = 'ID';
   fld_FacturasProveedor_DetallesID_FACTURA = 'ID_FACTURA';
   fld_FacturasProveedor_DetallesPOSICION = 'POSICION';
@@ -117,22 +120,25 @@ const
   fld_FacturasProveedor_DetallesREFERENCIA_FABRICANTE = 'REFERENCIA_FABRICANTE';
 
   { FacturasProveedor_Detalles field indexes }
-  idx_FacturasProveedor_DetallesID = 0;
-  idx_FacturasProveedor_DetallesID_FACTURA = 1;
-  idx_FacturasProveedor_DetallesPOSICION = 2;
-  idx_FacturasProveedor_DetallesTIPO_DETALLE = 3;
-  idx_FacturasProveedor_DetallesCONCEPTO = 4;
-  idx_FacturasProveedor_DetallesCANTIDAD = 5;
-  idx_FacturasProveedor_DetallesUNIDAD_MEDIDA = 6;
-  idx_FacturasProveedor_DetallesIMPORTE_UNIDAD = 7;
-  idx_FacturasProveedor_DetallesIMPORTE_TOTAL = 8;
-  idx_FacturasProveedor_DetallesVISIBLE = 9;
-  idx_FacturasProveedor_DetallesID_ARTICULO = 10;
-  idx_FacturasProveedor_DetallesDESCUENTO = 11;
-  idx_FacturasProveedor_DetallesIMPORTE_PORTE = 12;
-  idx_FacturasProveedor_DetallesREFERENCIA = 13;
-  idx_FacturasProveedor_DetallesREFERENCIA_PROVEEDOR = 14;
-  idx_FacturasProveedor_DetallesREFERENCIA_FABRICANTE = 15;
+  idx_FacturasProveedor_DetallesID_TIPO_IVA = 0;
+  idx_FacturasProveedor_DetallesIVA = 1;
+  idx_FacturasProveedor_DetallesIMPORTE_IVA = 2;
+  idx_FacturasProveedor_DetallesID = 3;
+  idx_FacturasProveedor_DetallesID_FACTURA = 4;
+  idx_FacturasProveedor_DetallesPOSICION = 5;
+  idx_FacturasProveedor_DetallesTIPO_DETALLE = 6;
+  idx_FacturasProveedor_DetallesCONCEPTO = 7;
+  idx_FacturasProveedor_DetallesCANTIDAD = 8;
+  idx_FacturasProveedor_DetallesUNIDAD_MEDIDA = 9;
+  idx_FacturasProveedor_DetallesIMPORTE_UNIDAD = 10;
+  idx_FacturasProveedor_DetallesIMPORTE_TOTAL = 11;
+  idx_FacturasProveedor_DetallesVISIBLE = 12;
+  idx_FacturasProveedor_DetallesID_ARTICULO = 13;
+  idx_FacturasProveedor_DetallesDESCUENTO = 14;
+  idx_FacturasProveedor_DetallesIMPORTE_PORTE = 15;
+  idx_FacturasProveedor_DetallesREFERENCIA = 16;
+  idx_FacturasProveedor_DetallesREFERENCIA_PROVEEDOR = 17;
+  idx_FacturasProveedor_DetallesREFERENCIA_FABRICANTE = 18;
 
   { FacturasProveedor_Pedidos fields }
   fld_FacturasProveedor_PedidosID = 'ID';
@@ -155,7 +161,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{B70A8975-7F23-4972-9368-BFE726B5E26A}']
+  ['{28EC39BD-0654-47A4-AC5C-F1D3A2D82BF3}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -190,7 +196,7 @@ type
 
   { IFacturasProveedor }
   IFacturasProveedor = interface(IDAStronglyTypedDataTable)
-  ['{F772B3DA-3DD4-4EF7-B92E-A308271EA1EB}']
+  ['{14C04314-139C-4DD3-AE5E-775EDC464C88}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -621,8 +627,20 @@ type
 
   { IFacturasProveedor_Detalles }
   IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{190BF84D-B95F-44CC-852D-EA525387744E}']
+  ['{FA7537D3-E822-4B9E-A6B5-05DDA7FCEA45}']
     { Property getters and setters }
+    function GetID_TIPO_IVAValue: Integer;
+    procedure SetID_TIPO_IVAValue(const aValue: Integer);
+    function GetID_TIPO_IVAIsNull: Boolean;
+    procedure SetID_TIPO_IVAIsNull(const aValue: Boolean);
+    function GetIVAValue: Float;
+    procedure SetIVAValue(const aValue: Float);
+    function GetIVAIsNull: Boolean;
+    procedure SetIVAIsNull(const aValue: Boolean);
+    function GetIMPORTE_IVAValue: Currency;
+    procedure SetIMPORTE_IVAValue(const aValue: Currency);
+    function GetIMPORTE_IVAIsNull: Boolean;
+    procedure SetIMPORTE_IVAIsNull(const aValue: Boolean);
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
     function GetIDIsNull: Boolean;
@@ -690,6 +708,12 @@ type
 
 
     { Properties }
+    property ID_TIPO_IVA: Integer read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue;
+    property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull;
+    property IVA: Float read GetIVAValue write SetIVAValue;
+    property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
+    property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
+    property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
     property ID: Integer read GetIDValue write SetIDValue;
     property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
     property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue;
@@ -729,6 +753,18 @@ type
   private
   protected
     { Property getters and setters }
+    function GetID_TIPO_IVAValue: Integer; virtual;
+    procedure SetID_TIPO_IVAValue(const aValue: Integer); virtual;
+    function GetID_TIPO_IVAIsNull: Boolean; virtual;
+    procedure SetID_TIPO_IVAIsNull(const aValue: Boolean); virtual;
+    function GetIVAValue: Float; virtual;
+    procedure SetIVAValue(const aValue: Float); virtual;
+    function GetIVAIsNull: Boolean; virtual;
+    procedure SetIVAIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_IVAValue: Currency; virtual;
+    procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual;
+    function GetIMPORTE_IVAIsNull: Boolean; virtual;
+    procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual;
     function GetIDValue: Integer; virtual;
     procedure SetIDValue(const aValue: Integer); virtual;
     function GetIDIsNull: Boolean; virtual;
@@ -795,6 +831,12 @@ type
     procedure SetREFERENCIA_FABRICANTEIsNull(const aValue: Boolean); virtual;
 
     { Properties }
+    property ID_TIPO_IVA: Integer read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue;
+    property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull;
+    property IVA: Float read GetIVAValue write SetIVAValue;
+    property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
+    property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
+    property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
     property ID: Integer read GetIDValue write SetIDValue;
     property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
     property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue;
@@ -836,7 +878,7 @@ type
 
   { IFacturasProveedor_Pedidos }
   IFacturasProveedor_Pedidos = interface(IDAStronglyTypedDataTable)
-  ['{F3D2B69B-D69B-48F2-B9CC-142E86840B12}']
+  ['{3BB01751-E7BB-4F57-A36D-07E688D24EA5}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1722,6 +1764,69 @@ begin
   inherited;
 end;
 
+function TFacturasProveedor_DetallesDataTableRules.GetID_TIPO_IVAValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesID_TIPO_IVA].AsInteger;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetID_TIPO_IVAValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedor_DetallesID_TIPO_IVA].AsInteger := aValue;
+end;
+
+function TFacturasProveedor_DetallesDataTableRules.GetID_TIPO_IVAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesID_TIPO_IVA].IsNull;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetID_TIPO_IVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_DetallesID_TIPO_IVA].AsVariant := Null;
+end;
+
+function TFacturasProveedor_DetallesDataTableRules.GetIVAValue: Float;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesIVA].AsFloat;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetIVAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_FacturasProveedor_DetallesIVA].AsFloat := aValue;
+end;
+
+function TFacturasProveedor_DetallesDataTableRules.GetIVAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesIVA].IsNull;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetIVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_DetallesIVA].AsVariant := Null;
+end;
+
+function TFacturasProveedor_DetallesDataTableRules.GetIMPORTE_IVAValue: Currency;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesIMPORTE_IVA].AsCurrency;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetIMPORTE_IVAValue(const aValue: Currency);
+begin
+  DataTable.Fields[idx_FacturasProveedor_DetallesIMPORTE_IVA].AsCurrency := aValue;
+end;
+
+function TFacturasProveedor_DetallesDataTableRules.GetIMPORTE_IVAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_DetallesIMPORTE_IVA].IsNull;
+end;
+
+procedure TFacturasProveedor_DetallesDataTableRules.SetIMPORTE_IVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_DetallesIMPORTE_IVA].AsVariant := Null;
+end;
+
 function TFacturasProveedor_DetallesDataTableRules.GetIDValue: Integer;
 begin
   result := DataTable.Fields[idx_FacturasProveedor_DetallesID].AsInteger;
diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas
index caa80e89..fd0a04c0 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas	
@@ -9,15 +9,15 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturasDelta = '{99DA85D3-EA9A-41E6-A66E-FF1D2AB9AE8B}';
-  RID_FacturasProveedorDelta = '{58681BDC-4147-4339-BACB-501CA5E4487D}';
-  RID_FacturasProveedor_DetallesDelta = '{BBB8B4C0-752D-4319-8893-B5C08B88658F}';
-  RID_FacturasProveedor_PedidosDelta = '{085BF081-2B43-4D0F-8B97-B03EB67DC5F2}';
+  RID_ListaAnosFacturasDelta = '{18BE29AD-3087-4F44-941F-77D6F3F40870}';
+  RID_FacturasProveedorDelta = '{589004DA-1ECB-413A-8896-94D723671F59}';
+  RID_FacturasProveedor_DetallesDelta = '{BA6AE653-A6E5-4E77-99EC-EE6D723D13DA}';
+  RID_FacturasProveedor_PedidosDelta = '{73BDBD6A-D292-4B54-BA09-A8922EFD69C5}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{99DA85D3-EA9A-41E6-A66E-FF1D2AB9AE8B}']
+  ['{18BE29AD-3087-4F44-941F-77D6F3F40870}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -51,7 +51,7 @@ type
 
   { IFacturasProveedorDelta }
   IFacturasProveedorDelta = interface(IFacturasProveedor)
-  ['{58681BDC-4147-4339-BACB-501CA5E4487D}']
+  ['{589004DA-1ECB-413A-8896-94D723671F59}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -482,8 +482,11 @@ type
 
   { IFacturasProveedor_DetallesDelta }
   IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
-  ['{BBB8B4C0-752D-4319-8893-B5C08B88658F}']
+  ['{BA6AE653-A6E5-4E77-99EC-EE6D723D13DA}']
     { Property getters and setters }
+    function GetOldID_TIPO_IVAValue : Integer;
+    function GetOldIVAValue : Float;
+    function GetOldIMPORTE_IVAValue : Currency;
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
     function GetOldPOSICIONValue : Integer;
@@ -502,6 +505,9 @@ type
     function GetOldREFERENCIA_FABRICANTEValue : String;
 
     { Properties }
+    property OldID_TIPO_IVA : Integer read GetOldID_TIPO_IVAValue;
+    property OldIVA : Float read GetOldIVAValue;
+    property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
     property OldID : Integer read GetOldIDValue;
     property OldID_FACTURA : Integer read GetOldID_FACTURAValue;
     property OldPOSICION : Integer read GetOldPOSICIONValue;
@@ -525,6 +531,24 @@ type
   private
   protected
     { Property getters and setters }
+    function GetID_TIPO_IVAValue: Integer; virtual;
+    function GetID_TIPO_IVAIsNull: Boolean; virtual;
+    function GetOldID_TIPO_IVAValue: Integer; virtual;
+    function GetOldID_TIPO_IVAIsNull: Boolean; virtual;
+    procedure SetID_TIPO_IVAValue(const aValue: Integer); virtual;
+    procedure SetID_TIPO_IVAIsNull(const aValue: Boolean); virtual;
+    function GetIVAValue: Float; virtual;
+    function GetIVAIsNull: Boolean; virtual;
+    function GetOldIVAValue: Float; virtual;
+    function GetOldIVAIsNull: Boolean; virtual;
+    procedure SetIVAValue(const aValue: Float); virtual;
+    procedure SetIVAIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_IVAValue: Currency; virtual;
+    function GetIMPORTE_IVAIsNull: Boolean; virtual;
+    function GetOldIMPORTE_IVAValue: Currency; virtual;
+    function GetOldIMPORTE_IVAIsNull: Boolean; virtual;
+    procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual;
+    procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual;
     function GetIDValue: Integer; virtual;
     function GetIDIsNull: Boolean; virtual;
     function GetOldIDValue: Integer; virtual;
@@ -623,6 +647,18 @@ type
     procedure SetREFERENCIA_FABRICANTEIsNull(const aValue: Boolean); virtual;
 
     { Properties }
+    property ID_TIPO_IVA : Integer read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue;
+    property ID_TIPO_IVAIsNull : Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull;
+    property OldID_TIPO_IVA : Integer read GetOldID_TIPO_IVAValue;
+    property OldID_TIPO_IVAIsNull : Boolean read GetOldID_TIPO_IVAIsNull;
+    property IVA : Float read GetIVAValue write SetIVAValue;
+    property IVAIsNull : Boolean read GetIVAIsNull write SetIVAIsNull;
+    property OldIVA : Float read GetOldIVAValue;
+    property OldIVAIsNull : Boolean read GetOldIVAIsNull;
+    property IMPORTE_IVA : Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
+    property IMPORTE_IVAIsNull : Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
+    property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
+    property OldIMPORTE_IVAIsNull : Boolean read GetOldIMPORTE_IVAIsNull;
     property ID : Integer read GetIDValue write SetIDValue;
     property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
     property OldID : Integer read GetOldIDValue;
@@ -696,7 +732,7 @@ type
 
   { IFacturasProveedor_PedidosDelta }
   IFacturasProveedor_PedidosDelta = interface(IFacturasProveedor_Pedidos)
-  ['{085BF081-2B43-4D0F-8B97-B03EB67DC5F2}']
+  ['{73BDBD6A-D292-4B54-BA09-A8922EFD69C5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1933,6 +1969,99 @@ begin
   inherited;
 end;
 
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetID_TIPO_IVAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetID_TIPO_IVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA]);
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldID_TIPO_IVAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldID_TIPO_IVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA]);
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetID_TIPO_IVAValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA] := aValue;
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetID_TIPO_IVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesID_TIPO_IVA] := Null;
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetIVAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetIVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIVA]);
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldIVAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesIVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldIVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesIVA]);
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetIVAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIVA] := aValue;
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetIVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIVA] := Null;
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetIMPORTE_IVAValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetIMPORTE_IVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA]);
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldIMPORTE_IVAValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA];
+end;
+
+function TFacturasProveedor_DetallesBusinessProcessorRules.GetOldIMPORTE_IVAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA]);
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetIMPORTE_IVAValue(const aValue: Currency);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA] := aValue;
+end;
+
+procedure TFacturasProveedor_DetallesBusinessProcessorRules.SetIMPORTE_IVAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesIMPORTE_IVA] := Null;
+end;
+
 function TFacturasProveedor_DetallesBusinessProcessorRules.GetIDValue: Integer;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_DetallesID];
diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizDetallesFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizDetallesFacturaProveedor.pas
index 22e72544..a883d166 100644
--- a/Source/Modulos/Facturas de proveedor/Model/uBizDetallesFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/uBizDetallesFacturaProveedor.pas	
@@ -10,13 +10,24 @@ const
 
 type
   IBizDetallesFacturaProveedor = interface(IFacturasProveedor_Detalles)
-  ['{785A33CF-17AF-4FFC-9904-33AD3489A6B5}']
+    ['{785A33CF-17AF-4FFC-9904-33AD3489A6B5}']
+    function DarTotalIVA : double;
   end;
 
+  TImporteIVADetalles = record
+    ID: integer;
+    IVA: Float;
+    ImporteIVA: Double;
+  end;
+
+  TImporteIVADetallesArray = array of TImporteIVADetalles;
+
+
   TBizDetallesFacturaProveedor = class(TFacturasProveedor_DetallesDataTableRules, IBizDetallesFacturaProveedor)
   protected
     procedure OnNewRecord(Sender: TDADataTable); override;
-    procedure BeforeInsert(Sender: TDADataTable); override;	
+    procedure BeforeInsert(Sender: TDADataTable); override;
+    function DarTotalIVA : double;
   end;
 
 implementation
@@ -36,6 +47,11 @@ begin
     AMasterTable.Post;
 end;
 
+function TBizDetallesFacturaProveedor.DarTotalIVA: double;
+begin
+  Result := IMPORTE_IVA;
+end;
+
 procedure TBizDetallesFacturaProveedor.OnNewRecord(Sender: TDADataTable);
 begin
   inherited;
diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
index 68239e1b..7ce1605e 100644
--- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas	
@@ -43,6 +43,7 @@ type
     procedure CalcularImporteTotal;
   end;
 
+
   TBizFacturaProveedor = class(TFacturasProveedorDataTableRules, IBizFacturaProveedor, ISeleccionable)
   private
     FSeleccionableInterface : ISeleccionable;
@@ -170,10 +171,23 @@ begin
 end;
 
 procedure TBizFacturaProveedor.CalcularIVA;
+var
+  ATotal : double;
 begin
+  ATotal := 0;
+
+  FDetalles.First;
+  while not FDetalles.EOF do
+  begin
+    ATotal := ATotal + FDetalles.IMPORTE_IVA;
+    FDetalles.Next;
+  end;
+
+
   if not Self.DataTable.Editing then
     Edit;
-  IMPORTE_IVA := (IVA / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO);
+
+  IMPORTE_IVA := ATotal;
 end;
 
 procedure TBizFacturaProveedor.CalcularRE;
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm
index 559f9deb..fdd0ee9c 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
@@ -389,7 +389,9 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'TALLES.ID_ARTICULO, FACTURAS_PROVEEDOR_DETALLES.DESCUENTO,'#10'    F' +
               'ACTURAS_PROVEEDOR_DETALLES.IMPORTE_PORTE,'#10'    ARTICULOS.REFERENC' +
               'IA, ARTICULOS_PROVEEDORES.REFERENCIA_PROV as REFERENCIA_PROVEEDO' +
-              'R,'#10'    ARTICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE'#10#10'FROM ' +
+              'R,'#10'    ARTICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE,'#10'    F' +
+              'ACTURAS_PROVEEDOR_DETALLES.ID_TIPO_IVA, FACTURAS_PROVEEDOR_DETAL' +
+              'LES.IVA,'#10'    FACTURAS_PROVEEDOR_DETALLES.IMPORTE_IVA'#10'    '#10#10'FROM ' +
               'FACTURAS_PROVEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON FACTURAS_PROV' +
               'EEDOR_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'LEFT JOIN FACTURAS_PRO' +
               'VEEDOR ON (FACTURAS_PROVEEDOR.ID = FACTURAS_PROVEEDOR_DETALLES.I' +
@@ -466,10 +468,37 @@ object srvFacturasProveedor: TsrvFacturasProveedor
                 DatasetField = 'UNIDAD_MEDIDA'
                 TableField = '<unknown>'
                 SQLOrigin = 'UNIDAD_MEDIDA'
+              end
+              item
+                DatasetField = 'ID_TIPO_IVA'
+                TableField = 'ID_TIPO_IVA'
+              end
+              item
+                DatasetField = 'IVA'
+                TableField = 'IVA'
+              end
+              item
+                DatasetField = 'IMPORTE_IVA'
+                TableField = 'IMPORTE_IVA'
               end>
           end>
         Name = 'FacturasProveedor_Detalles'
         Fields = <
+          item
+            Name = 'ID_TIPO_IVA'
+            DataType = datInteger
+            DictionaryEntry = 'FacturasProveedor_Detalles_ID_TIPO_IVA'
+          end
+          item
+            Name = 'IVA'
+            DataType = datFloat
+            DictionaryEntry = 'FacturasProveedor_Detalles_IVA'
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            DataType = datCurrency
+            DictionaryEntry = 'FacturasProveedor_Detalles_IMPORTE_IVA'
+          end
           item
             Name = 'ID'
             DataType = datAutoInc
@@ -509,6 +538,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Name = 'UNIDAD_MEDIDA'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'FacturasProveedor_Detalles_UNIDAD_MEDIDA'
           end
           item
             Name = 'IMPORTE_UNIDAD'
@@ -556,6 +586,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Name = 'REFERENCIA_FABRICANTE'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'FacturasProveedor_Detalles_REFERENCIA_FABRICANTE'
           end>
       end
       item
@@ -786,16 +817,6 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Size = 10
             Value = ''
           end
-          item
-            Name = 'FECHA_ALTA'
-            DataType = datDateTime
-            Value = ''
-          end
-          item
-            Name = 'FECHA_MODIFICACION'
-            DataType = datDateTime
-            Value = ''
-          end
           item
             Name = 'USUARIO'
             DataType = datString
@@ -854,17 +875,17 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'UENTO,'#10'     IMPORTE_DESCUENTO, IVA, IMPORTE_IVA, RE, IMPORTE_RE,' +
               ' '#10'     IMPORTE_TOTAL, OBSERVACIONES, ID_PROVEEDOR, NIF_CIF, '#10'   ' +
               '  NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, '#10'     FECH' +
-              'A_ALTA, FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, '#10'     RECARG' +
-              'O_EQUIVALENCIA, ID_TIPO_IVA, IMPORTE_NETO, IMPORTE_PORTE,'#10'     D' +
-              'ATOS_BANCARIOS, FECHA_VENCIMIENTO, FECHA_RECEPCION)'#10'  VALUES'#10'   ' +
-              ' (:ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_PROVEEDOR,'#10'     :FE' +
-              'CHA_FACTURA, :BASE_IMPONIBLE, :DESCUENTO,'#10'     :IMPORTE_DESCUENT' +
-              'O, :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10'     :IMPORTE_TOTAL, :' +
-              'OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10'     :NOMBRE, :CALLE, :' +
-              'POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10'     :FECHA_ALTA, :FECHA' +
-              '_MODIFICACION, :USUARIO, :ID_FORMA_PAGO, '#10'     :RECARGO_EQUIVALE' +
-              'NCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10'     :IMPORTE_PORTE, :DATOS_' +
-              'BANCARIOS, :FECHA_VENCIMIENTO, :FECHA_RECEPCION)'#10'     '#10'     '#10#10
+              'A_ALTA, USUARIO, ID_FORMA_PAGO,'#10'     RECARGO_EQUIVALENCIA, ID_TI' +
+              'PO_IVA, IMPORTE_NETO, IMPORTE_PORTE,'#10'     DATOS_BANCARIOS, FECHA' +
+              '_VENCIMIENTO, FECHA_RECEPCION)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :' +
+              'REFERENCIA, :REFERENCIA_PROVEEDOR,'#10'     :FECHA_FACTURA, :BASE_IM' +
+              'PONIBLE, :DESCUENTO,'#10'     :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA' +
+              ', :RE, :IMPORTE_RE, '#10'     :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PR' +
+              'OVEEDOR, :NIF_CIF, '#10'     :NOMBRE, :CALLE, :POBLACION, :PROVINCIA' +
+              ', :CODIGO_POSTAL, '#10'     CURRENT_TIMESTAMP, :USUARIO, :ID_FORMA_P' +
+              'AGO,'#10'     :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' ' +
+              '    :IMPORTE_PORTE, :DATOS_BANCARIOS, :FECHA_VENCIMIENTO, :FECHA' +
+              '_RECEPCION)'#10'     '#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1004,16 +1025,6 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Size = 10
             Value = ''
           end
-          item
-            Name = 'FECHA_ALTA'
-            DataType = datDateTime
-            Value = ''
-          end
-          item
-            Name = 'FECHA_MODIFICACION'
-            DataType = datDateTime
-            Value = ''
-          end
           item
             Name = 'USUARIO'
             DataType = datString
@@ -1081,14 +1092,13 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'ERVACIONES = :OBSERVACIONES, '#10'    ID_PROVEEDOR = :ID_PROVEEDOR, ' +
               #10'    NIF_CIF = :NIF_CIF, '#10'    NOMBRE = :NOMBRE, '#10'    CALLE = :CA' +
               'LLE, '#10'    POBLACION = :POBLACION, '#10'    PROVINCIA = :PROVINCIA, '#10 +
-              '    CODIGO_POSTAL = :CODIGO_POSTAL, '#10'    FECHA_ALTA = :FECHA_ALT' +
-              'A, '#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION, '#10'    USUARIO =' +
-              ' :USUARIO, '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO, '#10'    RECARGO_EQU' +
-              'IVALENCIA = :RECARGO_EQUIVALENCIA, '#10'    ID_TIPO_IVA = :ID_TIPO_I' +
-              'VA, '#10'    IMPORTE_NETO = :IMPORTE_NETO, '#10'    IMPORTE_PORTE = :IMP' +
-              'ORTE_PORTE,'#10'    DATOS_BANCARIOS = :DATOS_BANCARIOS,'#10'    FECHA_VE' +
-              'NCIMIENTO = :FECHA_VENCIMIENTO,'#10'    FECHA_RECEPCION = :FECHA_REC' +
-              'EPCION'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              '    CODIGO_POSTAL = :CODIGO_POSTAL, '#10'    FECHA_MODIFICACION = CU' +
+              'RRENT_TIMESTAMP,'#10'    USUARIO = :USUARIO, '#10'    ID_FORMA_PAGO = :I' +
+              'D_FORMA_PAGO, '#10'    RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,' +
+              ' '#10'    ID_TIPO_IVA = :ID_TIPO_IVA, '#10'    IMPORTE_NETO = :IMPORTE_N' +
+              'ETO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    DATOS_BANCARIOS = ' +
+              ':DATOS_BANCARIOS,'#10'    FECHA_VENCIMIENTO = :FECHA_VENCIMIENTO,'#10'  ' +
+              '  FECHA_RECEPCION = :FECHA_RECEPCION'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1096,6 +1106,18 @@ object srvFacturasProveedor: TsrvFacturasProveedor
       end
       item
         Params = <
+          item
+            Name = 'ID_TIPO_IVA'
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            Value = ''
+          end
+          item
+            Name = 'IVA'
+            Value = ''
+          end
           item
             Name = 'ID'
             DataType = datAutoInc
@@ -1159,10 +1181,11 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'INSERT'#10'  INTO FACTURAS_PROVEEDOR_DETALLES'#10'    (ID, ID_FACTURA, P' +
               'OSICION, TIPO_DETALLE, CONCEPTO, CANTIDAD, UNIDAD_MEDIDA,'#10'     I' +
               'MPORTE_UNIDAD, IMPORTE_TOTAL, VISIBLE, ID_ARTICULO, '#10'     DESCUE' +
-              'NTO, IMPORTE_PORTE)'#10'  VALUES'#10'    (:ID, :ID_FACTURA, :POSICION, :' +
-              'TIPO_DETALLE, :CONCEPTO, :CANTIDAD, :UNIDAD_MEDIDA,'#10'     :IMPORT' +
-              'E_UNIDAD, :IMPORTE_TOTAL, :VISIBLE, :ID_ARTICULO, '#10'     :DESCUEN' +
-              'TO, :IMPORTE_PORTE)'#10'     '#10'     '#10#10
+              'NTO, IMPORTE_PORTE, ID_TIPO_IVA, IVA, IMPORTE_IVA)'#10'  VALUES'#10'    ' +
+              '(:ID, :ID_FACTURA, :POSICION, :TIPO_DETALLE, :CONCEPTO, :CANTIDA' +
+              'D, :UNIDAD_MEDIDA,'#10'     :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBL' +
+              'E, :ID_ARTICULO, '#10'     :DESCUENTO, :IMPORTE_PORTE, :ID_TIPO_IVA,' +
+              ' :IVA, :IMPORTE_IVA)'#10'     '#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1189,6 +1212,18 @@ object srvFacturasProveedor: TsrvFacturasProveedor
       end
       item
         Params = <
+          item
+            Name = 'ID_TIPO_IVA'
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            Value = ''
+          end
+          item
+            Name = 'IVA'
+            Value = ''
+          end
           item
             Name = 'ID'
             Value = ''
@@ -1257,8 +1292,9 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'CANTIDAD, '#10'    UNIDAD_MEDIDA = :UNIDAD_MEDIDA,'#10'    IMPORTE_UNIDA' +
               'D = :IMPORTE_UNIDAD, '#10'    IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10'    V' +
               'ISIBLE = :VISIBLE, '#10'    ID_ARTICULO = :ID_ARTICULO, '#10'    DESCUEN' +
-              'TO = :DESCUENTO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE'#10'  WHERE'#10'   ' +
-              ' (ID = :OLD_ID)'#10
+              'TO = :DESCUENTO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    ID_TIP' +
+              'O_IVA = :ID_TIPO_IVA,'#10'    IVA = :IVA,'#10'    IMPORTE_IVA = :IMPORTE' +
+              '_IVA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1483,6 +1519,12 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DisplayLabel = 'Importe dto.'
         Alignment = taRightJustify
       end
+      item
+        Name = 'FacturasProveedor_Detalles_IMPORTE_IVA'
+        DataType = datCurrency
+        DisplayLabel = 'Importe IVA'
+        Alignment = taRightJustify
+      end
       item
         Name = 'FacturasProveedor_IMPORTE_IVA'
         DataType = datCurrency
@@ -1556,6 +1598,12 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         Size = 150
         DisplayLabel = 'Poblaci'#243'n'
       end
+      item
+        Name = 'FacturasProveedor_Detalles_IVA'
+        DataType = datFloat
+        DisplayLabel = 'IVA'
+        Alignment = taRightJustify
+      end
       item
         Name = 'FacturasProveedor_IVA'
         DataType = datFloat
@@ -1687,6 +1735,11 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         Name = 'FacturasProveedor_ID_PROVEEDOR'
         DataType = datInteger
       end
+      item
+        Name = 'FacturasProveedor_Detalles_ID_TIPO_IVA'
+        DataType = datInteger
+        DisplayLabel = 'ID_TIPO_IVA'
+      end
       item
         Name = 'FacturasProveedor_ID_TIPO_IVA'
         DataType = datInteger
@@ -1766,6 +1819,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DataType = datString
         Size = 255
         DisplayLabel = 'Proveedor'
+      end
+      item
+        Name = 'FacturasProveedor_Detalles_UNIDAD_MEDIDA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'FacturasProveedor_Detalles_REFERENCIA_FABRICANTE'
+        DataType = datString
+        Size = 255
       end>
     Left = 150
     Top = 22
diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk
index aa9086450b4ba0e86da6157457a9ea63ddbaf240..c6d1e13ee28d8e088f7bf75f7276482780d4b898 100644
GIT binary patch
delta 181
zcmZn_nlHTJF|)A_FPDNsN`-TNQL2lfA(ZEnSeaj1;+&sXQk0*A5O&Vb%>(i_KW1iP
zoqUW{ydW$ywLB!hBrzwoI4rR!Gr!m~%uyjTPeHvDn~YvTVzIhHby^WNNh^gA>=L!s
Oyj;9osd*`Syj%cH6Flz#

delta 45
zcmbO)+$yx;G4p0I7A95&*PPV!%p#Zk+|1<6oXo`J%>2AsYhEs1uGG8~Jzg#b09!u|
A!T<mO

diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj
index 24cab1ab..12832ad1 100644
--- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj	
+++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj	
@@ -41,6 +41,10 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
@@ -49,30 +53,38 @@
     <DelphiCompile Include="FacturasProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="AlbProv_FacProv_relation.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="FacturasProveedor_controller.dcp" />
-    <DCCReference Include="FacturasProveedor_model.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="PedProv_FacProv_relation.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\Model\adortl.dcp" />
+    <DCCReference Include="..\Model\AlbProv_FacProv_relation.dcp" />
+    <DCCReference Include="..\Model\Articulos_view.dcp" />
+    <DCCReference Include="..\Model\cxDataD11.dcp" />
+    <DCCReference Include="..\Model\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Model\cxExportD11.dcp" />
+    <DCCReference Include="..\Model\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Model\cxGridD11.dcp" />
+    <DCCReference Include="..\Model\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Model\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Model\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Model\dbrtl.dcp" />
+    <DCCReference Include="..\Model\dsnap.dcp" />
+    <DCCReference Include="..\Model\dxComnD11.dcp" />
+    <DCCReference Include="..\Model\dxCoreD11.dcp" />
+    <DCCReference Include="..\Model\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Model\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Model\dxThemeD11.dcp" />
+    <DCCReference Include="..\Model\FacturasProveedor_controller.dcp" />
+    <DCCReference Include="..\Model\FacturasProveedor_model.dcp" />
+    <DCCReference Include="..\Model\GestorInformes_controller.dcp" />
+    <DCCReference Include="..\Model\GUIBase.dcp" />
+    <DCCReference Include="..\Model\PedProv_FacProv_relation.dcp" />
+    <DCCReference Include="..\Model\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Model\PNG_D10.dcp" />
+    <DCCReference Include="..\Model\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Model\rtl.dcp" />
+    <DCCReference Include="..\Model\vcl.dcp" />
+    <DCCReference Include="..\Model\vclactnband.dcp" />
+    <DCCReference Include="..\Model\vcldb.dcp" />
+    <DCCReference Include="..\Model\vcljpg.dcp" />
+    <DCCReference Include="..\Model\vclx.dcp" />
     <DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas">
       <Form>fEditorElegirArticulosFacturaProveedor</Form>
       <DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass>
@@ -114,11 +126,10 @@
       <Form>frViewPedidosFacturaProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclactnband.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="uViewTotalesVariosIVA.pas">
+      <Form>frViewTotalesVariosIVA</Form>
+      <DesignClass>TfEditorFacturaProveedor</DesignClass>
+    </DCCReference>
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
index 0a25baf0..b86349d9 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
@@ -76,21 +76,22 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
   end
   inherited pgPaginas: TPageControl
     Width = 813
-    Height = 362
+    Height = 278
     ActivePage = pagContenido
     OnChanging = pgPaginasChanging
     ExplicitWidth = 813
-    ExplicitHeight = 362
+    ExplicitHeight = 278
     inherited pagGeneral: TTabSheet
+      OnShow = pagGeneralShow
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 805
-      ExplicitHeight = 334
+      ExplicitHeight = 250
       inline frViewFacturaProveedor1: TfrViewFacturaProveedor
         Left = 0
         Top = 0
         Width = 805
-        Height = 334
+        Height = 250
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -101,12 +102,12 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 805
-        ExplicitHeight = 334
+        ExplicitHeight = 250
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 805
-          Height = 334
+          Height = 250
           ExplicitWidth = 805
-          ExplicitHeight = 334
+          ExplicitHeight = 250
           inherited eReferencia: TcxDBTextEdit
             Properties.ReadOnly = True
             Style.LookAndFeel.SkinName = ''
@@ -143,8 +144,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             Width = 104
           end
           inherited bFormasPago: TButton
-            Left = 251
-            ExplicitLeft = 251
+            Left = 242
+            ExplicitLeft = 242
           end
           inherited eReferenciaProveedor: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -155,9 +156,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             Width = 242
           end
           inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor
-            Left = 411
+            Left = 402
             Width = 377
-            ExplicitLeft = 411
+            ExplicitLeft = 402
             ExplicitWidth = 377
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 377
@@ -208,17 +209,17 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
                 Width = 303
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 280
+                Left = 272
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 280
+                ExplicitLeft = 272
               end
               inherited Button3: TBitBtn
-                Left = 164
-                ExplicitLeft = 164
+                Left = 156
+                ExplicitLeft = 156
               end
             end
           end
@@ -238,17 +239,24 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             ExplicitWidth = 251
             Width = 251
           end
+          inherited edtFechaRecepcion: TcxDBDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
         end
       end
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      OnShow = pagContenidoShow
       inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor
         Left = 0
         Top = 0
         Width = 805
-        Height = 334
+        Height = 250
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -261,111 +269,102 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 805
-        ExplicitHeight = 334
+        ExplicitHeight = 250
         inherited ToolBar1: TToolBar
           Width = 805
-          Height = 51
+          Height = 73
           ExplicitWidth = 805
-          ExplicitHeight = 51
+          ExplicitHeight = 73
           inherited ToolButton3: TToolButton
             Wrap = False
           end
-          inherited ToolButton4: TToolButton
+          inherited FontName: TJvFontComboBox [3]
             Left = 278
             Top = 0
-            ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton [4]
-            Left = 334
+          inherited ToolButton4: TToolButton [4]
+            Left = 423
             Top = 0
-            ExplicitLeft = 334
+            ExplicitLeft = 423
             ExplicitTop = 0
           end
-          inherited FontName: TJvFontComboBox [5]
-            Left = 399
+          inherited ToolButton14: TToolButton [5]
+            Left = 479
             Top = 0
-            ExplicitLeft = 399
+            ExplicitLeft = 479
             ExplicitTop = 0
           end
-          inherited FontSize: TEdit
-            Left = 544
+          inherited ToolButton13: TToolButton [6]
             Top = 0
-            Width = 200
-            ExplicitLeft = 544
             ExplicitTop = 0
-            ExplicitWidth = 200
           end
-          inherited ToolButton13: TToolButton [7]
+          inherited FontSize: TEdit [7]
             Left = 0
-            Top = 0
-            Wrap = True
-            ExplicitLeft = 0
-            ExplicitTop = 0
-            ExplicitHeight = 27
+            Top = 27
+            Width = 328
+            ExplicitTop = 27
+            ExplicitWidth = 328
           end
           inherited UpDown1: TUpDown [8]
-            Left = 0
+            Left = 328
             Top = 27
-            ExplicitLeft = 0
+            ExplicitLeft = 328
             ExplicitTop = 27
           end
-          inherited ToolButton6: TToolButton [9]
-            Left = 17
+          inherited ToolButton6: TToolButton
+            Left = 345
             Top = 27
-            ExplicitLeft = 17
+            ExplicitLeft = 345
             ExplicitTop = 27
           end
           inherited ToolButton7: TToolButton [10]
-            Left = 83
+            Left = 411
             Top = 27
-            ExplicitLeft = 83
+            Wrap = True
+            ExplicitLeft = 411
             ExplicitTop = 27
           end
           inherited ToolButton8: TToolButton [11]
-            Left = 150
-            Top = 27
-            ExplicitLeft = 150
-            ExplicitTop = 27
+            Left = 0
+            Top = 49
+            ExplicitLeft = 0
+            ExplicitTop = 49
           end
           inherited ToolButton12: TToolButton [12]
-            Left = 233
-            Top = 27
-            ExplicitLeft = 233
-            ExplicitTop = 27
+            Left = 83
+            Wrap = False
+            ExplicitLeft = 83
             ExplicitHeight = 22
           end
           inherited ToolButton9: TToolButton [13]
-            Left = 241
-            Top = 27
-            ExplicitLeft = 241
-            ExplicitTop = 27
+            Left = 91
+            Top = 49
+            ExplicitLeft = 91
+            ExplicitTop = 49
           end
-          inherited ToolButton10: TToolButton [14]
-            Left = 386
-            Top = 27
-            ExplicitLeft = 386
-            ExplicitTop = 27
+          inherited ToolButton10: TToolButton
+            Left = 236
+            Top = 49
+            ExplicitLeft = 236
+            ExplicitTop = 49
           end
           inherited ToolButton11: TToolButton [15]
-            Left = 511
-            Top = 27
-            ExplicitLeft = 511
-            ExplicitTop = 27
+            Left = 361
+            ExplicitLeft = 361
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 77
+          Top = 99
           Width = 805
-          Height = 257
-          ExplicitTop = 77
+          Height = 151
           ExplicitWidth = 805
-          ExplicitHeight = 257
+          ExplicitHeight = 151
         end
         inherited TBXDock1: TTBXDock
-          Top = 51
+          Top = 73
           Width = 805
-          ExplicitTop = 51
+          ExplicitTop = 73
           ExplicitWidth = 805
           inherited TBXToolbar1: TTBXToolbar
             ExplicitWidth = 805
@@ -393,7 +392,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Left = 0
         Top = 0
         Width = 805
-        Height = 334
+        Height = 250
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -404,16 +403,28 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 805
-        ExplicitHeight = 334
+        ExplicitHeight = 250
         inherited cxGrid: TcxGrid
           Width = 805
-          Height = 309
+          Height = 225
           ExplicitWidth = 805
-          ExplicitHeight = 309
+          ExplicitHeight = 225
         end
         inherited ToolBar1: TToolBar
           Width = 805
           ExplicitWidth = 805
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
         end
       end
     end
@@ -428,11 +439,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     ExplicitTop = 614
     ExplicitWidth = 819
   end
-  inline frViewTotales1: TfrViewTotales [4]
+  inline frViewTotales1: TfrViewTotalesVariosIVA [4]
     Left = 0
-    Top = 444
+    Top = 360
     Width = 819
-    Height = 170
+    Height = 254
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -442,264 +453,181 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 444
+    ExplicitTop = 360
     ExplicitWidth = 819
-    ExplicitHeight = 170
+    ExplicitHeight = 254
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 819
-      Height = 170
+      Height = 254
       ExplicitWidth = 819
-      ExplicitHeight = 170
+      ExplicitHeight = 254
       inherited Bevel3: TBevel
-        Left = 460
-        Top = 30
-        Height = 122
-        ExplicitLeft = 460
-        ExplicitTop = 30
-        ExplicitHeight = 122
-      end
-      inherited Bevel4: TBevel
-        Left = 572
-        Top = 60
-        Width = 186
-        ExplicitLeft = 572
-        ExplicitTop = 60
-        ExplicitWidth = 186
+        Left = 418
+        Height = 100
+        ExplicitLeft = 418
+        ExplicitHeight = 100
       end
       inherited Bevel1: TBevel
-        Left = 572
-        Top = 164
-        Width = 73
-        ExplicitLeft = 572
-        ExplicitTop = 164
-        ExplicitWidth = 73
-      end
-      inherited Bevel2: TBevel
-        Top = 190
+        Left = 530
         Width = 368
-        ExplicitTop = 190
+        ExplicitLeft = 530
         ExplicitWidth = 368
       end
+      inherited Bevel2: TBevel
+        Left = 530
+        Width = 368
+        ExplicitLeft = 530
+        ExplicitWidth = 368
+      end
+      inherited Bevel4: TBevel
+        Width = 388
+        ExplicitWidth = 388
+      end
       inherited ImporteDto: TcxDBCurrencyEdit
-        Top = 57
-        Enabled = False
+        Left = 601
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 57
-        ExplicitWidth = 260
-        Width = 260
+        ExplicitLeft = 601
+        ExplicitWidth = 290
+        Width = 290
       end
-      inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 643
-        Top = 83
+      inherited eImporteIVA1: TcxCurrencyEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 643
-        ExplicitTop = 83
-        ExplicitWidth = 163
-        Width = 163
-      end
-      inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 573
-        Top = 137
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 573
-        ExplicitTop = 137
-        ExplicitWidth = 233
-        Width = 233
-      end
-      inherited edtDescuento: TcxDBSpinEdit
-        Top = 57
-        Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 57
-      end
-      inherited edtIVA: TcxDBSpinEdit
-        Left = 572
-        Top = 83
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 572
-        ExplicitTop = 83
-      end
-      inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 572
-        Top = 30
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 572
-        ExplicitTop = 30
         ExplicitWidth = 234
         Width = 234
       end
-      inherited edtRE: TcxDBSpinEdit
-        Left = 572
-        Top = 110
-        Properties.AssignedValues.MinValue = True
+      inherited ImporteTotal: TcxDBCurrencyEdit
+        Left = 531
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 572
-        ExplicitTop = 110
+        ExplicitLeft = 531
+        ExplicitWidth = 90
+        Width = 90
+      end
+      inherited edtDescuento: TcxDBSpinEdit
+        Left = 530
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 530
+      end
+      inherited ImporteBase: TcxDBCurrencyEdit
+        Left = 530
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 530
+        ExplicitWidth = 284
+        Width = 284
+      end
+      inherited edtRE: TcxDBSpinEdit
+        Left = 530
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 530
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 643
-        Top = 110
+        Left = 601
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 643
-        ExplicitTop = 110
-        ExplicitWidth = 163
-        Width = 163
+        ExplicitLeft = 601
+        ExplicitWidth = 20
+        Width = 20
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
-        Top = 30
+        Left = 530
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 30
-        ExplicitWidth = 331
-        Width = 331
+        ExplicitLeft = 530
+        ExplicitWidth = 297
+        Width = 297
       end
-      inherited ePorte: TcxDBCurrencyEdit
-        Top = 84
-        DataBinding.DataSource = dsDataTable
-        Properties.OnValidate = frViewTotales1ePortePropertiesValidate
+      inherited eIVA1: TcxTextEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        OnEditing = frViewTotales1ePorteEditing
-        ExplicitTop = 84
-        ExplicitWidth = 331
-        Width = 331
       end
-      inherited eIVA: TcxDBLookupComboBox
-        Top = 111
-        Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
-        Style.Color = clInfoBk
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 111
-        ExplicitWidth = 193
-        Width = 193
-      end
-      inherited bTiposIVA: TButton
-        Left = 312
-        Top = 111
-        OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 312
-        ExplicitTop = 111
-      end
-      inherited cbRecargoEquivalencia: TcxDBCheckBox
-        Top = 138
-        Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 138
-        ExplicitWidth = 331
-        Width = 331
-      end
-      inherited edtRetencion: TcxDBSpinEdit
-        Left = 572
-        Top = 184
+      inherited eImporteIVA2: TcxCurrencyEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 572
-        ExplicitTop = 184
+        ExplicitWidth = 300
+        Width = 300
       end
-      inherited edtImporteRetencion: TcxDBCurrencyEdit
-        Left = 643
-        Top = 184
+      inherited eIVA2: TcxTextEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 643
-        ExplicitTop = 184
-        ExplicitWidth = 180
-        Width = 180
       end
-      inherited edtFechaRetencion: TcxDBDateEdit
-        Top = 210
+      inherited eImporteIVA3: TcxCurrencyEdit
         Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 210
-        ExplicitWidth = 280
-        Width = 280
+        ExplicitWidth = 300
+        Width = 300
       end
-      inherited dxLayoutControl1Group_Root: TdxLayoutGroup
-        LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
-        inherited dxLayoutControl1Group1: TdxLayoutGroup
-          inherited dxLayoutControl1Group2: TdxLayoutGroup
-            inherited dxLayoutControl1Group7: TdxLayoutGroup
-              inherited dxLayoutControl1Item9: TdxLayoutItem
-                Visible = False
-              end
-            end
-            inherited dxLayoutControl1Item16: TdxLayoutItem
-              Visible = False
-            end
-            inherited dxLayoutControl1Item19: TdxLayoutItem
-              Visible = False
-            end
-          end
-          inherited dxLayoutControl1Group5: TdxLayoutGroup
-            inherited dxLayoutControl1Group3: TdxLayoutGroup
-              inherited dxLayoutControl1Item14: TdxLayoutItem
-                Offsets.Bottom = 3
-                Offsets.Top = 3
-              end
-              inherited dxLayoutControl1Group8: TdxLayoutGroup
-                Visible = False
-                inherited dxLayoutControl1Item7: TdxLayoutItem
-                  Visible = True
-                end
-              end
-              inherited dxLayoutControl1Item10: TdxLayoutItem
-                Visible = False
-              end
-            end
-          end
-        end
+      inherited eImporteIVA4: TcxCurrencyEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 300
+        Width = 300
+      end
+      inherited eIVA3: TcxTextEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited eIVA4: TcxTextEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited eTotalIVA: TcxDBCurrencyEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 358
+        Width = 358
       end
     end
   end
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas
index 49b85b4e..b980c771 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
@@ -8,19 +8,19 @@ uses
   JvAppRegistryStorage, JvComponent, JvFormPlacement, ImgList,
   PngImageList, StdActns, ActnList, ComCtrls, TBX, TB2Item, TB2Dock,
   TB2Toolbar, ExtCtrls, JvExControls, JvNavigationPane, 
-  uCustomView, uViewBase, uViewTotales,
+  uCustomView, uViewBase, uViewTotalesVariosIVA,
   StdCtrls, pngimage, AppEvnts, JvComponentBase,
   uBizFacturasProveedor, uIEditorFacturaProveedor, uFacturasProveedorController, uViewDetallesBase,
   dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uBizTiposIVA,
   uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController,
   uViewDetallesFacturaProveedor, uViewFacturaProveedor, uDAInterfaces,
   uViewDetallesGenerico, uViewPedidosFacturaProveedor, cxControls, cxContainer,
-  cxEdit, cxLabel;
+  cxEdit, cxLabel, uViewTotales;
 
 
 type
   TfEditorFacturaProveedor = class(TfEditorDBItem, IEditorFacturaProveedor)
-    frViewTotales1: TfrViewTotales;
+    frViewTotales1: TfrViewTotalesVariosIVA;
     frViewFacturaProveedor1: TfrViewFacturaProveedor;
     frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor;
     pagPedidos: TTabSheet;
@@ -41,16 +41,20 @@ type
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
+    procedure pagGeneralShow(Sender: TObject);
+    procedure pagContenidoShow(Sender: TObject);
 
   private
     procedure RecalcularPortePorUnidad;
+    procedure ActualizarListaIVAs;
 
   protected
     FController : IFacturasProveedorController;
+
     FFactura: IBizFacturaProveedor;
     FViewFactura: IViewFacturaProveedor;
-    FTiposIVAController : ITiposIVAController;
-    FTiposIVA: IBizTipoIVA;
+    //FTiposIVAController : ITiposIVAController;
+    //FTiposIVA: IBizTipoIVA;
     function GetController : IFacturasProveedorController;
     procedure SetController (const Value : IFacturasProveedorController);
     function GetFactura: IBizFacturaProveedor;
@@ -82,7 +86,7 @@ implementation
 uses
   cxDBEdit, uBizContactos, uDataModuleUsuarios, uFactuGES_App,
   uDetallesFacturaProveedorController, uDialogUtils, uDataTableUtils,
-  uGenerarAlbaranesProvFacProvUtils;
+  uGenerarAlbaranesProvFacProvUtils, uBizDetallesFacturaProveedor;
 
 
 { TfEditorFacturaProveedor }
@@ -90,12 +94,55 @@ uses
 {
 **************************** TfEditorFacturaProveedor ****************************
 }
+procedure TfEditorFacturaProveedor.ActualizarListaIVAs;
+var
+  ALista : TImporteIVADetallesArray;
+  I: Integer;
+begin
+  ALista := FController.DetallesController.CalcularTotalesIVA(FFactura.Detalles.DataTable);
+
+  frViewTotales1.eIVA1.Text := '';
+  frViewTotales1.eImporteIVA1.Text := '';
+  frViewTotales1.eIVA2.Text := '';
+  frViewTotales1.eImporteIVA2.Text := '';
+  frViewTotales1.eIVA3.Text := '';
+  frViewTotales1.eImporteIVA3.Text := '';
+  frViewTotales1.eIVA4.Text := '';
+  frViewTotales1.eImporteIVA4.Text := '';
+
+
+  if Length(ALista) > 0 then
+  begin
+    frViewTotales1.eIVA1.Text := Format('%n', [ALista[0].IVA]);
+    frViewTotales1.eImporteIVA1.Text := Format('%m', [ALista[0].ImporteIVA]);
+  end;
+
+  if Length(ALista) > 1 then
+  begin
+    frViewTotales1.eIVA2.Text := Format('%n', [ALista[1].IVA]);
+    frViewTotales1.eImporteIVA2.Text := Format('%m', [ALista[1].ImporteIVA]);
+  end;
+
+  if Length(ALista) > 2 then
+  begin
+    frViewTotales1.eIVA3.Text := Format('%n', [ALista[2].IVA]);
+    frViewTotales1.eImporteIVA3.Text := Format('%m', [ALista[2].ImporteIVA]);
+  end;
+
+  if Length(ALista) > 3 then
+  begin
+    frViewTotales1.eIVA4.Text := Format('%n', [ALista[3].IVA]);
+    frViewTotales1.eImporteIVA4.Text := Format('%m', [ALista[3].ImporteIVA]);
+  end;
+
+end;
+
 constructor TfEditorFacturaProveedor.Create(AOwner: TComponent);
 begin
   inherited;
   pgPaginas.ActivePageIndex := 0;
   ViewFacturaProveedor := frViewFacturaProveedor1;
-  FTiposIVAController := TTiposIVAController.Create;
+  //FTiposIVAController := TTiposIVAController.Create;
 end;
 
 procedure TfEditorFacturaProveedor.CustomEditorClose(Sender: TObject;
@@ -105,8 +152,8 @@ begin
   dsDataTable.DataTable := NIL;
   frViewTotales1.DADataSource.DataTable := NIL;
 
-  FTiposIVA := NIL;
-  FTiposIVAController := Nil;
+  //FTiposIVA := NIL;
+  //FTiposIVAController := Nil;
   FController := NIL;
   FViewFactura := NIL;
   Factura := NIL;
@@ -174,7 +221,7 @@ end;
 procedure TfEditorFacturaProveedor.frViewTotales1bTiposIVAClick(Sender: TObject);
 begin
   inherited;
-  FTiposIVAController.VerTodos(FTiposIVA);
+  //FTiposIVAController.VerTodos(FTiposIVA);
 end;
 
 procedure TfEditorFacturaProveedor.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
@@ -200,8 +247,8 @@ procedure TfEditorFacturaProveedor.frViewTotales1eIVAPropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  Factura.Edit;
-  Factura.ID_TIPO_IVA := FTiposIVA.ID; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).ID;
+  //Factura.Edit;
+  //Factura.ID_TIPO_IVA := FTiposIVA.ID; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).ID;
 end;
 
 procedure TfEditorFacturaProveedor.frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
@@ -291,7 +338,10 @@ begin
      FFactura.DataTable.Edit;
 
   // Actualizar IVA y RE a partir del tipo de IVA del proveedor.
-  Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
+
+  //Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
+
+
 //  if FFactura.Proveedor.RECARGO_EQUIVALENCIA = 1 then
 //    Factura.RE := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).RE
 //  else
@@ -309,6 +359,19 @@ begin
 //  end;
 end;
 
+procedure TfEditorFacturaProveedor.pagContenidoShow(Sender: TObject);
+begin
+  inherited;
+  frViewTotales1.Visible := False;
+end;
+
+procedure TfEditorFacturaProveedor.pagGeneralShow(Sender: TObject);
+begin
+  inherited;
+  frViewTotales1.Visible := True;
+  ActualizarListaIVAs();
+end;
+
 procedure TfEditorFacturaProveedor.pgPaginasChanging(Sender: TObject;
   var AllowChange: Boolean);
 var
@@ -388,9 +451,9 @@ begin
 
     frViewTotales1.DADataSource.DataTable := FFactura.DataTable;
 
-    FTiposIVA := FTiposIVAController.BuscarTodos;
+    {FTiposIVA := FTiposIVAController.BuscarTodos;
     frViewTotales1.dsTiposIVA.DataTable := FTiposIVA.DataTable;
-    FTiposIVA.DataTable.Active := True;
+    FTiposIVA.DataTable.Active := True;}
 
     if Assigned(FViewFactura) then
     begin
@@ -401,6 +464,8 @@ begin
       frViewPedidosFacturaProveedor1.Pedidos := FFactura.Pedidos;
       frViewDetallesFacturaProveedor1.Detalles := FFactura.Detalles;
       frViewDetallesFacturaProveedor1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el proveedor seleccionado
+
+      ActualizarListaIVAs;
     end;
   end
   else begin
@@ -408,7 +473,7 @@ begin
     frViewFacturaProveedor1.frViewProveedorFactura.Proveedor := NIL;
     dsDataTable.DataTable := NIL;
     frViewTotales1.DADataSource.DataTable := NIL;
-    frViewTotales1.dsTiposIVA.DataTable := NIL;
+    //frViewTotales1.dsTiposIVA.DataTable := NIL;
   end
 end;
 
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
index 9823a73d..48c45a67 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm	
@@ -1,43 +1,29 @@
 inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
-    inherited FontName: TJvFontComboBox [4]
-      Left = 56
+    Height = 100
+    ExplicitHeight = 100
+    inherited ToolButton14: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton9: TToolButton [5]
+      Left = 121
       Top = 22
-      ExplicitLeft = 56
+      ExplicitLeft = 121
       ExplicitTop = 22
     end
-    inherited ToolButton14: TToolButton [5]
-      Left = 201
-      Wrap = False
-      ExplicitLeft = 201
-    end
-    inherited FontSize: TEdit
+    inherited FontName: TJvFontComboBox [6]
       Left = 266
       Top = 22
       ExplicitLeft = 266
       ExplicitTop = 22
     end
     inherited UpDown1: TUpDown
-      Left = 308
+      Left = 411
       Top = 22
-      ExplicitLeft = 308
+      ExplicitLeft = 411
       ExplicitTop = 22
     end
     inherited ToolButton13: TToolButton
-      Left = 325
-      Top = 22
-      ExplicitLeft = 325
-      ExplicitTop = 22
-    end
-    inherited ToolButton11: TToolButton [9]
-      Left = 333
-      Top = 22
-      ExplicitLeft = 333
-      ExplicitTop = 22
-    end
-    inherited ToolButton12: TToolButton [10]
       Left = 0
       Top = 22
       Wrap = True
@@ -45,42 +31,58 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
       ExplicitTop = 22
       ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton [11]
+    inherited ToolButton6: TToolButton
       Left = 0
       Top = 49
       ExplicitLeft = 0
       ExplicitTop = 49
     end
-    inherited ToolButton10: TToolButton [12]
-      Left = 145
+    inherited FontSize: TEdit [10]
+      Left = 66
       Top = 49
-      ExplicitLeft = 145
+      Width = 58
+      ExplicitLeft = 66
+      ExplicitTop = 49
+      ExplicitWidth = 58
+    end
+    inherited ToolButton7: TToolButton [11]
+      Left = 124
+      Top = 49
+      ExplicitLeft = 124
       ExplicitTop = 49
     end
-    inherited ToolButton6: TToolButton [13]
-      Left = 270
+    inherited ToolButton11: TToolButton [12]
+      Left = 191
       Top = 49
-      ExplicitLeft = 270
+      ExplicitLeft = 191
       ExplicitTop = 49
     end
-    inherited ToolButton7: TToolButton [14]
-      Left = 336
+    inherited ToolButton12: TToolButton [13]
+      Left = 0
       Top = 49
       Wrap = True
-      ExplicitLeft = 336
+      ExplicitLeft = 0
       ExplicitTop = 49
+      ExplicitHeight = 27
+    end
+    inherited ToolButton10: TToolButton
+      Left = 0
+      Top = 76
+      ExplicitLeft = 0
+      ExplicitTop = 76
     end
     inherited ToolButton8: TToolButton [15]
-      Left = 0
-      Top = 71
-      ExplicitLeft = 0
-      ExplicitTop = 71
+      Left = 125
+      Top = 76
+      ExplicitLeft = 125
+      ExplicitTop = 76
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
-    Height = 183
-    ExplicitHeight = 210
+    Top = 126
+    Height = 178
+    ExplicitTop = 99
+    ExplicitHeight = 205
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewREFERENCIA: TcxGridDBColumn
         Properties.Buttons = <
@@ -92,6 +94,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
         Properties.ReadOnly = True
         Properties.OnButtonClick = nil
         Options.Editing = False
+        Width = 39
       end
       inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
         Properties.Buttons = <
@@ -117,20 +120,75 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
         Visible = False
         Options.Editing = False
       end
+      inherited cxGridViewDESCRIPCION: TcxGridDBColumn
+        Width = 176
+      end
+      inherited cxGridViewCANTIDAD: TcxGridDBColumn
+        Width = 64
+      end
+      inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
+        Width = 56
+      end
       inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
         VisibleForCustomization = False
+        Width = 71
       end
       inherited cxGridViewDESCUENTO: TcxGridDBColumn
         Visible = True
+        Width = 34
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
         Caption = 'Importe coste'
         Visible = True
+        Width = 65
+      end
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [14]
+        Width = 61
+      end
+      inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [15]
+        Width = 70
+      end
+      object cxGridViewID_TIPO_IVA: TcxGridDBColumn
+        Caption = 'IVA/IGIC'
+        DataBinding.FieldName = 'ID_TIPO_IVA'
+        PropertiesClassName = 'TcxLookupComboBoxProperties'
+        Properties.Alignment.Horz = taRightJustify
+        Properties.DropDownListStyle = lsFixedList
+        Properties.GridMode = True
+        Properties.ImmediatePost = True
+        Properties.KeyFieldNames = 'ID'
+        Properties.ListColumns = <
+          item
+            Fixed = True
+            SortOrder = soAscending
+            FieldName = 'REFERENCIA'
+          end>
+        Properties.ListOptions.GridLines = glNone
+        Properties.ListOptions.ShowHeader = False
+        Properties.ListSource = dsTiposIVADetalles
+        Properties.PostPopupValueOnTab = True
+        Properties.OnEditValueChanged = cxGridViewID_TIPO_IVAPropertiesEditValueChanged
+        HeaderAlignmentHorz = taRightJustify
+        Width = 51
+      end
+      object cxGridViewIVA: TcxGridDBColumn
+        DataBinding.FieldName = 'IVA'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Options.Editing = False
+      end
+      object cxGridViewIMPORTE_IVA: TcxGridDBColumn
+        DataBinding.FieldName = 'IMPORTE_IVA'
+        Options.Editing = False
+        Width = 63
       end
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
+    Top = 100
     ExplicitTop = 68
   end
+  object dsTiposIVADetalles: TDADataSource
+    Left = 8
+    Top = 200
+  end
 end
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
index 6b67cddb..1279f140 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas	
@@ -12,9 +12,9 @@ uses
   Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns,
   JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
   uArticulosController, uViewDetallesArticulos, uBizFacturasProveedor,
-  uDAInterfaces, cxButtonEdit, cxDropDownEdit,  
-  Menus, cxGridCustomPopupMenu,
-  cxGridPopupMenu, cxEditRepositoryItems;
+  uDAInterfaces, cxButtonEdit, cxDropDownEdit, uBizTiposIVA,
+  Menus, cxGridCustomPopupMenu, uTiposIVAController,                              
+  cxGridPopupMenu, cxEditRepositoryItems, cxDBLookupComboBox;
 
 type
   IViewDetallesFacturaProveedor = interface(IViewDetallesArticulos)
@@ -25,8 +25,17 @@ type
   end;
 
   TfrViewDetallesFacturaProveedor = class(TfrViewDetallesArticulos, IViewDetallesFacturaProveedor)
+    cxGridViewIVA: TcxGridDBColumn;
+    cxGridViewIMPORTE_IVA: TcxGridDBColumn;
+    cxGridViewID_TIPO_IVA: TcxGridDBColumn;
+    dsTiposIVADetalles: TDADataSource;
+    procedure cxGridViewID_TIPO_IVAPropertiesEditValueChanged(Sender: TObject);
+    procedure actAnadirExecute(Sender: TObject);
   protected
     FFactura: IBizFacturaProveedor;
+    FTiposIVAController : ITiposIVAController;
+    FTiposIVA: IBizTipoIVA;
+
     function GetFactura: IBizFacturaProveedor;
     procedure SetFactura(const Value: IBizFacturaProveedor);
 
@@ -34,17 +43,44 @@ type
     procedure RellenarArticulosInterno; override;
     function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; override;
 
+    function HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean; override;
   public
     property Factura: IBizFacturaProveedor read GetFactura write SetFactura;
+    destructor Destroy; override;
+    constructor Create(AOwner: TComponent); override;
   end;
 
 implementation
 {$R *.dfm}
 
-uses uDetallesFacturaProveedorController;
+uses
+  uDetallesFacturaProveedorController, uFactuGES_App;
 
 { TfrViewDetallesFacturaProveedor }
 
+procedure TfrViewDetallesFacturaProveedor.actAnadirExecute(Sender: TObject);
+begin
+  inherited;
+
+  ShowHourglassCursor;
+  _FocusedView.BeginUpdate;
+  try
+    if _FocusedView.Controller.EditingController.IsEditing then
+       _FocusedView.Controller.EditingController.Edit.PostEditValue;
+
+    if not VarIsNull(FFactura.Proveedor.ID_TIPO_IVA) then begin
+      cxGridViewID_TIPO_IVA.EditValue := FFactura.Proveedor.ID_TIPO_IVA;
+    end
+    else
+      cxGridViewID_TIPO_IVA.EditValue := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
+    cxGridViewIVA.EditValue := FTiposIVA.IVA;
+  finally
+    _FocusedView.EndUpdate;
+    HideHourglassCursor;
+  end;
+
+end;
+
 function TfrViewDetallesFacturaProveedor.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
 begin
   if (Factura.TIPO = CTE_TIPO_ABONO) then
@@ -61,11 +97,48 @@ begin
     (Controller as IDetallesFacturaProveedorController).AnadirArticulos(Detalles, Factura.Proveedor);
 end;
 
+constructor TfrViewDetallesFacturaProveedor.Create(AOwner: TComponent);
+begin
+  inherited;
+  FTiposIVAController := TTiposIVAController.Create;
+end;
+
+procedure TfrViewDetallesFacturaProveedor.cxGridViewID_TIPO_IVAPropertiesEditValueChanged(
+  Sender: TObject);
+begin
+  inherited;
+
+  ShowHourglassCursor;
+  _FocusedView.BeginUpdate;
+  try
+    cxGridViewIVA.EditValue := FTiposIVA.IVA;
+    Controller.ActualizarTotales(Detalles);
+  finally
+    _FocusedView.EndUpdate;
+    HideHourglassCursor;
+  end;
+end;
+
+destructor TfrViewDetallesFacturaProveedor.Destroy;
+begin
+  FTiposIVA := NIL;
+  FTiposIVAController := Nil;
+  inherited;
+end;
+
 function TfrViewDetallesFacturaProveedor.GetFactura: IBizFacturaProveedor;
 begin
   Result := FFactura;
 end;
 
+function TfrViewDetallesFacturaProveedor.HayQueRecalcular(
+  AItem: TcxCustomGridTableItem): Boolean;
+begin
+  Result := inherited HayQueRecalcular(AItem);
+  if not Result then
+    Result := (AItem = cxGridViewID_TIPO_IVA);
+end;
+
 procedure TfrViewDetallesFacturaProveedor.RellenarArticulosInterno;
 begin
   if (Factura.TIPO = CTE_TIPO_ABONO) then
@@ -77,6 +150,15 @@ end;
 procedure TfrViewDetallesFacturaProveedor.SetFactura(const Value: IBizFacturaProveedor);
 begin
   FFactura := Value;
+  if Assigned(FFactura) then
+  begin
+    FTiposIVA := FTiposIVAController.BuscarTodos;
+    dsTiposIVADetalles.DataTable := FTiposIVA.DataTable;
+    FTiposIVA.DataTable.Active := True;
+  end
+  else begin
+    dsTiposIVADetalles.DataTable := NIL;
+  end
 end;
 
 end.
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
index 82866e50..590cac99 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm	
@@ -130,6 +130,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
         Visible = False
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
       end
       object cxGridViewIMPORTE_IVA: TcxGridDBColumn
         DataBinding.FieldName = 'IMPORTE_IVA'
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm
new file mode 100644
index 00000000..98d3984e
--- /dev/null
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm	
@@ -0,0 +1,863 @@
+inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA
+  Width = 451
+  Height = 275
+  Align = alBottom
+  ExplicitWidth = 451
+  ExplicitHeight = 275
+  object Bevel5: TBevel
+    Left = 666
+    Top = 109
+    Width = 108
+    Height = 9
+    Shape = bsBottomLine
+  end
+  object dxLayoutControl1: TdxLayoutControl
+    AlignWithMargins = True
+    Left = 0
+    Top = 0
+    Width = 451
+    Height = 275
+    Margins.Left = 0
+    Margins.Top = 0
+    Margins.Right = 0
+    Margins.Bottom = 0
+    Align = alClient
+    ParentBackground = True
+    TabOrder = 0
+    TabStop = False
+    AutoContentSizes = [acsWidth, acsHeight]
+    object Bevel3: TBevel
+      Left = 236
+      Top = 28
+      Width = 3
+      Height = 100
+      Shape = bsRightLine
+    end
+    object Bevel1: TBevel
+      Left = 348
+      Top = 181
+      Width = 368
+      Height = 9
+      Shape = bsBottomLine
+    end
+    object Bevel2: TBevel
+      Left = 348
+      Top = 107
+      Width = 368
+      Height = 9
+      Shape = bsBottomLine
+    end
+    object Bevel4: TBevel
+      Left = 22
+      Top = 136
+      Width = 388
+      Height = 9
+      Shape = bsBottomLine
+    end
+    object ImporteDto: TcxDBCurrencyEdit
+      Left = 419
+      Top = 55
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_DESCUENTO'
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 11
+      Height = 21
+      Width = 290
+    end
+    object eImporteIVA1: TcxCurrencyEdit
+      Left = 200
+      Top = 28
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 1
+      Height = 21
+      Width = 234
+    end
+    object ImporteTotal: TcxDBCurrencyEdit
+      Left = 349
+      Top = 201
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_TOTAL'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -12
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clActiveCaption
+      Style.TextStyle = [fsBold]
+      Style.IsFontAssigned = True
+      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 = 15
+      Height = 21
+      Width = 90
+    end
+    object edtDescuento: TcxDBSpinEdit
+      Left = 348
+      Top = 55
+      AutoSize = False
+      DataBinding.DataField = 'DESCUENTO'
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.ImmediatePost = True
+      Properties.MaxValue = 100.000000000000000000
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.ButtonStyle = bts3D
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 10
+      Height = 21
+      Width = 65
+    end
+    object ImporteBase: TcxDBCurrencyEdit
+      Left = 348
+      Top = 127
+      AutoSize = False
+      DataBinding.DataField = 'BASE_IMPONIBLE'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = [fsBold]
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 12
+      Height = 21
+      Width = 284
+    end
+    object edtRE: TcxDBSpinEdit
+      Left = 348
+      Top = 154
+      AutoSize = False
+      DataBinding.DataField = 'RE'
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.AssignedValues.EditFormat = True
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.ImmediatePost = True
+      Properties.MaxValue = 100.000000000000000000
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.ButtonStyle = bts3D
+      Style.IsFontAssigned = True
+      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 = 13
+      Height = 21
+      Width = 65
+    end
+    object ImporteRE: TcxDBCurrencyEdit
+      Left = 419
+      Top = 154
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_RE'
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 14
+      Height = 21
+      Width = 20
+    end
+    object eImporteNeto: TcxDBCurrencyEdit
+      Left = 348
+      Top = 28
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_NETO'
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = [fsBold]
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 9
+      Height = 21
+      Width = 297
+    end
+    object eIVA1: TcxTextEdit
+      Left = 129
+      Top = 28
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 0
+      Height = 21
+      Width = 65
+    end
+    object eImporteIVA2: TcxCurrencyEdit
+      Left = 200
+      Top = 55
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 3
+      Height = 21
+      Width = 300
+    end
+    object eIVA2: TcxTextEdit
+      Left = 129
+      Top = 55
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 2
+      Height = 21
+      Width = 65
+    end
+    object eImporteIVA3: TcxCurrencyEdit
+      Left = 200
+      Top = 82
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 5
+      Height = 21
+      Width = 300
+    end
+    object eImporteIVA4: TcxCurrencyEdit
+      Left = 200
+      Top = 109
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = False
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 7
+      Height = 21
+      Width = 300
+    end
+    object eIVA3: TcxTextEdit
+      Left = 129
+      Top = 82
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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
+      Height = 21
+      Width = 65
+    end
+    object eIVA4: TcxTextEdit
+      Left = 129
+      Top = 109
+      AutoSize = False
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 6
+      Height = 21
+      Width = 65
+    end
+    object eTotalIVA: TcxDBCurrencyEdit
+      Left = 129
+      Top = 151
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_IVA'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      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 = 8
+      Height = 21
+      Width = 358
+    end
+    object dxLayoutControl1Group_Root: TdxLayoutGroup
+      ShowCaption = False
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Group1: TdxLayoutGroup
+        AutoAligns = [aaHorizontal]
+        Caption = 'Importes totales'
+        LayoutDirection = ldHorizontal
+        object dxLayoutControl1Group2: TdxLayoutGroup
+          AutoAligns = [aaVertical]
+          AlignHorz = ahClient
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Group9: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControlIVA1: TdxLayoutItem
+              Caption = 'IVA 1:'
+              Control = eIVA1
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item2: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Importe de IVA:'
+              ShowCaption = False
+              Control = eImporteIVA1
+              ControlOptions.ShowBorder = False
+            end
+          end
+          object dxLayoutControl1Group12: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            ShowBorder = False
+            object dxLayoutControl1Group14: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControlIVA2: TdxLayoutItem
+                Caption = 'IVA 2:'
+                Control = eIVA2
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item9: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Control = eImporteIVA2
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dxLayoutControl1Group13: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              ShowBorder = False
+              object dxLayoutControl1Group15: TdxLayoutGroup
+                ShowCaption = False
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControlIVA3: TdxLayoutItem
+                  Caption = 'IVA 3:'
+                  Control = eIVA3
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControl1Item15: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Control = eImporteIVA3
+                  ControlOptions.ShowBorder = False
+                end
+              end
+              object dxLayoutControl1Group16: TdxLayoutGroup
+                ShowCaption = False
+                Hidden = True
+                ShowBorder = False
+                object dxLayoutControl1Group10: TdxLayoutGroup
+                  ShowCaption = False
+                  Hidden = True
+                  LayoutDirection = ldHorizontal
+                  ShowBorder = False
+                  object dxLayoutControlIVA4: TdxLayoutItem
+                    Caption = 'IVA 4:'
+                    Control = eIVA4
+                    ControlOptions.ShowBorder = False
+                  end
+                  object dxLayoutControl1Item20: TdxLayoutItem
+                    AutoAligns = [aaVertical]
+                    AlignHorz = ahClient
+                    Control = eImporteIVA4
+                    ControlOptions.ShowBorder = False
+                  end
+                end
+                object dxLayoutControl1Item11: TdxLayoutItem
+                  Control = Bevel4
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControl1Item5: TdxLayoutItem
+                  Caption = 'Importe total de IVA:'
+                  Control = eTotalIVA
+                  ControlOptions.ShowBorder = False
+                end
+              end
+            end
+          end
+        end
+        object dxLayoutControl1Group5: TdxLayoutGroup
+          AutoAligns = [aaVertical]
+          AlignHorz = ahClient
+          ShowCaption = False
+          Hidden = True
+          LayoutDirection = ldHorizontal
+          ShowBorder = False
+          object dxLayoutControl1Item13: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
+            AlignVert = avClient
+            Caption = ' '
+            Offsets.Left = 10
+            Offsets.Right = 10
+            ShowCaption = False
+            Control = Bevel3
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Group3: TdxLayoutGroup
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            ShowCaption = False
+            Hidden = True
+            ShowBorder = False
+            object dxLayoutControl1Item8: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Importe neto:'
+              Control = eImporteNeto
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Group7: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControl1Item4: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                Caption = 'Descuento (%):'
+                Control = edtDescuento
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item1: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = 'Importe de dto:'
+                ShowCaption = False
+                Control = ImporteDto
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dxLayoutControl1Item19: TdxLayoutItem
+              Caption = ' '
+              Offsets.Top = 25
+              Control = Bevel2
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item12: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Base imponible:'
+              Control = ImporteBase
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Group8: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              ShowBorder = False
+              object dxLayoutControl1Group6: TdxLayoutGroup
+                ShowCaption = False
+                Visible = False
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControl1Item6: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  Caption = 'RE (%):'
+                  Control = edtRE
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControl1Item7: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Importe de RE:'
+                  ShowCaption = False
+                  Visible = False
+                  Control = ImporteRE
+                  ControlOptions.ShowBorder = False
+                end
+              end
+              object dxLayoutControl1Item10: TdxLayoutItem
+                Caption = ' '
+                Control = Bevel1
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dxLayoutControl1Item3: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Importe total:'
+              LookAndFeel = LookAndFeelIMPORTE_TOTAL
+              Control = ImporteTotal
+              ControlOptions.ShowBorder = False
+            end
+          end
+        end
+      end
+    end
+    object dxLayoutControl1Group4: TdxLayoutGroup
+    end
+  end
+  object DADataSource: TDADataSource
+    Left = 8
+    Top = 8
+  end
+  object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
+    Left = 40
+    Top = 8
+    object LookAndFeelIMPORTE_TOTAL: TdxLayoutStandardLookAndFeel
+      ItemOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET
+      ItemOptions.CaptionOptions.Font.Color = clWindowText
+      ItemOptions.CaptionOptions.Font.Height = -12
+      ItemOptions.CaptionOptions.Font.Name = 'Tahoma'
+      ItemOptions.CaptionOptions.Font.Style = [fsBold]
+      ItemOptions.CaptionOptions.UseDefaultFont = False
+    end
+  end
+end
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas
new file mode 100644
index 00000000..998f9347
--- /dev/null
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas	
@@ -0,0 +1,85 @@
+unit uViewTotalesVariosIVA;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uViewBase, ExtCtrls, StdCtrls, DB, uDADataTable, cxGraphics,
+  cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls,
+  cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit,
+  ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
+  cxDBLookupComboBox, cxCheckBox, uDAInterfaces, cxCalendar;
+
+type
+  TfrViewTotalesVariosIVA = class(TfrViewBase)
+    DADataSource: TDADataSource;
+    ImporteBase: TcxDBCurrencyEdit;
+    ImporteDto: TcxDBCurrencyEdit;
+    eImporteIVA1: TcxCurrencyEdit;
+    ImporteTotal: TcxDBCurrencyEdit;
+    edtDescuento: TcxDBSpinEdit;
+    dxLayoutControl1Group_Root: TdxLayoutGroup;
+    dxLayoutControl1: TdxLayoutControl;
+    dxLayoutControl1Item1: TdxLayoutItem;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    dxLayoutControl1Item12: TdxLayoutItem;
+    dxLayoutControl1Group1: TdxLayoutGroup;
+    dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Group5: TdxLayoutGroup;
+    dxLayoutControl1Item6: TdxLayoutItem;
+    edtRE: TcxDBSpinEdit;
+    dxLayoutControl1Item7: TdxLayoutItem;
+    ImporteRE: TcxDBCurrencyEdit;
+    dxLayoutControl1Item8: TdxLayoutItem;
+    eImporteNeto: TcxDBCurrencyEdit;
+    dxLayoutControl1Group2: TdxLayoutGroup;
+    dxLayoutControl1Group7: TdxLayoutGroup;
+    Bevel3: TBevel;
+    dxLayoutControl1Item13: TdxLayoutItem;
+    dxLayoutControl1Group3: TdxLayoutGroup;
+    dxLayoutControl1Group8: TdxLayoutGroup;
+    dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
+    LookAndFeelIMPORTE_TOTAL: TdxLayoutStandardLookAndFeel;
+    Bevel5: TBevel;
+    dxLayoutControl1Item10: TdxLayoutItem;
+    Bevel1: TBevel;
+    dxLayoutControl1Item19: TdxLayoutItem;
+    Bevel2: TBevel;
+    dxLayoutControl1Group6: TdxLayoutGroup;
+    dxLayoutControlIVA1: TdxLayoutItem;
+    eIVA1: TcxTextEdit;
+    dxLayoutControl1Group9: TdxLayoutGroup;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    eImporteIVA2: TcxCurrencyEdit;
+    dxLayoutControlIVA2: TdxLayoutItem;
+    eIVA2: TcxTextEdit;
+    dxLayoutControl1Item15: TdxLayoutItem;
+    eImporteIVA3: TcxCurrencyEdit;
+    dxLayoutControl1Item20: TdxLayoutItem;
+    eImporteIVA4: TcxCurrencyEdit;
+    dxLayoutControlIVA3: TdxLayoutItem;
+    eIVA3: TcxTextEdit;
+    dxLayoutControl1Group12: TdxLayoutGroup;
+    dxLayoutControl1Group13: TdxLayoutGroup;
+    dxLayoutControl1Group14: TdxLayoutGroup;
+    dxLayoutControl1Group15: TdxLayoutGroup;
+    dxLayoutControlIVA4: TdxLayoutItem;
+    eIVA4: TcxTextEdit;
+    dxLayoutControl1Group16: TdxLayoutGroup;
+    dxLayoutControl1Item5: TdxLayoutItem;
+    eTotalIVA: TcxDBCurrencyEdit;
+    dxLayoutControl1Group10: TdxLayoutGroup;
+    dxLayoutControl1Item11: TdxLayoutItem;
+    Bevel4: TBevel;
+  public
+    { Public declarations }
+  end;
+
+
+implementation
+
+{$R *.dfm}
+
+end.
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index d1246e82a202c9050df20dfef03652b63996912e..e6f6e02aceffc8c7c3560acae6da09560b781c3f 100644
GIT binary patch
delta 79
zcmZ3pm2m?Q-HBk_GWl+VJdpew5zQzxIWkh2@!jOw$ZF;y2F=O8BTYrk7!(*%7*c^`
e9z#Au8AB$JojchvN}An(!HU6z!D4c9lqUd}O&IC`

delta 97
zcmdn6m2u5h#tnBO7&lD58zB!Q|3*YJ@=cD6RAziNxi+$zIgdeo^6yAfV<QFyh7^WW
pAeqmQ%uvEm%8<lR1m;6TjTj6V3>l1p@`emX3|2tWd~$k}CjdSH8YTb$

diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 45216db6..98faa8b1 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -132,10 +132,10 @@ uses
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
   schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
-  schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
-  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
+  schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
+  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 8bff1375..35fca7b8 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
+MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
 FILEVERSION 2,0,2,0
 PRODUCTVERSION 2,0,2,0
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "2.0.2.0\0"
               VALUE "ProductVersion", "2.0.2.0\0"
-              VALUE "CompileDate", "miércoles, 02 de octubre de 2013 12:17\0"
+              VALUE "CompileDate", "miércoles, 06 de noviembre de 2013 10:48\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/uDataModuleServer.dfm b/Source/Servidor/uDataModuleServer.dfm
index ca1b8af1..d9712599 100644
--- a/Source/Servidor/uDataModuleServer.dfm
+++ b/Source/Servidor/uDataModuleServer.dfm
@@ -40,8 +40,8 @@ object dmServer: TdmServer
         Name = 'IBX'
         ConnectionString = 
           'IBX?Server=localhost;Database=C:\Codigo Tecsitel\Output\Debug\Da' +
-          'tabase\FACTUGES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;C' +
-          'harset=ISO8859_1;'
+          'tabase\FACTUGES2.FDB;UserID=sysdba;Password=masterkey;Dialect=3;' +
+          'Charset=ISO8859_1;'
         ConnectionType = 'Interbase'
         Default = True
       end>