From f1ae52395aacb2b2ae686d206b646d24387d9746 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Fri, 15 Jan 2010 08:27:38 +0000
Subject: [PATCH] Primera adaptacion de recibos de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@13 f33bb606-9f5c-448d-9c99-757f00063c96
---
 Database/scripts/factuges.sql                 |   17 +-
 Source/Cliente/FactuGES.drc                   |    2 +-
 Source/Cliente/FactuGES.identcache            |  Bin 721 -> 721 bytes
 Source/GUIBase/GUIBase.drc                    |    2 +-
 Source/GUIBase/GUIBase.identcache             |  Bin 1701 -> 1701 bytes
 Source/GUIBase/uViewTotales.dfm               |  205 +---
 Source/GUIBase/uViewTotales.pas               |   11 -
 .../AlbaranesCliente_Group.groupproj          |   16 +-
 .../AlbaranesCliente_controller.drc           |    2 +-
 .../uDetallesAlbaranClienteController.pas     |    3 +-
 .../Data/AlbaranesCliente_data.drc            |    2 +-
 .../Data/uDataModuleAlbaranesCliente.dfm      |    5 +
 .../Model/AlbaranesCliente_model.drc          |    2 +-
 .../Model/schAlbaranesClienteClient_Intf.pas  |   51 +-
 .../Model/schAlbaranesClienteServer_Intf.pas  |   59 +-
 .../Plugin/AlbaranesCliente_plugin.drc        |    2 +-
 .../Servidor/srvAlbaranesCliente_Impl.dfm     |   47 +-
 .../Views/AlbaranesCliente_view.drc           |    2 +-
 .../Views/uEditorAlbaranCliente.dfm           |  138 ++-
 .../Views/uEditorAlbaranCliente.pas           |    3 +
 .../Views/uViewAlbaranCliente.dfm             |  280 +++--
 .../Views/uViewAlbaranCliente.pas             |   90 +-
 .../Views/uViewAlbaranesCliente.dfm           |   10 +-
 .../Views/uViewAlbaranesCliente.pas           |    2 +-
 .../uViewDatosYSeleccionClienteAlbaran.dfm    |   28 +-
 .../uViewDatosYSeleccionClienteAlbaran.pas    |   14 +-
 .../Views/uViewDetallesAlbaranCliente.dfm     |   72 +-
 .../Views/uViewTotalesAlbaran.dfm             |  172 +--
 .../AlbaranesProveedor_controller.drc         |    2 +-
 .../Data/AlbaranesProveedor_data.drc          |    2 +-
 .../Model/AlbaranesProveedor_model.drc        |    2 +-
 .../Plugin/AlbaranesProveedor_plugin.drc      |    2 +-
 .../Views/AlbaranesProveedor_view.drc         |    2 +-
 .../Controller/Contactos_controller.drc       |    2 +-
 .../Modulos/Contactos/Data/Contactos_data.drc |    2 +-
 .../Contactos/Data/uDataModuleClientes.dfm    |    4 +
 .../Contactos/Model/Contactos_model.drc       |    2 +-
 .../Model/schContactosClient_Intf.pas         |  125 +-
 .../Model/schContactosServer_Intf.pas         |  103 +-
 .../Contactos/Model/uBizClientesServer.pas    |   10 +-
 .../Contactos/Plugin/Contactos_plugin.drc     |    2 +-
 .../Contactos/Servidor/srvContactos_Impl.dfm  |   35 +-
 .../Contactos/Views/Contactos_view.dproj      |  114 +-
 .../Contactos/Views/Contactos_view.drc        |    2 +-
 .../Contactos/Views/uEditorCliente.dfm        |   20 +-
 .../Views/uViewClienteDatosComerciales.dfm    |   90 +-
 .../Views/uViewClienteDatosComerciales.pas    |   24 +-
 .../Fabricantes/Data/Fabricantes_data.drc     |    2 +-
 .../Fabricantes/Model/Fabricantes_model.drc   |    2 +-
 .../uDetallesFacturaClienteController.pas     |    2 +-
 .../Data/FacturasCliente_data.drc             |    4 +-
 .../Data/uDataModuleFacturasCliente.dfm       |    4 +-
 .../Model/FacturasCliente_model.drc           |    2 +-
 .../Model/FacturasCliente_model.identcache    |  Bin 639 -> 639 bytes
 .../Model/schFacturasClienteClient_Intf.pas   |   64 +-
 .../Model/schFacturasClienteServer_Intf.pas   |   60 +-
 .../Model/uBizFacturasCliente.pas             |   29 +-
 .../Plugin/FacturasCliente_plugin.drc         |    2 +-
 .../Servidor/srvFacturasCliente_Impl.dfm      |   49 +-
 .../Views/FacturasCliente_view.drc            |    2 +-
 .../uEditorElegirArticulosFacturaCliente.dfm  |   48 +-
 .../Views/uEditorFacturaCliente.dfm           |  450 +++-----
 .../Views/uEditorFacturaCliente.pas           |   22 +-
 .../Views/uEditorFacturasCliente.dfm          |   21 +-
 ...ewDatosYSeleccionClienteFacturaCliente.dfm |  140 ++-
 ...ewDatosYSeleccionClienteFacturaCliente.pas |   23 +-
 .../Views/uViewDetallesFacturaCliente.dfm     |  104 +-
 .../Views/uViewFacturaCliente.dfm             |  151 +--
 .../Views/uViewFacturaCliente.pas             |   43 -
 .../Views/uViewFacturasCliente.dfm            |   15 -
 .../Views/uViewFacturasCliente.pas            |    2 -
 .../Views/uViewTotalesFactura.dfm             |  223 +++-
 .../Views/uViewTotalesFactura.pas             |    5 +
 .../FacturasProveedor_controller.drc          |    2 +-
 .../Data/FacturasProveedor_data.drc           |    2 +-
 .../Model/FacturasProveedor_model.drc         |    2 +-
 .../Plugin/FacturasProveedor_plugin.drc       |    2 +-
 .../GestorDocumentos_controller.drc           |    2 +-
 .../Data/GestorDocumentos_data.drc            |    2 +-
 .../PedidosProveedor_controller.drc           |    2 +-
 .../Data/PedidosProveedor_data.drc            |    2 +-
 .../Model/PedidosProveedor_model.drc          |    2 +-
 .../Plugin/PedidosProveedor_plugin.drc        |    2 +-
 .../Views/PedidosProveedor_view.drc           |    2 +-
 .../PresupuestosCliente_controller.drc        |    2 +-
 .../Data/PresupuestosCliente_data.drc         |    2 +-
 .../Model/PresupuestosCliente_model.drc       |    2 +-
 .../Plugin/PresupuestosCliente_plugin.drc     |    2 +-
 .../Views/PresupuestosCliente_view.drc        |    2 +-
 .../Data/RecibosCliente_data.drc              |    2 +-
 .../Plugin/RecibosCliente_plugin.drc          |    2 +-
 .../Views/uEditorReciboCliente.dfm            |   21 +
 .../Views/uEditorRecibosCliente.dfm           |   32 -
 .../Views/uViewReciboCliente.dfm              |  244 ++--
 .../Views/uViewReciboCliente.pas              |    1 +
 .../Views/uViewRecibosCliente.dfm             |    6 +
 .../Views/uViewRecibosCliente.pas             |    2 +
 .../Data/RecibosProveedor_data.drc            |    2 +-
 .../Plugin/RecibosProveedor_plugin.drc        |    2 +-
 .../uGenerarFacturasCliAlbCliUtils.pas        |    2 +-
 .../Tipos de IVA/Data/TiposIVA_data.drc       |    2 +-
 .../Tipos de IVA/Model/TiposIVA_model.drc     |    2 +-
 .../Data/UnidadesMedida_data.drc              |    2 +-
 .../Model/UnidadesMedida_model.drc            |    2 +-
 Source/Servidor/FactuGES_Server.RES           |  Bin 23208 -> 23200 bytes
 Source/Servidor/FactuGES_Server.dpr           |    3 +-
 Source/Servidor/FactuGES_Server.dproj         |    4 +
 Source/Servidor/FactuGES_Server.drc           | 1024 ++++++++---------
 Source/Servidor/FactuGES_Server.identcache    |  Bin 12469 -> 12558 bytes
 Source/Servidor/FactuGES_Server.rc            |    2 +-
 110 files changed, 2473 insertions(+), 2167 deletions(-)

diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 18e821f..1f9bdb5 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -293,7 +293,8 @@ CREATE TABLE ALBARANES_CLIENTE (
     FECHA_PREVISTA_ENVIO  DATE,
     REFERENCIA_CLIENTE    VARCHAR(255),
     DESCUENTO2            TIPO_PORCENTAJE,
-    IMPORTE_DESCUENTO2    TIPO_IMPORTE
+    IMPORTE_DESCUENTO2    TIPO_IMPORTE,
+    DATOS_BANCARIOS       VARCHAR(255) COLLATE ES_ES
 );
 
 CREATE TABLE ALBARANES_CLIENTE_DETALLES (
@@ -698,7 +699,7 @@ CREATE TABLE FACTURAS_CLIENTE (
     RECARGO_EQUIVALENCIA   TIPO_BOOLEANO,
     ID_COMISION_LIQUIDADA  TIPO_ID,
     DATOS_BANCARIOS        VARCHAR(255),
-	  CLIENTE_FINAL          VARCHAR(255),
+	  PERSONA_CONTACTO       VARCHAR(255),
     RETENCION              TIPO_PORCENTAJE,
     IMPORTE_RETENCION      TIPO_IMPORTE,
     DESCUENTO2             TIPO_PORCENTAJE,
@@ -1373,7 +1374,8 @@ CREATE VIEW V_ALBARANES_CLIENTE(
     FECHA_ENVIO,
     FECHA_RECEPCION,
     DESCUENTO2,
-    IMPORTE_DESCUENTO2)
+    IMPORTE_DESCUENTO2,
+    DATOS_BANCARIOS)
 AS
 SELECT
   ALBARANES_CLIENTE.ID,
@@ -1417,7 +1419,8 @@ SELECT
   ALBARANES_CLIENTE.FECHA_ENVIO,
   ALBARANES_CLIENTE.FECHA_RECEPCION,
   ALBARANES_CLIENTE.DESCUENTO2,
-  ALBARANES_CLIENTE.IMPORTE_DESCUENTO2
+  ALBARANES_CLIENTE.IMPORTE_DESCUENTO2,
+  ALBARANES_CLIENTE.DATOS_BANCARIOS
 FROM
   ALBARANES_CLIENTE
   LEFT OUTER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_CLIENTE.ID_CLIENTE)
@@ -1786,6 +1789,7 @@ CREATE VIEW V_CLIENTES(
     ID_EMPRESA,
     REFERENCIA,
     PAIS,
+    ID_AGENTE,
     GRUPO_CLIENTE,
     NOMBRE_COMERCIAL,
     VENCIMIENTO_FACTURAS_1,
@@ -1827,6 +1831,7 @@ SELECT
   V_CONTACTOS.ID_EMPRESA,
   V_CONTACTOS.REFERENCIA,
   V_CONTACTOS.PAIS,
+  CLIENTES_DATOS.ID_AGENTE,
   CLIENTES_DATOS.GRUPO_CLIENTE,
   CLIENTES_DATOS.NOMBRE_COMERCIAL,
   CLIENTES_DATOS.VENCIMIENTO_FACTURAS_1,
@@ -2161,7 +2166,7 @@ CREATE VIEW V_FACTURAS_CLIENTE(
 	PROVINCIA,
 	CODIGO_POSTAL,
 	DATOS_BANCARIOS,
-	CLIENTE_FINAL,
+	PERSONA_CONTACTO,
 	FECHA_ALTA,
 	FECHA_MODIFICACION,
 	USUARIO,
@@ -2204,7 +2209,7 @@ SELECT FACTURAS_CLIENTE.ID,
   FACTURAS_CLIENTE.PROVINCIA,
   FACTURAS_CLIENTE.CODIGO_POSTAL,
   FACTURAS_CLIENTE.DATOS_BANCARIOS,
-  FACTURAS_CLIENTE.CLIENTE_FINAL,
+  FACTURAS_CLIENTE.PERSONA_CONTACTO,
   FACTURAS_CLIENTE.FECHA_ALTA,
   FACTURAS_CLIENTE.FECHA_MODIFICACION,
   FACTURAS_CLIENTE.USUARIO,
diff --git a/Source/Cliente/FactuGES.drc b/Source/Cliente/FactuGES.drc
index c89680c..72f842d 100644
--- a/Source/Cliente/FactuGES.drc
+++ b/Source/Cliente/FactuGES.drc
@@ -18,4 +18,4 @@ END
 /* C:\Codigo Noviseda\Source\Cliente\uAcercaDe.dfm */
 /* C:\Codigo Noviseda\Source\Cliente\uPantallaPrincipal.dfm */
 /* C:\Codigo Noviseda\Source\Cliente\FactuGES.res */
-/* E:\temp\dtf72F.tmp */
+/* E:\temp\dtf53B.tmp */
diff --git a/Source/Cliente/FactuGES.identcache b/Source/Cliente/FactuGES.identcache
index cacb976d29e5646f25828eca38f79eb508f59c46..0cb13a558f0dd7cf9751266adba229743553e781 100644
GIT binary patch
delta 33
ocmcb}dXaTP+vGirDwA`V6eqU*1TtMG*E8BqW@K`o+{@$w0O=?UkpKVy

delta 31
ncmcb}dXaTP+r-m9Cv!5{PHa<|{DM(&vKy28#5UK-y-Y3u-0KXl

diff --git a/Source/GUIBase/GUIBase.drc b/Source/GUIBase/GUIBase.drc
index c99723c..e519997 100644
--- a/Source/GUIBase/GUIBase.drc
+++ b/Source/GUIBase/GUIBase.drc
@@ -39,4 +39,4 @@ END
 /* C:\Codigo Noviseda\Source\GUIBase\uViewDocumentos.dfm */
 /* C:\Codigo Noviseda\Source\GUIBase\uEditorColores.dfm */
 /* C:\Codigo Noviseda\Source\GUIBase\GUIBase.res */
-/* E:\temp\dtf635.tmp */
+/* E:\temp\dtf441.tmp */
diff --git a/Source/GUIBase/GUIBase.identcache b/Source/GUIBase/GUIBase.identcache
index 24635f5fc1ef8ba48b4c0af59f87b1c87235702c..210f820fd297d009392fd8a8ba3f8b0c5f0a5456 100644
GIT binary patch
delta 76
zcmZ3=yOei=%j9{i8WZ2kO!j0{nXJ#qHgSXaWNt>g$sSB@K%xJWyBIYl=16VsV>-w<
gc?wJK<akzlpuEZ?R<_CBtRj>BSzI^IV`XOq0OxKPVE_OC

delta 77
zcmZ3=yOei=%j7;rjmafUQj>idRVEuSu}$10K6xIi#>5<%$<nM4k<TJP$^Vnt8QnJb
cF&$)_9LefB*`K8sC~r6U4vYQfd93V=0MdsT@c;k-

diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm
index 6f45479..cafdb0d 100644
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@@ -1,9 +1,9 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 829
-  Height = 278
+  Width = 880
+  Height = 360
   Align = alBottom
-  ExplicitWidth = 800
-  ExplicitHeight = 278
+  ExplicitWidth = 879
+  ExplicitHeight = 360
   object Bevel5: TBevel
     Left = 666
     Top = 109
@@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
     AlignWithMargins = True
     Left = 0
     Top = 0
-    Width = 829
-    Height = 278
+    Width = 880
+    Height = 360
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -27,37 +27,23 @@ inherited frViewTotales: TfrViewTotales
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     ExplicitWidth = 451
-    ExplicitHeight = 252
+    ExplicitHeight = 404
     object Bevel3: TBevel
-      Left = 422
+      Left = 366
       Top = 28
       Width = 3
       Height = 100
       Shape = bsRightLine
     end
     object Bevel4: TBevel
-      Left = 534
+      Left = 478
       Top = 70
       Width = 342
       Height = 9
       Shape = bsBottomLine
     end
-    object Bevel1: TBevel
-      Left = 534
-      Top = 186
-      Width = 368
-      Height = 9
-      Shape = bsBottomLine
-    end
-    object Bevel2: TBevel
-      Left = 131
-      Top = 188
-      Width = 368
-      Height = 9
-      Shape = bsBottomLine
-    end
     object ImporteDto: TcxDBCurrencyEdit
-      Left = 202
+      Left = 175
       Top = 55
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_DESCUENTO'
@@ -92,7 +78,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 87
     end
     object ImporteIVA: TcxDBCurrencyEdit
-      Left = 605
+      Left = 549
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_IVA'
@@ -122,12 +108,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 9
       Height = 21
       Width = 20
     end
     object ImporteTotal: TcxDBCurrencyEdit
-      Left = 535
+      Left = 479
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -158,12 +144,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 12
       Height = 21
       Width = 90
     end
     object edtDescuento: TcxDBSpinEdit
-      Left = 131
+      Left = 104
       Top = 55
       AutoSize = False
       DataBinding.DataField = 'DESCUENTO'
@@ -197,7 +183,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtIVA: TcxDBSpinEdit
-      Left = 534
+      Left = 478
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IVA'
@@ -233,12 +219,12 @@ inherited frViewTotales: TfrViewTotales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 8
       Height = 21
       Width = 65
     end
     object ImporteBase: TcxDBCurrencyEdit
-      Left = 534
+      Left = 478
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -268,12 +254,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 7
       Height = 21
       Width = 91
     end
     object edtRE: TcxDBSpinEdit
-      Left = 534
+      Left = 478
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'RE'
@@ -309,12 +295,12 @@ inherited frViewTotales: TfrViewTotales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 10
       Height = 21
       Width = 65
     end
     object ImporteRE: TcxDBCurrencyEdit
-      Left = 605
+      Left = 549
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_RE'
@@ -344,12 +330,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 11
       Height = 21
       Width = 20
     end
     object eImporteNeto: TcxDBCurrencyEdit
-      Left = 131
+      Left = 104
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_NETO'
@@ -383,7 +369,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 158
     end
     object ePorte: TcxDBCurrencyEdit
-      Left = 131
+      Left = 104
       Top = 82
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_PORTE'
@@ -417,7 +403,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 158
     end
     object eIVA: TcxDBLookupComboBox
-      Left = 131
+      Left = 104
       Top = 109
       DataBinding.DataField = 'ID_TIPO_IVA'
       DataBinding.DataSource = DADataSource
@@ -452,7 +438,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 20
     end
     object bTiposIVA: TButton
-      Left = 274
+      Left = 218
       Top = 109
       Width = 132
       Height = 21
@@ -460,7 +446,7 @@ inherited frViewTotales: TfrViewTotales
       TabOrder = 5
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
-      Left = 131
+      Left = 104
       Top = 136
       Caption = 'Aplicar recargo de equivalencia'
       DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
@@ -489,104 +475,6 @@ inherited frViewTotales: TfrViewTotales
       TabOrder = 6
       Width = 221
     end
-    object edtRetencion: TcxDBSpinEdit
-      Left = 534
-      Top = 206
-      AutoSize = False
-      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 = 14
-      Height = 21
-      Width = 65
-    end
-    object edtImporteRetencion: TcxDBCurrencyEdit
-      Left = 605
-      Top = 206
-      AutoSize = False
-      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 = 15
-      Height = 21
-      Width = 180
-    end
-    object edtFechaRetencion: TcxDBDateEdit
-      Left = 131
-      Top = 208
-      DataBinding.DataSource = DADataSource
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
-      Style.ButtonStyle = bts3D
-      Style.PopupBorderStyle = epbsFrame3D
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
-      Width = 280
-    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -665,18 +553,6 @@ inherited frViewTotales: TfrViewTotales
             Control = cbRecargoEquivalencia
             ControlOptions.ShowBorder = False
           end
-          object dxLayoutControl1Item19: TdxLayoutItem
-            Caption = ' '
-            Offsets.Top = 25
-            Control = Bevel2
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item21: TdxLayoutItem
-            Caption = 'Fecha vto. retenci'#243'n:'
-            Visible = False
-            Control = edtFechaRetencion
-            ControlOptions.ShowBorder = False
-          end
         end
         object dxLayoutControl1Group5: TdxLayoutGroup
           AutoAligns = [aaVertical]
@@ -768,31 +644,6 @@ inherited frViewTotales: TfrViewTotales
               Control = ImporteTotal
               ControlOptions.ShowBorder = False
             end
-            object dxLayoutControl1Item10: TdxLayoutItem
-              Caption = ' '
-              Control = Bevel1
-              ControlOptions.ShowBorder = False
-            end
-            object dxLayoutControl1Group11: TdxLayoutGroup
-              AutoAligns = [aaVertical]
-              AlignHorz = ahClient
-              ShowCaption = False
-              Visible = False
-              Hidden = True
-              LayoutDirection = ldHorizontal
-              ShowBorder = False
-              object dxLayoutControl1Item17: TdxLayoutItem
-                Caption = 'Retenci'#243'n (%):'
-                Control = edtRetencion
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item18: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahClient
-                Control = edtImporteRetencion
-                ControlOptions.ShowBorder = False
-              end
-            end
           end
         end
       end
diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas
index d4363d9..7f87179 100644
--- a/Source/GUIBase/uViewTotales.pas
+++ b/Source/GUIBase/uViewTotales.pas
@@ -57,19 +57,8 @@ type
     dsTiposIVA: TDADataSource;
     dxLayoutControl1Item16: TdxLayoutItem;
     cbRecargoEquivalencia: TcxDBCheckBox;
-    dxLayoutControl1Item17: TdxLayoutItem;
-    edtRetencion: TcxDBSpinEdit;
-    dxLayoutControl1Item18: TdxLayoutItem;
-    edtImporteRetencion: TcxDBCurrencyEdit;
     Bevel5: TBevel;
-    dxLayoutControl1Group11: TdxLayoutGroup;
-    dxLayoutControl1Item21: TdxLayoutItem;
-    edtFechaRetencion: TcxDBDateEdit;
     dxLayoutControl1Group10: TdxLayoutGroup;
-    dxLayoutControl1Item10: TdxLayoutItem;
-    Bevel1: TBevel;
-    dxLayoutControl1Item19: TdxLayoutItem;
-    Bevel2: TBevel;
   public
     { Public declarations }
   end;
diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj
index 322681a..f246900 100644
--- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj	
+++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj	
@@ -14,6 +14,7 @@
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
+    <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
     <Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
     <Projects Include="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" />
     <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
@@ -251,14 +252,23 @@
   <Target Name="RemesasProveedor_view:Make">
     <MSBuild Projects="..\Remesas de proveedor\Views\RemesasProveedor_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasCliente_view">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasCliente_view:Clean">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasCliente_view:Make">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view;FacturasCliente_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view:Clean;FacturasCliente_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view:Make;FacturasCliente_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc
index 1030271..bb89978 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc	
+++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
-/* E:\temp\dtf6BF.tmp */
+/* E:\temp\dtf4CB.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas
index ee35037..543089e 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas	
+++ b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas	
@@ -154,6 +154,7 @@ begin
           ADetallesAux.DataTable.Edit;
           ADetallesAux.CANTIDAD := GetTotal;
           ADetallesAux.DataTable.post;
+          ActualizarTotales(ADetalles);
        end
        else
           ADetallesAux.DetalleColores.DataTable.Cancel;
@@ -184,7 +185,7 @@ begin
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
   if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
      if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO
      else
        ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
diff --git a/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc b/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc
index d98f889..3cc55ca 100644
--- a/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc	
+++ b/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
-/* E:\temp\dtf6BD.tmp */
+/* E:\temp\dtf4C9.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm
index 1772ad1..5c93482 100644
--- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm	
@@ -293,6 +293,11 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
       item
         Name = 'IMPORTE_DESCUENTO2'
         DataType = datCurrency
+      end
+      item
+        Name = 'DATOS_BANCARIOS'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
diff --git a/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc b/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc
index 588ae45..559245d 100644
--- a/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc	
+++ b/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
-/* E:\temp\dtf6BB.tmp */
+/* E:\temp\dtf4C7.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
index d19630e..334fcf3 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_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_ListaAnosAlbaranes = '{B4206C62-06EB-4344-BEB1-1A30ED907220}';
-  RID_AlbaranesCliente = '{E1B3AF30-F3E6-4BC4-B9E5-6457F9E83272}';
-  RID_AlbaranesCliente_Detalle_Color = '{7C8EFD2E-60FC-4742-B01A-F56A7C0637A7}';
-  RID_AlbaranesCliente_Detalles = '{1DEA680B-4B62-4552-99D4-91A10AB81A52}';
+  RID_ListaAnosAlbaranes = '{42739B43-AAFE-40CD-B0F0-1F26F60FA03A}';
+  RID_AlbaranesCliente = '{31C082F1-1332-4151-B270-3B497DA70500}';
+  RID_AlbaranesCliente_Detalle_Color = '{AE57C6DB-DC23-4940-A000-87C4B4B43193}';
+  RID_AlbaranesCliente_Detalles = '{05E35781-52D8-4983-91BB-A08BD612D9F8}';
 
   { Data table names }
   nme_ListaAnosAlbaranes = 'ListaAnosAlbaranes';
@@ -69,6 +69,7 @@ const
   fld_AlbaranesClienteFECHA_RECEPCION = 'FECHA_RECEPCION';
   fld_AlbaranesClienteDESCUENTO2 = 'DESCUENTO2';
   fld_AlbaranesClienteIMPORTE_DESCUENTO2 = 'IMPORTE_DESCUENTO2';
+  fld_AlbaranesClienteDATOS_BANCARIOS = 'DATOS_BANCARIOS';
 
   { AlbaranesCliente field indexes }
   idx_AlbaranesClienteID = 0;
@@ -113,6 +114,7 @@ const
   idx_AlbaranesClienteFECHA_RECEPCION = 39;
   idx_AlbaranesClienteDESCUENTO2 = 40;
   idx_AlbaranesClienteIMPORTE_DESCUENTO2 = 41;
+  idx_AlbaranesClienteDATOS_BANCARIOS = 42;
 
   { AlbaranesCliente_Detalle_Color fields }
   fld_AlbaranesCliente_Detalle_ColorID = 'ID';
@@ -185,7 +187,7 @@ const
 type
   { IListaAnosAlbaranes }
   IListaAnosAlbaranes = interface(IDAStronglyTypedDataTable)
-  ['{9198BD80-46AC-41F3-80C0-EBD4A7055DBD}']
+  ['{F043E0A3-DB08-4F86-A07F-899DC88F8CA0}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -220,7 +222,7 @@ type
 
   { IAlbaranesCliente }
   IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
-  ['{373AD37D-234D-47B9-9133-4B56CAFFB722}']
+  ['{D4D1CA0D-3682-4C1D-BFA0-8F9E5DE7B4CD}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -388,6 +390,10 @@ type
     procedure SetIMPORTE_DESCUENTO2Value(const aValue: Currency);
     function GetIMPORTE_DESCUENTO2IsNull: Boolean;
     procedure SetIMPORTE_DESCUENTO2IsNull(const aValue: Boolean);
+    function GetDATOS_BANCARIOSValue: String;
+    procedure SetDATOS_BANCARIOSValue(const aValue: String);
+    function GetDATOS_BANCARIOSIsNull: Boolean;
+    procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -475,6 +481,8 @@ type
     property DESCUENTO2IsNull: Boolean read GetDESCUENTO2IsNull write SetDESCUENTO2IsNull;
     property IMPORTE_DESCUENTO2: Currency read GetIMPORTE_DESCUENTO2Value write SetIMPORTE_DESCUENTO2Value;
     property IMPORTE_DESCUENTO2IsNull: Boolean read GetIMPORTE_DESCUENTO2IsNull write SetIMPORTE_DESCUENTO2IsNull;
+    property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+    property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
   end;
 
   { TAlbaranesClienteDataTableRules }
@@ -652,6 +660,10 @@ type
     procedure SetIMPORTE_DESCUENTO2Value(const aValue: Currency); virtual;
     function GetIMPORTE_DESCUENTO2IsNull: Boolean; virtual;
     procedure SetIMPORTE_DESCUENTO2IsNull(const aValue: Boolean); virtual;
+    function GetDATOS_BANCARIOSValue: String; virtual;
+    procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
+    function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
+    procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -738,6 +750,8 @@ type
     property DESCUENTO2IsNull: Boolean read GetDESCUENTO2IsNull write SetDESCUENTO2IsNull;
     property IMPORTE_DESCUENTO2: Currency read GetIMPORTE_DESCUENTO2Value write SetIMPORTE_DESCUENTO2Value;
     property IMPORTE_DESCUENTO2IsNull: Boolean read GetIMPORTE_DESCUENTO2IsNull write SetIMPORTE_DESCUENTO2IsNull;
+    property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+    property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -747,7 +761,7 @@ type
 
   { IAlbaranesCliente_Detalle_Color }
   IAlbaranesCliente_Detalle_Color = interface(IDAStronglyTypedDataTable)
-  ['{10257B11-C523-426D-B5F3-C83A653FC86F}']
+  ['{9F645C57-1D1F-4B85-B3AB-25B652A9D7D4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -938,7 +952,7 @@ type
 
   { IAlbaranesCliente_Detalles }
   IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{0B31E831-E5AF-41C8-8043-2E16FC21CDE8}']
+  ['{02B0B3EC-18E2-403C-BFC3-2A41918C746A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2093,6 +2107,27 @@ begin
     DataTable.Fields[idx_AlbaranesClienteIMPORTE_DESCUENTO2].AsVariant := Null;
 end;
 
+function TAlbaranesClienteDataTableRules.GetDATOS_BANCARIOSValue: String;
+begin
+  result := DataTable.Fields[idx_AlbaranesClienteDATOS_BANCARIOS].AsString;
+end;
+
+procedure TAlbaranesClienteDataTableRules.SetDATOS_BANCARIOSValue(const aValue: String);
+begin
+  DataTable.Fields[idx_AlbaranesClienteDATOS_BANCARIOS].AsString := aValue;
+end;
+
+function TAlbaranesClienteDataTableRules.GetDATOS_BANCARIOSIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_AlbaranesClienteDATOS_BANCARIOS].IsNull;
+end;
+
+procedure TAlbaranesClienteDataTableRules.SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_AlbaranesClienteDATOS_BANCARIOS].AsVariant := Null;
+end;
+
 
 { TAlbaranesCliente_Detalle_ColorDataTableRules }
 constructor TAlbaranesCliente_Detalle_ColorDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas
index b3190bd..18b2cfe 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_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_ListaAnosAlbaranesDelta = '{1E1DC3F8-2ECA-40D0-B18D-9AD1F0294B1C}';
-  RID_AlbaranesClienteDelta = '{8B265689-7E0C-412D-B7AE-56B2AF1573FD}';
-  RID_AlbaranesCliente_Detalle_ColorDelta = '{6FF87351-F32C-49FE-A68B-4BC03FEEE1DB}';
-  RID_AlbaranesCliente_DetallesDelta = '{034AE7D6-C246-4EF8-AE5A-1773B4D37A26}';
+  RID_ListaAnosAlbaranesDelta = '{B839C079-D718-4A7D-AB98-EF55218E936A}';
+  RID_AlbaranesClienteDelta = '{F6B6B081-26F6-4D46-BC40-FB938E8BCDDE}';
+  RID_AlbaranesCliente_Detalle_ColorDelta = '{45B6BF2F-A6D2-4047-9430-B20755BF764A}';
+  RID_AlbaranesCliente_DetallesDelta = '{FB3F00DA-823C-463C-B460-D804323FA824}';
 
 type
   { IListaAnosAlbaranesDelta }
   IListaAnosAlbaranesDelta = interface(IListaAnosAlbaranes)
-  ['{1E1DC3F8-2ECA-40D0-B18D-9AD1F0294B1C}']
+  ['{B839C079-D718-4A7D-AB98-EF55218E936A}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -51,7 +51,7 @@ type
 
   { IAlbaranesClienteDelta }
   IAlbaranesClienteDelta = interface(IAlbaranesCliente)
-  ['{8B265689-7E0C-412D-B7AE-56B2AF1573FD}']
+  ['{F6B6B081-26F6-4D46-BC40-FB938E8BCDDE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -95,6 +95,7 @@ type
     function GetOldFECHA_RECEPCIONValue : DateTime;
     function GetOldDESCUENTO2Value : Currency;
     function GetOldIMPORTE_DESCUENTO2Value : Currency;
+    function GetOldDATOS_BANCARIOSValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -139,6 +140,7 @@ type
     property OldFECHA_RECEPCION : DateTime read GetOldFECHA_RECEPCIONValue;
     property OldDESCUENTO2 : Currency read GetOldDESCUENTO2Value;
     property OldIMPORTE_DESCUENTO2 : Currency read GetOldIMPORTE_DESCUENTO2Value;
+    property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
   end;
 
   { TAlbaranesClienteBusinessProcessorRules }
@@ -400,6 +402,12 @@ type
     function GetOldIMPORTE_DESCUENTO2IsNull: Boolean; virtual;
     procedure SetIMPORTE_DESCUENTO2Value(const aValue: Currency); virtual;
     procedure SetIMPORTE_DESCUENTO2IsNull(const aValue: Boolean); virtual;
+    function GetDATOS_BANCARIOSValue: String; virtual;
+    function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
+    function GetOldDATOS_BANCARIOSValue: String; virtual;
+    function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
+    procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
+    procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -570,6 +578,10 @@ type
     property IMPORTE_DESCUENTO2IsNull : Boolean read GetIMPORTE_DESCUENTO2IsNull write SetIMPORTE_DESCUENTO2IsNull;
     property OldIMPORTE_DESCUENTO2 : Currency read GetOldIMPORTE_DESCUENTO2Value;
     property OldIMPORTE_DESCUENTO2IsNull : Boolean read GetOldIMPORTE_DESCUENTO2IsNull;
+    property DATOS_BANCARIOS : String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+    property DATOS_BANCARIOSIsNull : Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+    property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
+    property OldDATOS_BANCARIOSIsNull : Boolean read GetOldDATOS_BANCARIOSIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -579,7 +591,7 @@ type
 
   { IAlbaranesCliente_Detalle_ColorDelta }
   IAlbaranesCliente_Detalle_ColorDelta = interface(IAlbaranesCliente_Detalle_Color)
-  ['{6FF87351-F32C-49FE-A68B-4BC03FEEE1DB}']
+  ['{45B6BF2F-A6D2-4047-9430-B20755BF764A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_DETALLEValue : Integer;
@@ -769,7 +781,7 @@ type
 
   { IAlbaranesCliente_DetallesDelta }
   IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
-  ['{034AE7D6-C246-4EF8-AE5A-1773B4D37A26}']
+  ['{FB3F00DA-823C-463C-B460-D804323FA824}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -2356,6 +2368,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteIMPORTE_DESCUENTO2] := Null;
 end;
 
+function TAlbaranesClienteBusinessProcessorRules.GetDATOS_BANCARIOSValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteDATOS_BANCARIOS];
+end;
+
+function TAlbaranesClienteBusinessProcessorRules.GetDATOS_BANCARIOSIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteDATOS_BANCARIOS]);
+end;
+
+function TAlbaranesClienteBusinessProcessorRules.GetOldDATOS_BANCARIOSValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteDATOS_BANCARIOS];
+end;
+
+function TAlbaranesClienteBusinessProcessorRules.GetOldDATOS_BANCARIOSIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteDATOS_BANCARIOS]);
+end;
+
+procedure TAlbaranesClienteBusinessProcessorRules.SetDATOS_BANCARIOSValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteDATOS_BANCARIOS] := aValue;
+end;
+
+procedure TAlbaranesClienteBusinessProcessorRules.SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteDATOS_BANCARIOS] := Null;
+end;
+
 
 { TAlbaranesCliente_Detalle_ColorBusinessProcessorRules }
 constructor TAlbaranesCliente_Detalle_ColorBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc
index 72d7dda..b1e823b 100644
--- a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc	
+++ b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
-/* E:\temp\dtf715.tmp */
+/* E:\temp\dtf521.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
index 92cf3e3..7f76e73 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm	
@@ -215,6 +215,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               item
                 DatasetField = 'IMPORTE_DESCUENTO2'
                 TableField = 'IMPORTE_DESCUENTO2'
+              end
+              item
+                DatasetField = 'DATOS_BANCARIOS'
+                TableField = 'DATOS_BANCARIOS'
               end>
           end>
         Name = 'AlbaranesCliente'
@@ -449,6 +453,11 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
           item
             Name = 'IMPORTE_DESCUENTO2'
             DataType = datCurrency
+          end
+          item
+            Name = 'DATOS_BANCARIOS'
+            DataType = datString
+            Size = 255
           end>
       end
       item
@@ -971,6 +980,12 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             Name = 'IMPORTE_DESCUENTO2'
             DataType = datCurrency
             Value = ''
+          end
+          item
+            Name = 'DATOS_BANCARIOS'
+            DataType = datString
+            Size = 255
+            Value = ''
           end>
         Statements = <
           item
@@ -986,17 +1001,17 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'ASE_IMPONIBLE, IVA, IMPORTE_IVA, IMPORTE_TOTAL, OBSERVACIONES, '#10 +
               '     INCIDENCIAS, INCIDENCIAS_ACTIVAS, FECHA_ALTA, FECHA_MODIFIC' +
               'ACION, '#10'     USUARIO, ID_FORMA_PAGO, FECHA_PREVISTA_ENVIO, FECHA' +
-              '_ENVIO, '#10'     FECHA_RECEPCION, DESCUENTO2, IMPORTE_DESCUENTO2)'#10' ' +
-              ' VALUES'#10'    (:ID, :ID_EMPRESA, :ID_CLIENTE, :FECHA_ALBARAN, :TIP' +
-              'O, :REFERENCIA,'#10'     :REFERENCIA_CLIENTE, :ID_ALMACEN, :ID_PEDID' +
-              'O, :ID_FACTURA, :ID_DIRECCION,'#10'     :CALLE, :CODIGO_POSTAL, :POB' +
-              'LACION, :PROVINCIA, :PERSONA_CONTACTO,'#10'     :TELEFONO, :IMPORTE_' +
-              'NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10'     :BASE' +
-              '_IMPONIBLE, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :OBSERVACIONES,'#10 +
-              '     :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, :FECHA_ALTA, :FECHA_MOD' +
-              'IFICACION,'#10'     :USUARIO, :ID_FORMA_PAGO, :FECHA_PREVISTA_ENVIO,' +
-              ' :FECHA_ENVIO, :FECHA_RECEPCION,'#10'     :DESCUENTO2, :IMPORTE_DESC' +
-              'UENTO2)'#10'     '#10'     '#10#10
+              '_ENVIO, '#10'     FECHA_RECEPCION, DESCUENTO2, IMPORTE_DESCUENTO2, D' +
+              'ATOS_BANCARIOS)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :ID_CLIENTE, :FE' +
+              'CHA_ALBARAN, :TIPO, :REFERENCIA,'#10'     :REFERENCIA_CLIENTE, :ID_A' +
+              'LMACEN, :ID_PEDIDO, :ID_FACTURA, :ID_DIRECCION,'#10'     :CALLE, :CO' +
+              'DIGO_POSTAL, :POBLACION, :PROVINCIA, :PERSONA_CONTACTO,'#10'     :TE' +
+              'LEFONO, :IMPORTE_NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESC' +
+              'UENTO,'#10'     :BASE_IMPONIBLE, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL,' +
+              ' :OBSERVACIONES,'#10'     :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, :FECHA' +
+              '_ALTA, :FECHA_MODIFICACION,'#10'     :USUARIO, :ID_FORMA_PAGO, :FECH' +
+              'A_PREVISTA_ENVIO, :FECHA_ENVIO, :FECHA_RECEPCION,'#10'     :DESCUENT' +
+              'O2, :IMPORTE_DESCUENTO2, :DATOS_BANCARIOS)'#10'     '#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1211,6 +1226,12 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             DataType = datCurrency
             Value = ''
           end
+          item
+            Name = 'DATOS_BANCARIOS'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1240,8 +1261,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               ' '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO, '#10'    FECHA_PREVISTA_ENVIO ' +
               '= :FECHA_PREVISTA_ENVIO, '#10'    FECHA_ENVIO = :FECHA_ENVIO, '#10'    F' +
               'ECHA_RECEPCION = :FECHA_RECEPCION,'#10'    DESCUENTO2 = :DESCUENTO2,' +
-              #10'    IMPORTE_DESCUENTO2 = :IMPORTE_DESCUENTO2'#10'  WHERE'#10'    (ID = ' +
-              ':OLD_ID)'#10
+              #10'    IMPORTE_DESCUENTO2 = :IMPORTE_DESCUENTO2,'#10'    DATOS_BANCARI' +
+              'OS = :DATOS_BANCARIOS'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc
index 5941128..4242a0c 100644
--- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc	
+++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc	
@@ -29,4 +29,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
-/* E:\temp\dtf713.tmp */
+/* E:\temp\dtf51F.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index 73ea5bc..917b31d 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
@@ -165,21 +165,19 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
   inherited pgPaginas: TPageControl
     Width = 849
     Height = 382
-    ActivePage = pagContenido
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 849
-    ExplicitHeight = 366
+    ExplicitHeight = 382
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 841
-      ExplicitHeight = 338
+      ExplicitHeight = 354
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitHeight = 338
       inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
         Left = 0
         Top = 0
@@ -197,43 +195,58 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 841
-        ExplicitHeight = 338
+        ExplicitHeight = 354
         inherited ToolBar1: TToolBar
           Width = 841
           Height = 73
           ExplicitWidth = 841
           ExplicitHeight = 73
+          inherited ToolButton3: TToolButton
+            Wrap = False
+          end
+          inherited ToolButton4: TToolButton
+            Left = 278
+            Top = 0
+            ExplicitLeft = 278
+            ExplicitTop = 0
+          end
+          inherited FontName: TJvFontComboBox
+            Left = 334
+            Top = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton
+            Left = 479
+            Top = 0
+            Wrap = True
+            ExplicitLeft = 479
+            ExplicitTop = 0
+          end
           inherited FontSize: TEdit
+            Left = 0
             Width = 202
+            ExplicitLeft = 0
             ExplicitWidth = 202
           end
           inherited UpDown1: TUpDown
             Left = 202
             ExplicitLeft = 202
           end
-          inherited ToolButton10: TToolButton
+          inherited ToolButton9: TToolButton
             Left = 219
             ExplicitLeft = 219
           end
-          inherited FontName: TJvFontComboBox
-            Left = 344
-            ExplicitLeft = 344
-          end
-          inherited ToolButton7: TToolButton
-            Left = 489
+          inherited ToolButton13: TToolButton
+            Left = 341
             Wrap = False
-            ExplicitLeft = 489
+            ExplicitLeft = 341
+            ExplicitHeight = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 556
+            Left = 349
             Top = 49
-            ExplicitLeft = 556
-            ExplicitTop = 49
-          end
-          inherited ToolButton8: TToolButton
-            Left = 697
-            Top = 49
-            ExplicitLeft = 697
+            ExplicitLeft = 349
             ExplicitTop = 49
           end
         end
@@ -243,7 +256,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
           Height = 255
           ExplicitTop = 99
           ExplicitWidth = 841
-          ExplicitHeight = 239
+          ExplicitHeight = 255
         end
         inherited TBXDock1: TTBXDock
           Top = 73
@@ -251,7 +264,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
           ExplicitTop = 73
           ExplicitWidth = 841
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 841
+            ExplicitWidth = 762
           end
         end
         inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -268,7 +281,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitHeight = 338
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -284,7 +296,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 841
-        ExplicitHeight = 338
+        ExplicitHeight = 354
         inherited pnlSup: TPanel
           Width = 841
           ExplicitWidth = 841
@@ -296,10 +308,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
           Width = 841
           Height = 326
           ExplicitWidth = 841
-          ExplicitHeight = 310
+          ExplicitHeight = 326
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 824
-            ExplicitHeight = 283
+            ExplicitHeight = 299
             Height = 299
             Width = 824
           end
@@ -338,20 +350,18 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       Width = 855
       Height = 143
       ExplicitWidth = 855
-      ExplicitHeight = 159
+      ExplicitHeight = 143
       inherited Bevel3: TBevel
-        Left = 418
+        Left = 338
         Height = 201
-        ExplicitLeft = 418
+        ExplicitLeft = 338
         ExplicitHeight = 201
       end
       inherited Bevel4: TBevel
-        Left = 551
-        ExplicitLeft = 551
-      end
-      inherited Bevel1: TBevel
-        Left = 551
-        ExplicitLeft = 551
+        Left = 471
+        Width = 342
+        ExplicitLeft = 471
+        ExplicitWidth = 342
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -361,22 +371,22 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 622
+        Left = 542
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 622
+        ExplicitLeft = 542
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 552
+        Left = 472
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 552
+        ExplicitLeft = 472
       end
       inherited edtDescuento: TcxDBSpinEdit
         Style.LookAndFeel.SkinName = ''
@@ -386,41 +396,41 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 551
+        Left = 471
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 551
+        ExplicitLeft = 471
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 551
+        Left = 471
         DataBinding.DataField = 'IMPORTE_NETO'
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 551
+        ExplicitLeft = 471
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 551
+        Left = 471
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 551
+        ExplicitLeft = 471
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 622
+        Left = 542
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 622
+        ExplicitLeft = 542
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -443,38 +453,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
       end
       inherited bTiposIVA: TButton
-        Left = 270
-        ExplicitLeft = 270
+        Left = 190
+        ExplicitLeft = 190
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 221
+        Width = 221
       end
-      inherited edtRetencion: TcxDBSpinEdit
-        Left = 551
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 551
-      end
-      inherited edtImporteRetencion: TcxDBCurrencyEdit
-        Left = 622
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 622
-      end
-      inherited edtFechaRetencion: TcxDBDateEdit
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
+      inherited Panel1: TPanel
+        Width = 185
+        ExplicitWidth = 185
       end
     end
   end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
index 385efd6..fdaa7f2 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
@@ -323,7 +323,10 @@ begin
   FController := Value;
 
   if Assigned(FController) then
+  begin
+    ViewAlbaran.Controller := FController;
     frViewDetallesAlbaranCliente1.Controller := Controller.DetallesController;
+  end;
 end;
 
 procedure TfEditorAlbaranCliente.SetAlbaran(const Value: IBizAlbaranCliente);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
index 41647bb..8dc5f1c 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm	
@@ -1,26 +1,28 @@
 inherited frViewAlbaranCliente: TfrViewAlbaranCliente
   Width = 903
-  Height = 506
+  Height = 542
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
   ExplicitWidth = 903
-  ExplicitHeight = 506
+  ExplicitHeight = 542
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
     Width = 903
-    Height = 506
+    Height = 542
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    LookAndFeel = dxLayoutOfficeLookAndFeel1
+    ExplicitHeight = 506
     DesignSize = (
       903
-      506)
+      542)
     object Label1: TLabel
       Left = 22
-      Top = 450
+      Top = 491
       Width = 299
       Height = 26
       Caption = 
@@ -31,7 +33,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
     end
     object edtFechaAlbaran: TcxDBDateEdit
       Left = 116
-      Top = 82
+      Top = 84
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ALBARAN'
       DataBinding.DataSource = DADataSource
@@ -60,8 +62,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Width = 336
     end
     object memObservaciones: TcxDBMemo
-      Left = 478
-      Top = 356
+      Left = 477
+      Top = 346
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -77,13 +79,13 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 21
+      TabOrder = 22
       Height = 69
       Width = 403
     end
     object eReferencia: TcxDBTextEdit
       Left = 116
-      Top = 28
+      Top = 30
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA'
       DataBinding.DataSource = DADataSource
@@ -113,9 +115,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
     end
     object eCalle: TcxDBTextEdit
       Left = 116
-      Top = 224
+      Top = 271
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -131,14 +134,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 9
       Width = 336
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 383
-      Top = 251
+      Left = 384
+      Top = 298
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -154,14 +158,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 11
       Width = 65
     end
     object ePersonaContacto: TcxDBTextEdit
       Left = 116
-      Top = 305
+      Top = 352
       DataBinding.DataField = 'PERSONA_CONTACTO'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.Color = clWindow
@@ -178,14 +183,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 13
       Width = 336
     end
     object eTlfTrabajo: TcxDBTextEdit
       Left = 116
-      Top = 332
+      Top = 379
       DataBinding.DataField = 'TELEFONO'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -201,29 +207,31 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 14
       Width = 336
     end
     object bElegirDireccion: TBitBtn
-      Left = 276
-      Top = 359
+      Left = 277
+      Top = 406
       Width = 172
       Height = 23
       Action = actElegirDireccion
       Caption = 'Elegir una direcci'#243'n de env'#237'o...'
-      TabOrder = 14
+      Enabled = False
+      TabOrder = 15
     end
     object Button1: TButton
-      Left = 316
-      Top = 138
+      Left = 317
+      Top = 111
       Width = 132
       Height = 23
       Action = actVerPedidoCli
-      TabOrder = 6
+      Enabled = False
+      TabOrder = 4
     end
     object eReferenciaPedidoCli: TcxTextEdit
       Left = 116
-      Top = 138
+      Top = 111
       Anchors = [akLeft, akTop, akRight]
       Enabled = False
       Properties.ReadOnly = False
@@ -245,12 +253,12 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 5
+      TabOrder = 3
       Width = 198
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 116
-      Top = 109
+      Top = 164
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Properties.KeyFieldNames = 'ID'
@@ -279,24 +287,25 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 3
+      TabOrder = 5
       Width = 198
     end
     object bFormasPago: TButton
-      Left = 316
-      Top = 109
+      Left = 317
+      Top = 164
       Width = 132
       Height = 23
       Caption = 'Ver las formas de pago...'
-      TabOrder = 4
+      TabOrder = 6
       OnClick = bFormasPagoClick
     end
     object eFechaRecepcion: TcxDBDateEdit
-      Left = 612
-      Top = 299
+      Left = 611
+      Top = 295
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_RECEPCION'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ImmediatePost = True
       Properties.OnValidate = eFechaRecepcionPropertiesValidate
       Style.BorderColor = clWindowFrame
@@ -317,22 +326,22 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 20
+      TabOrder = 21
       Width = 265
     end
     object cbConAlmacen: TCheckBox
       Left = 32
-      Top = 418
+      Top = 459
       Width = 179
       Height = 21
       Caption = 'Asociar este albar'#225'n al almac'#233'n:'
       Enabled = False
-      TabOrder = 15
+      TabOrder = 16
       OnClick = cbConAlmacenClick
     end
     object cbAlmacen: TcxDBLookupComboBox
       Left = 217
-      Top = 418
+      Top = 459
       DataBinding.DataField = 'ID_ALMACEN'
       DataBinding.DataSource = DADataSource
       Enabled = False
@@ -362,16 +371,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
+      TabOrder = 17
       Width = 235
     end
     object eRefFacturaCli: TcxDBTextEdit
       Left = 116
-      Top = 167
+      Top = 220
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REF_FACTURA'
       DataBinding.DataSource = DADataSource
-      Enabled = False
       Properties.ReadOnly = False
       Properties.ValidateOnEnter = True
       Style.BorderColor = clWindowFrame
@@ -392,15 +400,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 8
       Width = 336
     end
     object eFechaPrevista: TcxDBDateEdit
-      Left = 612
-      Top = 245
+      Left = 611
+      Top = 241
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_PREVISTA_ENVIO'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ImmediatePost = True
       Properties.OnValidate = eFechaPrevistaPropertiesValidate
       Style.BorderColor = clWindowFrame
@@ -423,15 +432,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
+      TabOrder = 19
       Width = 265
     end
     object eRefCliente: TcxDBTextEdit
       Left = 116
-      Top = 55
+      Top = 57
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA_CLIENTE'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ReadOnly = False
       Properties.ValidateOnEnter = True
       Style.BorderColor = clWindowFrame
@@ -456,11 +466,12 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Width = 336
     end
     object eFechaEnvio: TcxDBDateEdit
-      Left = 612
-      Top = 272
+      Left = 611
+      Top = 268
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENVIO'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ImmediatePost = True
       Properties.OnValidate = eFechaEnvioPropertiesValidate
       Style.BorderColor = clWindowFrame
@@ -481,14 +492,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
+      TabOrder = 20
       Width = 265
     end
     object cbProvincia: TcxDBComboBox
       Left = 116
-      Top = 251
+      Top = 298
       DataBinding.DataField = 'PROVINCIA'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ImmediatePost = True
       Properties.ImmediateUpdateText = True
       Properties.PostPopupValueOnTab = True
@@ -510,14 +522,15 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 10
       Width = 235
     end
     object cbPoblacion: TcxDBComboBox
       Left = 116
-      Top = 278
+      Top = 325
       DataBinding.DataField = 'POBLACION'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.ImmediatePost = True
       Properties.ImmediateUpdateText = True
       Properties.PostPopupValueOnTab = True
@@ -539,12 +552,12 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 12
       Width = 336
     end
     inline frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran
-      Left = 478
-      Top = 28
+      Left = 477
+      Top = 30
       Width = 406
       Height = 181
       Font.Charset = DEFAULT_CHARSET
@@ -553,10 +566,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 17
+      TabOrder = 18
       ReadOnly = False
-      ExplicitLeft = 478
-      ExplicitTop = 28
+      ExplicitLeft = 477
+      ExplicitTop = 30
       ExplicitWidth = 406
       ExplicitHeight = 181
       inherited dxLayoutControl1: TdxLayoutControl
@@ -573,17 +586,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
           Width = 224
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Left = 290
+          Left = 291
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 290
+          ExplicitLeft = 291
         end
         inherited Button3: TBitBtn
-          Left = 201
+          Left = 202
           Top = 139
-          ExplicitLeft = 201
+          ExplicitLeft = 202
           ExplicitTop = 139
         end
         inherited edtPersonaContacto: TcxDBTextEdit
@@ -607,13 +620,13 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
           Width = 287
         end
         inherited Button4: TButton
-          Left = 370
-          ExplicitLeft = 370
+          Left = 371
+          ExplicitLeft = 371
         end
         inherited Button5: TButton
-          Left = 370
+          Left = 371
           Top = 108
-          ExplicitLeft = 370
+          ExplicitLeft = 371
           ExplicitTop = 108
         end
       end
@@ -634,6 +647,28 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
         Top = 32
       end
     end
+    object cbCuentaBancaria: TcxDBComboBox
+      Left = 116
+      Top = 193
+      DataBinding.DataField = 'DATOS_BANCARIOS'
+      DataBinding.DataSource = DADataSource
+      Properties.DropDownListStyle = lsFixedList
+      Properties.DropDownRows = 12
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 7
+      Width = 184
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -656,6 +691,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
           end
           object dxLayoutControl1Item23: TdxLayoutItem
             Caption = 'Ref. cliente:'
+            Enabled = False
+            Visible = False
             Control = eRefCliente
             ControlOptions.ShowBorder = False
           end
@@ -665,66 +702,67 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
             ControlOptions.ShowBorder = False
           end
           object dxLayoutControl1Group5: TdxLayoutGroup
+            Enabled = False
+            ShowCaption = False
+            Visible = False
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControl1Item7: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Ref. del pedido:'
+              Control = eReferenciaPedidoCli
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item5: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahRight
+              Caption = 'Button1'
+              ShowCaption = False
+              Control = Button1
+              ControlOptions.ShowBorder = False
+            end
+          end
+        end
+        object dxLayoutControl1Group16: TdxLayoutGroup
+          Caption = 'Forma de pago'
+          object dxLayoutControl1Group13: TdxLayoutGroup
             ShowCaption = False
             Hidden = True
+            LayoutDirection = ldHorizontal
             ShowBorder = False
-            object dxLayoutControl1Group14: TdxLayoutGroup
-              ShowCaption = False
-              Hidden = True
-              LayoutDirection = ldHorizontal
-              ShowBorder = False
-              object dxLayoutControl1Item4: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahClient
-                Caption = 'Forma de pago'
-                Control = cbFormaPago
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item15: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahRight
-                ShowCaption = False
-                Control = bFormasPago
-                ControlOptions.ShowBorder = False
-              end
+            object dxLayoutControl1Item4: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Forma de pago'
+              Control = cbFormaPago
+              ControlOptions.ShowBorder = False
             end
-            object dxLayoutControl1Group13: TdxLayoutGroup
+            object dxLayoutControl1Item15: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahRight
               ShowCaption = False
-              Hidden = True
-              ShowBorder = False
-              object dxLayoutControl1Group15: TdxLayoutGroup
-                ShowCaption = False
-                Hidden = True
-                LayoutDirection = ldHorizontal
-                ShowBorder = False
-                object dxLayoutControl1Item7: TdxLayoutItem
-                  AutoAligns = [aaVertical]
-                  AlignHorz = ahClient
-                  Caption = 'Ref. del pedido:'
-                  Control = eReferenciaPedidoCli
-                  ControlOptions.ShowBorder = False
-                end
-                object dxLayoutControl1Item5: TdxLayoutItem
-                  AutoAligns = [aaVertical]
-                  AlignHorz = ahRight
-                  Caption = 'Button1'
-                  ShowCaption = False
-                  Control = Button1
-                  ControlOptions.ShowBorder = False
-                end
-              end
-              object dxLayoutControl1Item22: TdxLayoutItem
-                Caption = 'Ref. factura:'
-                Control = eRefFacturaCli
-                ControlOptions.ShowBorder = False
-              end
+              Control = bFormasPago
+              ControlOptions.ShowBorder = False
             end
           end
+          object dxLayoutControl1Item17: TdxLayoutItem
+            Caption = 'Cuenta bancaria:'
+            Control = cbCuentaBancaria
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item22: TdxLayoutItem
+            Caption = 'Ref. factura:'
+            Control = eRefFacturaCli
+            ControlOptions.ShowBorder = False
+          end
         end
         object dxLayoutControl1Group8: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
           Caption = 'Direcci'#243'n de entrega'
+          Enabled = False
           Visible = False
           object dxLayoutControl1Item8: TdxLayoutItem
             Caption = 'Calle:'
@@ -830,6 +868,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
         end
         object dxLayoutControl1Group12: TdxLayoutGroup
           Caption = 'Fechas de envio y recepci'#243'n'
+          Enabled = False
           Visible = False
           object dxLayoutControl1Item24: TdxLayoutItem
             AutoAligns = [aaVertical]
@@ -892,4 +931,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
     Left = 64
     Top = 192
   end
+  object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
+    Left = 120
+    Top = 24
+    object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel
+      GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET
+      GroupOptions.CaptionOptions.Font.Color = clWindowText
+      GroupOptions.CaptionOptions.Font.Height = -11
+      GroupOptions.CaptionOptions.Font.Name = 'Tahoma'
+      GroupOptions.CaptionOptions.Font.Style = [fsBold]
+      GroupOptions.CaptionOptions.TextColor = clHighlight
+      GroupOptions.CaptionOptions.UseDefaultFont = False
+    end
+  end
 end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index c7615c4..b7b80e7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
@@ -16,7 +16,8 @@ uses
 
   ExtCtrls, cxLookupEdit, cxDBLookupEdit, uBizFormasPago,
   cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uDAInterfaces,
-  uViewDatosYSeleccionClienteBase, uViewDatosYSeleccionClienteAlbaran;
+  uViewDatosYSeleccionClienteBase, uViewDatosYSeleccionClienteAlbaran,
+  dxLayoutLookAndFeels, uAlbaranesClienteController;
 
 type
   IViewAlbaranCliente = interface(IViewBase)
@@ -24,6 +25,10 @@ type
     function GetAlbaran: IBizAlbaranCliente;
     procedure SetAlbaran(const Value: IBizAlbaranCliente);
     property Albaran: IBizAlbaranCliente read GetAlbaran write SetAlbaran;
+    function GetController : IAlbaranesClienteController;
+    procedure SetController (const Value : IAlbaranesClienteController);
+    property Controller : IAlbaranesClienteController read GetController write SetController;
+
 
     function GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
     property ViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran read GetViewClienteAlbaran;
@@ -69,8 +74,6 @@ type
     dxLayoutControl1Item15: TdxLayoutItem;
     bFormasPago: TButton;
     dsFormaPago: TDADataSource;
-    dxLayoutControl1Group13: TdxLayoutGroup;
-    dxLayoutControl1Group14: TdxLayoutGroup;
     dxLayoutControl1Item16: TdxLayoutItem;
     eFechaRecepcion: TcxDBDateEdit;
     dxLayoutControl1Group11: TdxLayoutGroup;
@@ -85,7 +88,6 @@ type
     dxLayoutControl1Group10: TdxLayoutGroup;
     dxLayoutControl1Item22: TdxLayoutItem;
     eRefFacturaCli: TcxDBTextEdit;
-    dxLayoutControl1Group15: TdxLayoutGroup;
     dxLayoutControl1Item24: TdxLayoutItem;
     eFechaPrevista: TcxDBDateEdit;
     dxLayoutControl1Item23: TdxLayoutItem;
@@ -99,6 +101,12 @@ type
     dxLayoutControl1Group9: TdxLayoutGroup;
     frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran;
     dxLayoutControl1Item1: TdxLayoutItem;
+    dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
+    dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
+    dxLayoutControl1Group16: TdxLayoutGroup;
+    dxLayoutControl1Group13: TdxLayoutGroup;
+    dxLayoutControl1Item17: TdxLayoutItem;
+    cbCuentaBancaria: TcxDBComboBox;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure actElegirDireccionExecute(Sender: TObject);
@@ -122,8 +130,7 @@ type
   protected
     FAlbaran : IBizAlbaranCliente;
     FAlmacenesController : IAlmacenesController;
-//    FPedidoAsociado : IBizPedidoCliente;
-//    FPedidoController : IPedidosClienteController;
+    FController : IAlbaranesClienteController;
     FViewClienteAlbaran : IViewDatosYSeleccionClienteAlbaran;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
@@ -132,13 +139,19 @@ type
 
     procedure CargarProvincias;
     procedure CargarPoblaciones;
+    procedure RellenarCuentasBancarias;
 
     function GetAlbaran: IBizAlbaranCliente;
     procedure SetAlbaran(const Value: IBizAlbaranCliente); virtual;
     function GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
+
+    function GetController : IAlbaranesClienteController;
+    procedure SetController (const Value : IAlbaranesClienteController);
+
   public
     property Albaran: IBizAlbaranCliente read GetAlbaran write SetAlbaran;
     property ViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran read GetViewClienteAlbaran;
+    property Controller : IAlbaranesClienteController read GetController write SetController;
   end;
 
 implementation
@@ -148,7 +161,7 @@ implementation
 { TfrViewAlbaranCliente }
 
 uses
-  uClientesController, uBizDireccionesContacto, uAlbaranesClienteController,
+  uFactuGES_App, uEmpresasController, uClientesController, uBizDireccionesContacto, 
   schAlbaranesClienteClient_Intf, uBizAlmacenes, uDateUtils,
   uDialogUtils, uProvinciasPoblacionesController, uStringsUtils;
 
@@ -418,14 +431,72 @@ begin
   Result := FAlbaran;
 end;
 
+function TfrViewAlbaranCliente.GetController: IAlbaranesClienteController;
+begin
+  Result := FController;
+end;
+
 function TfrViewAlbaranCliente.GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
 begin
   Result := FViewClienteAlbaran;
 end;
 
+procedure TfrViewAlbaranCliente.RellenarCuentasBancarias;
+var
+  AController : IEmpresasController;
+  ALista : TStringList;
+  AListaIBAN : TStringList;
+  AListaCliente: TStringList;
+  i : integer;
+begin
+  AController := TEmpresasController.Create;
+  try
+    ALista := AController.DarListaCuentasBancarias(AppFactuGES.EmpresaActiva);
+    AListaIBAN := AController.DarListaCuentasBancariasIBAN(AppFactuGES.EmpresaActiva);
+    AListaCliente := Controller.ClienteController.DarListaCuentasBancarias(FAlbaran.ID_CLIENTE);
+
+    try
+      with cbCuentaBancaria.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          Add('');
+          for i := 0 to ALista.Count - 1 do
+            Add(ALista.Names[i]);
+
+          if AListaIBAN.Count > 0 then
+          begin
+            Add('--------------');
+            for i := 0 to AListaIBAN.Count - 1 do
+              Add(AListaIBAN.Names[i]);
+          end;
+
+          if AListaCliente.Count > 0 then
+          begin
+            Add('--------------');
+            for i := 0 to AListaCliente.Count - 1 do
+              Add(AListaCliente.Names[i]);
+          end;
+
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      FreeANDNIL(ALista);
+      FreeANDNIL(AListaIBAN);      
+    end;
+  finally
+    AController := NIL;
+  end;
+end;
+
 procedure TfrViewAlbaranCliente.SetAlbaran(const Value: IBizAlbaranCliente);
 begin
   FAlbaran := Value;
+  RellenarCuentasBancarias;
+
   if Assigned(FAlbaran) then
   begin
     DADataSource.DataTable := FAlbaran.DataTable;
@@ -488,4 +559,9 @@ begin
   end;
 end;
 
+procedure TfrViewAlbaranCliente.SetController(const Value: IAlbaranesClienteController);
+begin
+  FController := Value;
+end;
+
 end.
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
index aa92bf2..0174ad2 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm	
@@ -216,24 +216,22 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
           Width = 228
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 332
+          Left = 257
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 332
+          ExplicitLeft = 257
           ExplicitWidth = 460
           Width = 460
         end
         inherited eLista: TcxComboBox
-          Left = 829
+          Left = 638
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 829
-          ExplicitWidth = 215
-          Width = 215
+          ExplicitLeft = 638
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
index fa5d2cf..569bdfd 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas	
@@ -13,7 +13,7 @@ uses
   cxGrid,
   uBizAlbaranesCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ComCtrls, Tabs,
   cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg,
-  uDAInterfaces;
+  uDAInterfaces, uCustomView, uViewBase;
   
 type
   IViewAlbaranesCliente = interface(IViewGrid)
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.dfm
index 621b9af..e55a5e7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.dfm	
@@ -1,13 +1,13 @@
 inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlbaran
-  Width = 505
-  Height = 196
-  ExplicitWidth = 505
-  ExplicitHeight = 196
+  Width = 646
+  Height = 245
+  ExplicitWidth = 646
+  ExplicitHeight = 245
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 505
-    Height = 196
+    Width = 646
+    Height = 245
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -17,9 +17,11 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitWidth = 505
+    ExplicitHeight = 196
     DesignSize = (
-      505
-      196)
+      646
+      245)
     object edtlNombre: TcxDBTextEdit
       Left = 63
       Top = 41
@@ -48,7 +50,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
       Width = 224
     end
     object edtNIFCIF: TcxDBTextEdit
-      Left = 392
+      Left = 533
       Top = 41
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -163,7 +165,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
         FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
     end
     object Button3: TBitBtn
-      Left = 303
+      Left = 444
       Top = 158
       Width = 192
       Height = 25
@@ -254,7 +256,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
       Width = 403
     end
     object Button4: TButton
-      Left = 472
+      Left = 613
       Top = 68
       Width = 23
       Height = 25
@@ -262,7 +264,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
       TabOrder = 5
     end
     object Button5: TButton
-      Left = 472
+      Left = 613
       Top = 127
       Width = 23
       Height = 25
@@ -334,6 +336,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
             AlignHorz = ahRight
             Caption = 'Button4'
             ShowCaption = False
+            Visible = False
             Control = Button4
             ControlOptions.ShowBorder = False
           end
@@ -355,6 +358,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
             AutoAligns = [aaVertical]
             AlignHorz = ahRight
             ShowCaption = False
+            Visible = False
             Control = Button5
             ControlOptions.ShowBorder = False
           end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas
index 27f3772..6079ca8 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas	
@@ -322,13 +322,13 @@ begin
     if FCliente.ID > 0 then
        edtPersonaContacto.Enabled := True;
 
-//    if FCliente.Direcciones.RecordCount > 0 then
-//      ElegirDireccionCliente
-//    else begin
-//      FAlbaran.Edit;
-//      FAlbaran.PERSONA_CONTACTO := FCliente.PERSONA_CONTACTO;
-//      RefrescarDireccion;
-//    end;
+    if FCliente.Direcciones.RecordCount > 0 then
+       ElegirDireccionCliente
+    else begin
+      FAlbaran.Edit;
+      FAlbaran.PERSONA_CONTACTO := FCliente.PERSONA_CONTACTO;
+      RefrescarDireccion;
+    end;
   end
   else begin
     dsCliente.DataTable := NIL;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
index 7129187..bc3845a 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm	
@@ -2,20 +2,30 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
   inherited ToolBar1: TToolBar
     Height = 100
     ExplicitHeight = 100
-    inherited ToolButton14: TToolButton
+    inherited ToolButton3: TToolButton
       Wrap = False
     end
-    inherited ToolButton9: TToolButton [5]
-      Left = 121
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
       Top = 22
-      ExplicitLeft = 121
       ExplicitTop = 22
     end
-    inherited FontName: TJvFontComboBox [6]
-      Left = 266
+    inherited FontSize: TEdit
       Top = 22
-      ExplicitLeft = 266
+      Width = 90
       ExplicitTop = 22
+      ExplicitWidth = 90
     end
     inherited ToolButton13: TToolButton [7]
       Left = 0
@@ -23,40 +33,33 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
       Wrap = True
       ExplicitLeft = 0
       ExplicitTop = 22
+      ExplicitHeight = 27
     end
-    inherited ToolButton6: TToolButton [8]
+    inherited UpDown1: TUpDown [8]
       Left = 0
       Top = 49
       ExplicitLeft = 0
       ExplicitTop = 49
     end
-    inherited FontSize: TEdit [9]
-      Left = 66
+    inherited ToolButton6: TToolButton
+      Left = 17
       Top = 49
-      Width = 58
-      ExplicitLeft = 66
-      ExplicitTop = 49
-      ExplicitWidth = 58
-    end
-    inherited UpDown1: TUpDown [10]
-      Left = 124
-      Top = 49
-      ExplicitLeft = 124
+      ExplicitLeft = 17
       ExplicitTop = 49
     end
-    inherited ToolButton7: TToolButton [11]
-      Left = 141
+    inherited ToolButton7: TToolButton
+      Left = 83
       Top = 49
-      ExplicitLeft = 141
+      ExplicitLeft = 83
       ExplicitTop = 49
     end
-    inherited ToolButton11: TToolButton [12]
-      Left = 208
+    inherited ToolButton8: TToolButton
+      Left = 150
       Top = 49
-      ExplicitLeft = 208
+      ExplicitLeft = 150
       ExplicitTop = 49
     end
-    inherited ToolButton12: TToolButton [13]
+    inherited ToolButton12: TToolButton
       Left = 0
       Top = 49
       Wrap = True
@@ -64,16 +67,22 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
       ExplicitTop = 49
       ExplicitHeight = 27
     end
-    inherited ToolButton10: TToolButton
+    inherited ToolButton9: TToolButton
       Left = 0
       Top = 76
       ExplicitLeft = 0
       ExplicitTop = 76
     end
-    inherited ToolButton8: TToolButton [15]
-      Left = 125
+    inherited ToolButton10: TToolButton
+      Left = 145
       Top = 76
-      ExplicitLeft = 125
+      ExplicitLeft = 145
+      ExplicitTop = 76
+    end
+    inherited ToolButton11: TToolButton
+      Left = 270
+      Top = 76
+      ExplicitLeft = 270
       ExplicitTop = 76
     end
   end
@@ -103,6 +112,7 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
           end>
         Properties.ReadOnly = True
         Properties.OnButtonClick = cxGridViewCANTIDAD2PropertiesButtonClick
+        HeaderAlignmentHorz = taRightJustify
       end
       inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
         Visible = False
@@ -127,6 +137,8 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
   inherited ActionListContenido: TActionList
     inherited actAnadirArticulos: TAction
       Caption = 'A'#241'adir art'#237'culos...'
+      Enabled = False
+      Visible = False
     end
   end
   inherited GridGeneralPopupMenu: TPopupMenu
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewTotalesAlbaran.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewTotalesAlbaran.dfm
index 01e9b1f..f80918f 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewTotalesAlbaran.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewTotalesAlbaran.dfm	
@@ -1,92 +1,78 @@
 inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
-  Width = 858
-  Height = 387
-  ExplicitWidth = 858
-  ExplicitHeight = 387
+  Width = 612
+  Height = 270
+  ExplicitHeight = 270
   inherited dxLayoutControl1: TdxLayoutControl
-    Width = 858
-    Height = 387
+    Width = 612
+    Height = 270
     ExplicitWidth = 451
-    ExplicitHeight = 230
+    ExplicitHeight = 270
     inherited Bevel3: TBevel
-      Left = 428
+      Left = 266
       Top = 10
-      ExplicitLeft = 428
+      ExplicitLeft = 266
       ExplicitTop = 10
     end
     inherited Bevel4: TBevel
-      Left = 561
+      Left = 399
       Top = 52
       Width = 342
-      ExplicitLeft = 561
+      ExplicitLeft = 399
       ExplicitTop = 52
       ExplicitWidth = 342
     end
-    inherited Bevel1: TBevel
-      Left = 561
-      Top = 168
-      Width = 368
-      ExplicitLeft = 561
-      ExplicitTop = 168
-      ExplicitWidth = 368
-    end
-    inherited Bevel2: TBevel
-      Left = 119
-      Top = 170
-      Width = 368
-      ExplicitLeft = 119
-      ExplicitTop = 170
-      ExplicitWidth = 368
-    end
     inherited ImporteDto: TcxDBCurrencyEdit
-      Left = 190
+      Left = 163
       Top = 37
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 190
+      ExplicitLeft = 163
       ExplicitTop = 37
     end
     inherited ImporteIVA: TcxDBCurrencyEdit
-      Left = 632
+      Left = 470
       Top = 87
       DataBinding.DataField = 'IMPORTE_DESCUENTO'
+      Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
-      ExplicitLeft = 632
+      TabOrder = 10
+      ExplicitLeft = 470
       ExplicitTop = 87
     end
     inherited ImporteTotal: TcxDBCurrencyEdit
-      Left = 562
+      Left = 400
       Top = 141
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
-      ExplicitLeft = 562
+      TabOrder = 13
+      ExplicitLeft = 400
       ExplicitTop = 141
     end
     inherited edtDescuento: TcxDBSpinEdit
-      Left = 119
+      Left = 92
       Top = 37
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
+      ExplicitLeft = 92
       ExplicitTop = 37
     end
     inherited edtIVA: TcxDBSpinEdit
-      Left = 561
+      Left = 399
       Top = 87
       DataBinding.DataField = 'DESCUENTO'
       Enabled = True
@@ -95,12 +81,12 @@ inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
-      ExplicitLeft = 561
+      TabOrder = 9
+      ExplicitLeft = 399
       ExplicitTop = 87
     end
     inherited ImporteBase: TcxDBCurrencyEdit
-      Left = 561
+      Left = 399
       Top = 10
       DataBinding.DataField = 'IMPONIBLE_NETO'
       Style.LookAndFeel.SkinName = ''
@@ -108,12 +94,12 @@ inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
-      ExplicitLeft = 561
+      TabOrder = 8
+      ExplicitLeft = 399
       ExplicitTop = 10
     end
     inherited edtRE: TcxDBSpinEdit
-      Left = 561
+      Left = 399
       Top = 114
       DataBinding.DataField = 'DESCUENTO2'
       Enabled = True
@@ -122,120 +108,88 @@ inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
-      ExplicitLeft = 561
+      TabOrder = 11
+      ExplicitLeft = 399
       ExplicitTop = 114
     end
     inherited ImporteRE: TcxDBCurrencyEdit
-      Left = 632
+      Left = 470
       Top = 114
       DataBinding.DataField = 'IMPORTE_DESCUENTO2'
+      Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
-      ExplicitLeft = 632
+      TabOrder = 12
+      ExplicitLeft = 470
       ExplicitTop = 114
     end
     inherited eImporteNeto: TcxDBCurrencyEdit
-      Left = 119
+      Left = 92
       Top = 10
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
+      ExplicitLeft = 92
       ExplicitTop = 10
     end
     inherited ePorte: TcxDBCurrencyEdit
-      Left = 119
+      Left = 92
       Top = 64
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
+      ExplicitLeft = 92
       ExplicitTop = 64
     end
     inherited eIVA: TcxDBLookupComboBox
-      Left = 119
+      Left = 92
       Top = 91
       DataBinding.DataField = ''
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
+      ExplicitLeft = 92
       ExplicitTop = 91
     end
     inherited bTiposIVA: TButton
-      Left = 280
+      Left = 118
       Top = 91
-      ExplicitLeft = 280
+      Enabled = False
+      ExplicitLeft = 118
       ExplicitTop = 91
     end
     inherited cbRecargoEquivalencia: TcxDBCheckBox
-      Left = 119
+      Left = 92
       Top = 118
       DataBinding.DataField = ''
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
+      ExplicitLeft = 92
       ExplicitTop = 118
       ExplicitWidth = 221
       Width = 221
     end
-    inherited edtRetencion: TcxDBSpinEdit
-      Left = 561
-      Top = 188
-      Style.LookAndFeel.SkinName = ''
-      Style.IsFontAssigned = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
-      ExplicitLeft = 561
-      ExplicitTop = 188
-    end
-    inherited edtImporteRetencion: TcxDBCurrencyEdit
-      Left = 632
-      Top = 188
-      Style.LookAndFeel.SkinName = ''
-      Style.IsFontAssigned = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
-      ExplicitLeft = 632
-      ExplicitTop = 188
-      ExplicitWidth = 180
-      Width = 180
-    end
-    inherited edtFechaRetencion: TcxDBDateEdit
-      Left = 119
-      Top = 190
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 119
-      ExplicitTop = 190
-      ExplicitWidth = 280
-      Width = 280
-    end
-    object Panel1: TPanel [20]
+    object Panel1: TPanel [15]
       Left = 10
-      Top = 217
+      Top = 145
       Width = 185
       Height = 41
       BevelOuter = bvNone
-      TabOrder = 8
+      TabOrder = 7
     end
     inherited dxLayoutControl1Group_Root: TdxLayoutGroup
       inherited dxLayoutControl1Group1: TdxLayoutGroup
@@ -243,23 +197,25 @@ inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
         ShowBorder = False
         inherited dxLayoutControl1Group2: TdxLayoutGroup
           inherited dxLayoutControl1Item8: TdxLayoutItem
+            Enabled = False
             Visible = False
           end
           inherited dxLayoutControl1Group7: TdxLayoutGroup
             inherited dxLayoutControl1Group10: TdxLayoutGroup
+              Enabled = False
               Visible = False
             end
             inherited dxLayoutControl1Item9: TdxLayoutItem
+              Enabled = False
               Visible = False
             end
           end
           inherited dxLayoutControl1Group6: TdxLayoutGroup
+            Enabled = False
             Visible = False
           end
           inherited dxLayoutControl1Item16: TdxLayoutItem
-            Visible = False
-          end
-          inherited dxLayoutControl1Item19: TdxLayoutItem
+            Enabled = False
             Visible = False
           end
           object dxLayoutControl1Item20: TdxLayoutItem
@@ -277,30 +233,26 @@ inherited frViewTotalesAlbaran: TfrViewTotalesAlbaran
           inherited dxLayoutControl1Group3: TdxLayoutGroup
             inherited dxLayoutControl1Item12: TdxLayoutItem
               Caption = 'Importe neto:'
-              CaptionOptions.AlignHorz = taRightJustify
             end
             inherited dxLayoutControl1Item14: TdxLayoutItem
+              Enabled = False
               Visible = False
             end
             inherited dxLayoutControl1Group9: TdxLayoutGroup
               inherited dxLayoutControl1Item5: TdxLayoutItem
                 Caption = 'Dto. cliente (%):'
+                CaptionOptions.AlignHorz = taLeftJustify
               end
             end
             inherited dxLayoutControl1Group8: TdxLayoutGroup
               inherited dxLayoutControl1Item6: TdxLayoutItem
                 Caption = 'Dto. pronto pago (%):'
+                CaptionOptions.AlignHorz = taLeftJustify
               end
               inherited dxLayoutControl1Item7: TdxLayoutItem
                 Visible = True
               end
             end
-            inherited dxLayoutControl1Item3: TdxLayoutItem
-              CaptionOptions.AlignHorz = taRightJustify
-            end
-            inherited dxLayoutControl1Item10: TdxLayoutItem
-              Visible = False
-            end
           end
         end
       end
diff --git a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc
index f5bb1f7..a3df400 100644
--- a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc	
+++ b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.res */
-/* E:\temp\dtf6E9.tmp */
+/* E:\temp\dtf4F5.tmp */
diff --git a/Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc b/Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc
index 640e795..88e3a6a 100644
--- a/Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc	
+++ b/Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Data\uDataModuleAlbaranesProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Data\AlbaranesProveedor_data.res */
-/* E:\temp\dtf6E7.tmp */
+/* E:\temp\dtf4F3.tmp */
diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc
index 319f228..d0c2c8a 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc	
+++ b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Model\AlbaranesProveedor_model.res */
-/* E:\temp\dtf6E5.tmp */
+/* E:\temp\dtf4F1.tmp */
diff --git a/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc b/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc
index 62c48cb..827c066 100644
--- a/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc	
+++ b/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Plugin\uPluginAlbaranesProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.res */
-/* E:\temp\dtf729.tmp */
+/* E:\temp\dtf535.tmp */
diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc
index 8efc3bf..c2caa86 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc	
+++ b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc	
@@ -29,4 +29,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranDevProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedorReport.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.res */
-/* E:\temp\dtf727.tmp */
+/* E:\temp\dtf533.tmp */
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.drc b/Source/Modulos/Contactos/Controller/Contactos_controller.drc
index c7aa3ae..055298e 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.drc
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.drc
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Controller\Contactos_controller.res */
-/* E:\temp\dtf665.tmp */
+/* E:\temp\dtf471.tmp */
diff --git a/Source/Modulos/Contactos/Data/Contactos_data.drc b/Source/Modulos/Contactos/Data/Contactos_data.drc
index fce96a9..9128cf8 100644
--- a/Source/Modulos/Contactos/Data/Contactos_data.drc
+++ b/Source/Modulos/Contactos/Data/Contactos_data.drc
@@ -18,4 +18,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleEmpleados.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleVendedores.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\Contactos_data.res */
-/* E:\temp\dtf663.tmp */
+/* E:\temp\dtf46F.tmp */
diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
index 8ee421f..676deaa 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
@@ -184,6 +184,10 @@ inherited DataModuleClientes: TDataModuleClientes
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'ID_AGENTE'
+        DataType = datInteger
+      end
       item
         Name = 'GRUPO_CLIENTE'
         DataType = datString
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.drc b/Source/Modulos/Contactos/Model/Contactos_model.drc
index 2c31541..c950e47 100644
--- a/Source/Modulos/Contactos/Model/Contactos_model.drc
+++ b/Source/Modulos/Contactos/Model/Contactos_model.drc
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Model\Contactos_model.res */
-/* E:\temp\dtf661.tmp */
+/* E:\temp\dtf46D.tmp */
diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
index a253642..5b78fb1 100644
--- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
@@ -9,21 +9,21 @@ 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_Contactos = '{31E890C9-C096-4B82-8434-F8C22E4BDEDC}';
-  RID_GruposCliente = '{70B933FC-B92B-4DEA-B54A-5B4D39AC8BC0}';
-  RID_DatosBancarios = '{67D159F3-DF6A-4090-85D0-18942A2E5E9F}';
-  RID_Vendedores = '{395B321C-C0F2-422E-9DCB-9F7535E4A2EF}';
-  RID_Clientes = '{78865B8B-5E9D-48DA-A2B4-C7BF60D2C90A}';
-  RID_Proveedores = '{35C717ED-5796-4BD8-9D32-F3BA1FE2F050}';
-  RID_Empleados = '{AA5DB4CA-CC60-431C-9C32-3396340E225B}';
-  RID_DireccionesContacto = '{1F2574EE-F467-48A2-BD39-D288B2E72968}';
-  RID_ClientesDescuentos = '{7971F20B-2FAA-4CFF-AFDB-3846A73505A2}';
-  RID_GruposProveedor = '{E426F450-BDFB-412A-9BBE-83309453C2D2}';
-  RID_GruposEmpleado = '{B7E33531-935F-43EF-9AAA-EA60734E4312}';
-  RID_Contactos_Refresh = '{B9889A3F-313E-4454-AE79-97CF3D812540}';
-  RID_ContratosEmpleados = '{6DE395F5-9C4F-4BED-BEC6-29552362FB92}';
-  RID_DescripcionesProveedores = '{39884348-E254-4A49-932E-8FE22A14331E}';
-  RID_PersonalContacto = '{C74D4AF4-AF4E-4CC4-977F-93219C341679}';
+  RID_Contactos = '{ACB5CADD-F95C-443A-8A8E-1924599B45CC}';
+  RID_GruposCliente = '{B0E83D00-997F-4D68-B4B0-8D60D75329E3}';
+  RID_DatosBancarios = '{10ECFCDF-8C7A-47DE-AE72-4077BE1B2360}';
+  RID_Vendedores = '{12514B73-4876-4C4D-A6D0-60879AEE5665}';
+  RID_Clientes = '{18301B14-C8F8-4DEB-B02A-90CA5A5130DE}';
+  RID_Proveedores = '{A4AB7805-4A02-4CA0-90BC-77BA265E009E}';
+  RID_Empleados = '{5609D8C2-BE56-4FA0-AB73-F0EC2484A84D}';
+  RID_DireccionesContacto = '{0C5E669A-17DE-4DF9-8B49-7081CC8F0981}';
+  RID_ClientesDescuentos = '{688D93EC-D8E9-41FD-929A-3F347665F442}';
+  RID_GruposProveedor = '{79F38AFD-1BBF-4DF0-A867-BF6FF8391738}';
+  RID_GruposEmpleado = '{B545DB65-489F-4361-BE6F-A59ECAF92498}';
+  RID_Contactos_Refresh = '{DB8C8518-32E0-45D1-8020-37A643685AD4}';
+  RID_ContratosEmpleados = '{6FE7D29D-BB36-4438-88AB-E81F6D099306}';
+  RID_DescripcionesProveedores = '{5175E0DD-DF25-4BD8-A758-7117195820F1}';
+  RID_PersonalContacto = '{122D7340-896B-4E17-9A8B-8F8F7600F059}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -203,6 +203,7 @@ const
   fld_ClientesID_EMPRESA = 'ID_EMPRESA';
   fld_ClientesREFERENCIA = 'REFERENCIA';
   fld_ClientesPAIS = 'PAIS';
+  fld_ClientesID_AGENTE = 'ID_AGENTE';
   fld_ClientesGRUPO_CLIENTE = 'GRUPO_CLIENTE';
   fld_ClientesNOMBRE_COMERCIAL = 'NOMBRE_COMERCIAL';
   fld_ClientesVENCIMIENTO_FACTURAS_1 = 'VENCIMIENTO_FACTURAS_1';
@@ -244,21 +245,22 @@ const
   idx_ClientesID_EMPRESA = 21;
   idx_ClientesREFERENCIA = 22;
   idx_ClientesPAIS = 23;
-  idx_ClientesGRUPO_CLIENTE = 24;
-  idx_ClientesNOMBRE_COMERCIAL = 25;
-  idx_ClientesVENCIMIENTO_FACTURAS_1 = 26;
-  idx_ClientesVENCIMIENTO_FACTURAS_2 = 27;
-  idx_ClientesVENCIMIENTO_FACTURAS_3 = 28;
-  idx_ClientesBLOQUEADO = 29;
-  idx_ClientesREGIMEN_IVA = 30;
-  idx_ClientesMOTIVO_BLOQUEO = 31;
-  idx_ClientesRECARGO_EQUIVALENCIA = 32;
-  idx_ClientesID_TIPO_IVA = 33;
-  idx_ClientesID_FORMA_PAGO = 34;
-  idx_ClientesTIENDA_WEB = 35;
-  idx_ClientesDESCUENTO = 36;
-  idx_ClientesDESCUENTO2 = 37;
-  idx_ClientesFELICITACION = 38;
+  idx_ClientesID_AGENTE = 24;
+  idx_ClientesGRUPO_CLIENTE = 25;
+  idx_ClientesNOMBRE_COMERCIAL = 26;
+  idx_ClientesVENCIMIENTO_FACTURAS_1 = 27;
+  idx_ClientesVENCIMIENTO_FACTURAS_2 = 28;
+  idx_ClientesVENCIMIENTO_FACTURAS_3 = 29;
+  idx_ClientesBLOQUEADO = 30;
+  idx_ClientesREGIMEN_IVA = 31;
+  idx_ClientesMOTIVO_BLOQUEO = 32;
+  idx_ClientesRECARGO_EQUIVALENCIA = 33;
+  idx_ClientesID_TIPO_IVA = 34;
+  idx_ClientesID_FORMA_PAGO = 35;
+  idx_ClientesTIENDA_WEB = 36;
+  idx_ClientesDESCUENTO = 37;
+  idx_ClientesDESCUENTO2 = 38;
+  idx_ClientesFELICITACION = 39;
 
   { Proveedores fields }
   fld_ProveedoresID = 'ID';
@@ -563,7 +565,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{A35A8745-1A25-43A0-B705-6E13F0D74A27}']
+  ['{6FFD15FA-F03C-4A70-9869-849498EF548F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -874,7 +876,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{FAAEE2D3-FB05-47AD-8948-E82168F803B6}']
+  ['{88D32187-D7D2-4E4A-8B19-CBDE9C92DC95}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -921,7 +923,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{14B854C7-B106-4620-9E3C-4C7346C1F185}']
+  ['{D0179233-B497-4F75-8DD3-D735B6AD3DCE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1052,7 +1054,7 @@ type
 
   { IVendedores }
   IVendedores = interface(IDAStronglyTypedDataTable)
-  ['{2BA78472-22B6-4544-874D-7C9F7FA3D9AC}']
+  ['{3F7AD4D0-A0A7-4CBD-945E-9C09D256F985}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1375,7 +1377,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{E76A366B-DE63-4C0C-8634-103DA9C2858E}']
+  ['{13CA3422-D066-4E6E-BC73-CD524DE9B38B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1472,6 +1474,10 @@ type
     procedure SetPAISValue(const aValue: String);
     function GetPAISIsNull: Boolean;
     procedure SetPAISIsNull(const aValue: Boolean);
+    function GetID_AGENTEValue: Integer;
+    procedure SetID_AGENTEValue(const aValue: Integer);
+    function GetID_AGENTEIsNull: Boolean;
+    procedure SetID_AGENTEIsNull(const aValue: Boolean);
     function GetGRUPO_CLIENTEValue: String;
     procedure SetGRUPO_CLIENTEValue(const aValue: String);
     function GetGRUPO_CLIENTEIsNull: Boolean;
@@ -1583,6 +1589,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property PAIS: String read GetPAISValue write SetPAISValue;
     property PAISIsNull: Boolean read GetPAISIsNull write SetPAISIsNull;
+    property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue;
+    property ID_AGENTEIsNull: Boolean read GetID_AGENTEIsNull write SetID_AGENTEIsNull;
     property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue;
     property GRUPO_CLIENTEIsNull: Boolean read GetGRUPO_CLIENTEIsNull write SetGRUPO_CLIENTEIsNull;
     property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue;
@@ -1717,6 +1725,10 @@ type
     procedure SetPAISValue(const aValue: String); virtual;
     function GetPAISIsNull: Boolean; virtual;
     procedure SetPAISIsNull(const aValue: Boolean); virtual;
+    function GetID_AGENTEValue: Integer; virtual;
+    procedure SetID_AGENTEValue(const aValue: Integer); virtual;
+    function GetID_AGENTEIsNull: Boolean; virtual;
+    procedure SetID_AGENTEIsNull(const aValue: Boolean); virtual;
     function GetGRUPO_CLIENTEValue: String; virtual;
     procedure SetGRUPO_CLIENTEValue(const aValue: String); virtual;
     function GetGRUPO_CLIENTEIsNull: Boolean; virtual;
@@ -1827,6 +1839,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property PAIS: String read GetPAISValue write SetPAISValue;
     property PAISIsNull: Boolean read GetPAISIsNull write SetPAISIsNull;
+    property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue;
+    property ID_AGENTEIsNull: Boolean read GetID_AGENTEIsNull write SetID_AGENTEIsNull;
     property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue;
     property GRUPO_CLIENTEIsNull: Boolean read GetGRUPO_CLIENTEIsNull write SetGRUPO_CLIENTEIsNull;
     property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue;
@@ -1866,7 +1880,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{69281F58-47C5-447A-811E-27BAE8C96B1A}']
+  ['{09C19974-2929-4FA3-9C2E-81C86D19A192}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2333,7 +2347,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{9225D67C-D954-4519-BB62-C8FB0EFB9C72}']
+  ['{2A6F4FA5-EACD-4B61-855C-FB78AF8AB97F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2764,7 +2778,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{FABA6DB9-4D4A-4D85-B09D-8E276690BBEE}']
+  ['{34A6F19A-C8EC-4868-95DE-A9EF058BCDA3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2979,7 +2993,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{B9D08C3F-73DF-40A9-8276-51CE26BA7E11}']
+  ['{A5743C5A-DADA-4A63-8741-5AC78A7E45D2}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3062,7 +3076,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{8EDC5230-73EE-4212-83F1-881C5F46E504}']
+  ['{649EDBC4-FD69-4670-AFFB-2C573641E8A8}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3109,7 +3123,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{A9B3167E-EF15-42F4-AAD7-2E195697345A}']
+  ['{1ED96515-2619-4578-B181-09164CB0A100}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3156,7 +3170,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{983F8897-1B60-47CE-A029-A58FB45854C0}']
+  ['{8E91D71D-F232-4050-A268-ECEB26CE6A62}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3443,7 +3457,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{476A9822-5CC7-45FB-BEB1-66DB796FA07A}']
+  ['{3DFCEC34-6845-4EC6-8A19-BA53BE6B364C}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -3478,7 +3492,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{0B27EF2B-D61E-4CDE-AEAF-AF2F3275D15D}']
+  ['{3FFC0F30-8945-4562-817B-36840D881863}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3513,7 +3527,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{F8B934DE-AE4E-4C28-90B2-7D81DA8A43FA}']
+  ['{DE1EDF09-B74A-477F-B8E9-5B41210E97F0}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -5502,6 +5516,27 @@ begin
     DataTable.Fields[idx_ClientesPAIS].AsVariant := Null;
 end;
 
+function TClientesDataTableRules.GetID_AGENTEValue: Integer;
+begin
+  result := DataTable.Fields[idx_ClientesID_AGENTE].AsInteger;
+end;
+
+procedure TClientesDataTableRules.SetID_AGENTEValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_ClientesID_AGENTE].AsInteger := aValue;
+end;
+
+function TClientesDataTableRules.GetID_AGENTEIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesID_AGENTE].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetID_AGENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesID_AGENTE].AsVariant := Null;
+end;
+
 function TClientesDataTableRules.GetGRUPO_CLIENTEValue: String;
 begin
   result := DataTable.Fields[idx_ClientesGRUPO_CLIENTE].AsString;
diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
index dcfd43c..85e3214 100644
--- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
@@ -9,26 +9,26 @@ 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_ContactosDelta = '{D6DB0142-BEA4-4DC0-B44D-42008D833687}';
-  RID_GruposClienteDelta = '{E6162081-3DD9-48ED-91A1-8BD0F798707B}';
-  RID_DatosBancariosDelta = '{C18FF453-BFAF-4639-A681-AB04B74D6517}';
-  RID_VendedoresDelta = '{5D018AE5-CDFF-48F1-A1DE-7767FC7DB308}';
-  RID_ClientesDelta = '{FADEA8D9-97E9-4309-A11D-07D6E35D08B8}';
-  RID_ProveedoresDelta = '{E7B3535A-B1BA-4926-AE46-BDD885A62B44}';
-  RID_EmpleadosDelta = '{3768A3D0-2DBE-4A8A-A120-64D68A76B527}';
-  RID_DireccionesContactoDelta = '{8210370B-075D-42EC-B0FE-C500A85C1E49}';
-  RID_ClientesDescuentosDelta = '{20831A5F-CC5C-4301-BC5E-9D2DD8A77A60}';
-  RID_GruposProveedorDelta = '{7F668480-9D2B-48D4-8DDE-506796230F77}';
-  RID_GruposEmpleadoDelta = '{7AB05FA7-9124-4A83-89B4-79B348BA09CA}';
-  RID_Contactos_RefreshDelta = '{4184B8C3-2380-46D4-AA92-8128EE40E17B}';
-  RID_ContratosEmpleadosDelta = '{6A832332-537B-4FD9-A618-5D40690AEDB5}';
-  RID_DescripcionesProveedoresDelta = '{366EAA53-20C7-4B8C-846C-480DF1C4A4FF}';
-  RID_PersonalContactoDelta = '{E71E7008-5A1D-43BE-98E9-50AB8CB8418B}';
+  RID_ContactosDelta = '{35EC5BF8-126B-441D-B145-43D38FF03722}';
+  RID_GruposClienteDelta = '{27C3BC18-CFA9-4E9E-85F3-F431159A9EB9}';
+  RID_DatosBancariosDelta = '{DF8C8BF9-7D6F-4650-8913-8A888C23E120}';
+  RID_VendedoresDelta = '{A6E192F4-3421-443D-958F-A48C8F6731CE}';
+  RID_ClientesDelta = '{0548B10F-D93E-4B76-AA9B-51BFBC04921B}';
+  RID_ProveedoresDelta = '{16295798-804B-490B-8E29-212CE00362DA}';
+  RID_EmpleadosDelta = '{3C707336-4534-4AAB-9559-1D77997CF19E}';
+  RID_DireccionesContactoDelta = '{3959A09C-3EEA-4DCB-8A49-0D2B2AE9C72C}';
+  RID_ClientesDescuentosDelta = '{52224EF5-FDD9-4AA7-B5BE-4A529BD7F2B8}';
+  RID_GruposProveedorDelta = '{57A6B910-1DCC-4EB1-BFC1-59F07F6CA76B}';
+  RID_GruposEmpleadoDelta = '{FE643621-8089-483A-9829-C94F4224CD54}';
+  RID_Contactos_RefreshDelta = '{9DF96FDB-21E2-44F1-93BC-F4C8E9B09720}';
+  RID_ContratosEmpleadosDelta = '{A84D6F08-40EE-46F9-B53E-D6B2AC27F76B}';
+  RID_DescripcionesProveedoresDelta = '{BED04FB6-DC23-4AB4-BD23-3CBE23CB4E65}';
+  RID_PersonalContactoDelta = '{59A67125-C3DE-4410-BD18-D5267708A007}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{D6DB0142-BEA4-4DC0-B44D-42008D833687}']
+  ['{35EC5BF8-126B-441D-B145-43D38FF03722}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -339,7 +339,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{E6162081-3DD9-48ED-91A1-8BD0F798707B}']
+  ['{27C3BC18-CFA9-4E9E-85F3-F431159A9EB9}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -385,7 +385,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{C18FF453-BFAF-4639-A681-AB04B74D6517}']
+  ['{DF8C8BF9-7D6F-4650-8913-8A888C23E120}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -515,7 +515,7 @@ type
 
   { IVendedoresDelta }
   IVendedoresDelta = interface(IVendedores)
-  ['{5D018AE5-CDFF-48F1-A1DE-7767FC7DB308}']
+  ['{A6E192F4-3421-443D-958F-A48C8F6731CE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -838,7 +838,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{FADEA8D9-97E9-4309-A11D-07D6E35D08B8}']
+  ['{0548B10F-D93E-4B76-AA9B-51BFBC04921B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -864,6 +864,7 @@ type
     function GetOldID_EMPRESAValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldPAISValue : String;
+    function GetOldID_AGENTEValue : Integer;
     function GetOldGRUPO_CLIENTEValue : String;
     function GetOldNOMBRE_COMERCIALValue : String;
     function GetOldVENCIMIENTO_FACTURAS_1Value : SmallInt;
@@ -905,6 +906,7 @@ type
     property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldPAIS : String read GetOldPAISValue;
+    property OldID_AGENTE : Integer read GetOldID_AGENTEValue;
     property OldGRUPO_CLIENTE : String read GetOldGRUPO_CLIENTEValue;
     property OldNOMBRE_COMERCIAL : String read GetOldNOMBRE_COMERCIALValue;
     property OldVENCIMIENTO_FACTURAS_1 : SmallInt read GetOldVENCIMIENTO_FACTURAS_1Value;
@@ -1072,6 +1074,12 @@ type
     function GetOldPAISIsNull: Boolean; virtual;
     procedure SetPAISValue(const aValue: String); virtual;
     procedure SetPAISIsNull(const aValue: Boolean); virtual;
+    function GetID_AGENTEValue: Integer; virtual;
+    function GetID_AGENTEIsNull: Boolean; virtual;
+    function GetOldID_AGENTEValue: Integer; virtual;
+    function GetOldID_AGENTEIsNull: Boolean; virtual;
+    procedure SetID_AGENTEValue(const aValue: Integer); virtual;
+    procedure SetID_AGENTEIsNull(const aValue: Boolean); virtual;
     function GetGRUPO_CLIENTEValue: String; virtual;
     function GetGRUPO_CLIENTEIsNull: Boolean; virtual;
     function GetOldGRUPO_CLIENTEValue: String; virtual;
@@ -1260,6 +1268,10 @@ type
     property PAISIsNull : Boolean read GetPAISIsNull write SetPAISIsNull;
     property OldPAIS : String read GetOldPAISValue;
     property OldPAISIsNull : Boolean read GetOldPAISIsNull;
+    property ID_AGENTE : Integer read GetID_AGENTEValue write SetID_AGENTEValue;
+    property ID_AGENTEIsNull : Boolean read GetID_AGENTEIsNull write SetID_AGENTEIsNull;
+    property OldID_AGENTE : Integer read GetOldID_AGENTEValue;
+    property OldID_AGENTEIsNull : Boolean read GetOldID_AGENTEIsNull;
     property GRUPO_CLIENTE : String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue;
     property GRUPO_CLIENTEIsNull : Boolean read GetGRUPO_CLIENTEIsNull write SetGRUPO_CLIENTEIsNull;
     property OldGRUPO_CLIENTE : String read GetOldGRUPO_CLIENTEValue;
@@ -1329,7 +1341,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{E7B3535A-B1BA-4926-AE46-BDD885A62B44}']
+  ['{16295798-804B-490B-8E29-212CE00362DA}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1796,7 +1808,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{3768A3D0-2DBE-4A8A-A120-64D68A76B527}']
+  ['{3C707336-4534-4AAB-9559-1D77997CF19E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -2231,7 +2243,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{8210370B-075D-42EC-B0FE-C500A85C1E49}']
+  ['{3959A09C-3EEA-4DCB-8A49-0D2B2AE9C72C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2446,7 +2458,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{20831A5F-CC5C-4301-BC5E-9D2DD8A77A60}']
+  ['{52224EF5-FDD9-4AA7-B5BE-4A529BD7F2B8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2528,7 +2540,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{7F668480-9D2B-48D4-8DDE-506796230F77}']
+  ['{57A6B910-1DCC-4EB1-BFC1-59F07F6CA76B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2574,7 +2586,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{7AB05FA7-9124-4A83-89B4-79B348BA09CA}']
+  ['{FE643621-8089-483A-9829-C94F4224CD54}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2620,7 +2632,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{4184B8C3-2380-46D4-AA92-8128EE40E17B}']
+  ['{9DF96FDB-21E2-44F1-93BC-F4C8E9B09720}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2907,7 +2919,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{6A832332-537B-4FD9-A618-5D40690AEDB5}']
+  ['{A84D6F08-40EE-46F9-B53E-D6B2AC27F76B}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2941,7 +2953,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{366EAA53-20C7-4B8C-846C-480DF1C4A4FF}']
+  ['{BED04FB6-DC23-4AB4-BD23-3CBE23CB4E65}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2975,7 +2987,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{E71E7008-5A1D-43BE-98E9-50AB8CB8418B}']
+  ['{59A67125-C3DE-4410-BD18-D5267708A007}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -5807,6 +5819,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesPAIS] := Null;
 end;
 
+function TClientesBusinessProcessorRules.GetID_AGENTEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID_AGENTE];
+end;
+
+function TClientesBusinessProcessorRules.GetID_AGENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID_AGENTE]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldID_AGENTEValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesID_AGENTE];
+end;
+
+function TClientesBusinessProcessorRules.GetOldID_AGENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesID_AGENTE]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetID_AGENTEValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID_AGENTE] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetID_AGENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID_AGENTE] := Null;
+end;
+
 function TClientesBusinessProcessorRules.GetGRUPO_CLIENTEValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesGRUPO_CLIENTE];
diff --git a/Source/Modulos/Contactos/Model/uBizClientesServer.pas b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
index 4984e74..455c797 100644
--- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
@@ -81,7 +81,7 @@ begin
     with ACommand do
     begin
       ParamByName('ID_CLIENTE').Value := aChange.NewValueByName[fld_ClientesID];
-//      ParamByName('ID_AGENTE').Value := aChange.NewValueByName[fld_ClientesID_AGENTE];
+      ParamByName('ID_AGENTE').Value := aChange.NewValueByName[fld_ClientesID_AGENTE];
       ParamByName('GRUPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesGRUPO_CLIENTE];
       ParamByName('NOMBRE_COMERCIAL').Value := aChange.NewValueByName[fld_ClientesNOMBRE_COMERCIAL];
       ParamByName('BLOQUEADO').Value := aChange.NewValueByName[fld_ClientesBLOQUEADO];
@@ -96,7 +96,7 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_1];
       ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_2];
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
-      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];      
+      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
       Execute;
     end;
   finally
@@ -122,7 +122,7 @@ begin
     begin
       ParamByName('OLD_ID_CLIENTE').Value := aChange.OldValueByName[fld_ClientesID];
       ParamByName('ID_CLIENTE').Value := aChange.NewValueByName[fld_ClientesID];
-//      ParamByName('ID_AGENTE').Value := aChange.NewValueByName[fld_ClientesID_AGENTE];
+      ParamByName('ID_AGENTE').Value := aChange.NewValueByName[fld_ClientesID_AGENTE];
       ParamByName('GRUPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesGRUPO_CLIENTE];
       ParamByName('NOMBRE_COMERCIAL').Value := aChange.NewValueByName[fld_ClientesNOMBRE_COMERCIAL];
       ParamByName('BLOQUEADO').Value := aChange.NewValueByName[fld_ClientesBLOQUEADO];
@@ -133,11 +133,11 @@ begin
       ParamByName('ID_FORMA_PAGO').Value := aChange.NewValueByName[fld_ClientesID_FORMA_PAGO];
       ParamByName('TIENDA_WEB').Value := aChange.NewValueByName[fld_ClientesTIENDA_WEB];
       ParamByName('DESCUENTO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO];
-      ParamByName('DESCUENTO2').Value := aChange.NewValueByName[fld_ClientesDESCUENTO2];      
+      ParamByName('DESCUENTO2').Value := aChange.NewValueByName[fld_ClientesDESCUENTO2];
       ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_1];
       ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_2];
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
-      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];     
+      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
 
       Execute;
     end;
diff --git a/Source/Modulos/Contactos/Plugin/Contactos_plugin.drc b/Source/Modulos/Contactos/Plugin/Contactos_plugin.drc
index 2656260..14c6890 100644
--- a/Source/Modulos/Contactos/Plugin/Contactos_plugin.drc
+++ b/Source/Modulos/Contactos/Plugin/Contactos_plugin.drc
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Plugin\uPluginContactos.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Plugin\Contactos_plugin.res */
-/* E:\temp\dtf669.tmp */
+/* E:\temp\dtf475.tmp */
diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
index 9eca65b..8f6bfa7 100644
--- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
+++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
@@ -817,6 +817,10 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'DESCUENTO2'
                 TableField = 'DESCUENTO2'
+              end
+              item
+                DatasetField = 'ID_AGENTE'
+                TableField = 'ID_AGENTE'
               end>
           end>
         Name = 'Clientes'
@@ -961,6 +965,10 @@ object srvContactos: TsrvContactos
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'ID_AGENTE'
+            DataType = datInteger
+          end
           item
             Name = 'GRUPO_CLIENTE'
             DataType = datString
@@ -3131,6 +3139,11 @@ object srvContactos: TsrvContactos
             Name = 'FELICITACION'
             DataType = datSmallInt
             Value = ''
+          end
+          item
+            Name = 'ID_AGENTE'
+            DataType = datInteger
+            Value = ''
           end>
         Statements = <
           item
@@ -3141,12 +3154,12 @@ object srvContactos: TsrvContactos
               'ARGO_EQUIVALENCIA, NOMBRE_COMERCIAL,'#10'     BLOQUEADO, MOTIVO_BLOQ' +
               'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO,'#10'     TIENDA_WEB, D' +
               'ESCUENTO, DESCUENTO2,'#10'     VENCIMIENTO_FACTURAS_1, VENCIMIENTO_F' +
-              'ACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10'     FELICITACION)'#10'  VALUES'#10' ' +
-              '   (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_' +
-              'COMERCIAL,'#10'     :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_T' +
-              'IPO_IVA, :ID_FORMA_PAGO,'#10'     :TIENDA_WEB, :DESCUENTO, :DESCUENT' +
-              'O2,'#10'     :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENC' +
-              'IMIENTO_FACTURAS_3,'#10'     :FELICITACION)'#10
+              'ACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10'     FELICITACION, ID_AGENTE)' +
+              #10'  VALUES'#10'    (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCI' +
+              'A, :NOMBRE_COMERCIAL,'#10'     :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN' +
+              '_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO,'#10'     :TIENDA_WEB, :DESCUENTO' +
+              ', :DESCUENTO2,'#10'     :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTUR' +
+              'AS_2, :VENCIMIENTO_FACTURAS_3,'#10'     :FELICITACION, :ID_AGENTE)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3332,6 +3345,11 @@ object srvContactos: TsrvContactos
             DataType = datSmallInt
             Value = ''
           end
+          item
+            Name = 'ID_AGENTE'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'OLD_ID_CLIENTE'
             Value = ''
@@ -3350,8 +3368,9 @@ object srvContactos: TsrvContactos
               '    DESCUENTO = :DESCUENTO,'#10'    DESCUENTO2 = :DESCUENTO2,'#10'    VE' +
               'NCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10'    VENCIMIENTO_' +
               'FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10'    VENCIMIENTO_FACTURAS_3' +
-              ' = :VENCIMIENTO_FACTURAS_3,'#10'    FELICITACION = :FELICITACION'#10'  W' +
-              'HERE'#10'    (ID_CLIENTE = :OLD_ID_CLIENTE)'#10
+              ' = :VENCIMIENTO_FACTURAS_3,'#10'    FELICITACION = :FELICITACION,'#10'  ' +
+              '  ID_AGENTE = :ID_AGENTE'#10'  WHERE'#10'    (ID_CLIENTE = :OLD_ID_CLIEN' +
+              'TE)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index 07bb40d..bacb089 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,63 +49,63 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\adortl.dcp" />
-    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="..\bdertl.dcp" />
-    <DCCReference Include="..\ccpackD11.dcp" />
-    <DCCReference Include="..\cfpack_d11.dcp" />
-    <DCCReference Include="..\Contactos_controller.dcp" />
-    <DCCReference Include="..\Contactos_model.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="..\dclcxLibraryD11.dcp" />
-    <DCCReference Include="..\designide.dcp" />
-    <DCCReference Include="..\dsnap.dcp" />
-    <DCCReference Include="..\dxComnD11.dcp" />
-    <DCCReference Include="..\dxCoreD11.dcp" />
-    <DCCReference Include="..\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\dxPSLnksD11.dcp" />
-    <DCCReference Include="..\dxThemeD11.dcp" />
-    <DCCReference Include="..\FormasPago_controller.dcp" />
-    <DCCReference Include="..\FormasPago_model.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Jcl.dcp" />
-    <DCCReference Include="..\JclVcl.dcp" />
-    <DCCReference Include="..\JSDialog100.dcp" />
-    <DCCReference Include="..\JvCoreD11R.dcp" />
-    <DCCReference Include="..\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\JvSystemD11R.dcp" />
-    <DCCReference Include="..\PngComponentsD10.dcp" />
-    <DCCReference Include="..\PNG_D10.dcp" />
-    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\tb2k_d10.dcp" />
-    <DCCReference Include="..\tbx_d10.dcp" />
-    <DCCReference Include="..\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\TiposIVA_model.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
-    <DCCReference Include="..\vclactnband.dcp" />
-    <DCCReference Include="..\vcldb.dcp" />
-    <DCCReference Include="..\vcljpg.dcp" />
-    <DCCReference Include="..\vclshlctrls.dcp" />
-    <DCCReference Include="..\vclx.dcp" />
-    <DCCReference Include="..\xmlrtl.dcp" />
+    <DCCReference Include="..\Model\adortl.dcp" />
+    <DCCReference Include="..\Model\ApplicationBase.dcp" />
+    <DCCReference Include="..\Model\Base.dcp" />
+    <DCCReference Include="..\Model\bdertl.dcp" />
+    <DCCReference Include="..\Model\ccpackD11.dcp" />
+    <DCCReference Include="..\Model\cfpack_d11.dcp" />
+    <DCCReference Include="..\Model\Contactos_controller.dcp" />
+    <DCCReference Include="..\Model\Contactos_model.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\dclcxLibraryD11.dcp" />
+    <DCCReference Include="..\Model\designide.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\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Model\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Model\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Model\dxPSLnksD11.dcp" />
+    <DCCReference Include="..\Model\dxThemeD11.dcp" />
+    <DCCReference Include="..\Model\FormasPago_controller.dcp" />
+    <DCCReference Include="..\Model\FormasPago_model.dcp" />
+    <DCCReference Include="..\Model\GUIBase.dcp" />
+    <DCCReference Include="..\Model\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Model\Jcl.dcp" />
+    <DCCReference Include="..\Model\JclVcl.dcp" />
+    <DCCReference Include="..\Model\JSDialog100.dcp" />
+    <DCCReference Include="..\Model\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Model\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Model\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Model\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Model\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Model\JvSystemD11R.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\tb2k_d10.dcp" />
+    <DCCReference Include="..\Model\tbx_d10.dcp" />
+    <DCCReference Include="..\Model\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\Model\TiposIVA_model.dcp" />
+    <DCCReference Include="..\Model\vcl.dcp" />
+    <DCCReference Include="..\Model\vclactnband.dcp" />
+    <DCCReference Include="..\Model\vcldb.dcp" />
+    <DCCReference Include="..\Model\vcljpg.dcp" />
+    <DCCReference Include="..\Model\vclshlctrls.dcp" />
+    <DCCReference Include="..\Model\vclx.dcp" />
+    <DCCReference Include="..\Model\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.drc b/Source/Modulos/Contactos/Views/Contactos_view.drc
index 4257f4b..6f96a1f 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.drc
+++ b/Source/Modulos/Contactos/Views/Contactos_view.drc
@@ -56,4 +56,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDatosYSeleccionCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDatosYSeleccionClienteBase.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\Contactos_view.res */
-/* E:\temp\dtf667.tmp */
+/* E:\temp\dtf473.tmp */
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index 80b3354..77eb377 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -470,7 +470,7 @@ inherited fEditorCliente: TfEditorCliente
         Left = 0
         Top = 0
         Width = 778
-        Height = 209
+        Height = 261
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -481,7 +481,7 @@ inherited fEditorCliente: TfEditorCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 778
-        ExplicitHeight = 209
+        ExplicitHeight = 261
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 778
           LookAndFeel = dxLayoutOfficeLookAndFeel
@@ -500,6 +500,12 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitTop = 138
             ExplicitWidth = 263
           end
+          inherited Bevel3: TBevel
+            Top = 203
+            Width = 385
+            ExplicitTop = 203
+            ExplicitWidth = 385
+          end
           inherited eDiasVencimiento1: TcxDBSpinEdit
             Left = 596
             Top = 62
@@ -598,6 +604,16 @@ inherited fEditorCliente: TfEditorCliente
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 176
           end
+          inherited eVendedor: TcxDBLookupComboBox
+            Top = 214
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 214
+            ExplicitWidth = 165
+            Width = 165
+          end
         end
       end
     end
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
index 1091ec8..5a011f5 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
@@ -1,22 +1,29 @@
 inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
-  Width = 725
-  Height = 226
+  Width = 732
+  Height = 253
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
-  ExplicitWidth = 725
-  ExplicitHeight = 226
+  ExplicitWidth = 732
+  ExplicitHeight = 253
+  object Bevel2: TBevel
+    Left = 22
+    Top = 136
+    Width = 385
+    Height = 5
+    Shape = bsBottomLine
+  end
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 725
-    Height = 217
+    Width = 732
+    Height = 255
     Align = alTop
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
     object Label1: TLabel
-      Left = 447
+      Left = 466
       Top = 28
       Width = 227
       Height = 26
@@ -33,8 +40,15 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Height = 5
       Shape = bsBottomLine
     end
+    object Bevel3: TBevel
+      Left = 22
+      Top = 201
+      Width = 385
+      Height = 5
+      Shape = bsBottomLine
+    end
     object eDiasVencimiento1: TcxDBSpinEdit
-      Left = 519
+      Left = 538
       Top = 60
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_1'
       DataBinding.DataSource = dsDatosComerciales
@@ -58,7 +72,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 9
       Width = 79
     end
     object cbRegimenIVA: TcxDBComboBox
@@ -154,7 +168,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 121
     end
     object bFormasPago: TButton
-      Left = 285
+      Left = 304
       Top = 55
       Width = 132
       Height = 21
@@ -198,7 +212,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 121
     end
     object bTiposIVA: TButton
-      Left = 285
+      Left = 304
       Top = 82
       Width = 132
       Height = 21
@@ -233,7 +247,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 190
     end
     object eDiasVencimiento2: TcxDBSpinEdit
-      Left = 519
+      Left = 538
       Top = 87
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_2'
       DataBinding.DataSource = dsDatosComerciales
@@ -256,11 +270,11 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 10
       Width = 79
     end
     object eDiasVencimiento3: TcxDBSpinEdit
-      Left = 519
+      Left = 538
       Top = 114
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS_3'
       DataBinding.DataSource = dsDatosComerciales
@@ -283,7 +297,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 11
       Width = 79
     end
     object eDescuento2: TcxDBSpinEdit
@@ -312,6 +326,41 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       TabOrder = 7
       Width = 190
     end
+    object eVendedor: TcxDBLookupComboBox
+      Left = 114
+      Top = 212
+      DataBinding.DataField = 'ID_AGENTE'
+      DataBinding.DataSource = dsDatosComerciales
+      Properties.ImmediatePost = True
+      Properties.KeyFieldNames = 'ID'
+      Properties.ListColumns = <
+        item
+          FieldName = 'NOMBRE'
+        end>
+      Properties.ListOptions.GridLines = glNone
+      Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
+      Properties.ListSource = dsVendedores
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 8
+      Width = 165
+    end
     object dxLayoutGroup1: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -394,6 +443,15 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
           Control = eDescuento2
           ControlOptions.ShowBorder = False
         end
+        object dxLayoutControl1Item15: TdxLayoutItem
+          Control = Bevel3
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item14: TdxLayoutItem
+          Caption = 'Vendedor:'
+          Control = eVendedor
+          ControlOptions.ShowBorder = False
+        end
       end
       object dxLayoutControl1Group5: TdxLayoutGroup
         AutoAligns = [aaVertical]
@@ -429,7 +487,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       end
     end
   end
-  object dsAgentes: TDADataSource
+  object dsVendedores: TDADataSource
     Left = 40
     Top = 8
   end
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
index d00fe72..e3ddb80 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
@@ -8,7 +8,7 @@ uses
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
   uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
-  uDAInterfaces, uBizFormasPago, uBizTiposIVA, ExtCtrls; 
+  uDAInterfaces, uBizFormasPago, uBizTiposIVA, ExtCtrls, uVendedoresController; 
 
 type
   IViewClienteDatosComerciales = interface(IViewBase)
@@ -22,7 +22,7 @@ type
     dxLayoutControl1: TdxLayoutControl;
     dxLayoutGroup1: TdxLayoutGroup;
     dxLayoutControl1Group3: TdxLayoutGroup;
-    dsAgentes: TDADataSource;
+    dsVendedores: TDADataSource;
     dxLayoutControl1Item2: TdxLayoutItem;
     eDiasVencimiento1: TcxDBSpinEdit;
     dxLayoutControl1Item3: TdxLayoutItem;
@@ -55,6 +55,11 @@ type
     eDiasVencimiento3: TcxDBSpinEdit;
     dxLayoutControl1Item13: TdxLayoutItem;
     eDescuento2: TcxDBSpinEdit;
+    dxLayoutControl1Item14: TdxLayoutItem;
+    eVendedor: TcxDBLookupComboBox;
+    Bevel2: TBevel;
+    dxLayoutControl1Item15: TdxLayoutItem;
+    Bevel3: TBevel;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure cbRegimenIVAPropertiesInitPopup(Sender: TObject);
@@ -64,8 +69,10 @@ type
     FContacto : IBizContacto;
     FTiposIVA : IBizTipoIVA;
     FFormasPago : IBizFormaPago;
+    FVendedores : IBizContacto;
     FFormasPagoController : IFormasPagoController;
     FTiposIVAController : ITiposIVAController;
+    FVendedoresController : IVendedoresController;
     function GetContacto: IBizContacto;
     procedure SetContacto(const Value: IBizContacto);
   public
@@ -113,7 +120,8 @@ begin
   FTiposIVA := Nil;
   FFormasPago := Nil;
   FContacto := Nil;
-  //  FAgentesController := TAgentesController.Create;
+  FVendedores := Nil;
+  FVendedoresController := TVendedoresController.Create;
   FFormasPagoController := TFormasPagoController.Create;
   FTiposIVAController := TTiposIVAController.Create;
 end;
@@ -124,7 +132,8 @@ begin
   FTiposIVA := Nil;
   FFormasPago := Nil;
   FContacto := Nil;
-//  FAgentesController := NIL;
+  FVendedores := Nil;
+  FVendedoresController := NIL;
   FFormasPagoController := NIL;
   FTiposIVAController := NIL;
 end;
@@ -140,8 +149,9 @@ begin
   if Assigned(FContacto) then
   begin
     dsDatosComerciales.DataTable := FContacto.DataTable;
-//    dsAgentes.DataTable := FAgentesController.BuscarTodos.DataTable;
-//    dsAgentes.DataTable.Active := True;
+    FVendedores := FVendedoresController.BuscarTodos;
+    dsVendedores.DataTable := FVendedores.DataTable;
+    dsVendedores.DataTable.Active := True;
     FFormasPago := FFormasPagoController.BuscarTodos;
     dsFormaPago.DataTable := FFormasPago.DataTable;
     dsFormaPago.DataTable.Active := True;
@@ -151,7 +161,7 @@ begin
   end
   else begin
     dsDatosComerciales.DataTable := NIL;
-//    dsAgentes.DataTable := NIL;
+    dsVendedores.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
     dsTiposIVA.DataTable := NIL;
   end
diff --git a/Source/Modulos/Fabricantes/Data/Fabricantes_data.drc b/Source/Modulos/Fabricantes/Data/Fabricantes_data.drc
index 253903a..5c74322 100644
--- a/Source/Modulos/Fabricantes/Data/Fabricantes_data.drc
+++ b/Source/Modulos/Fabricantes/Data/Fabricantes_data.drc
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Data\uDataModuleFabricantes.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Data\Fabricantes_data.res */
-/* E:\temp\dtf677.tmp */
+/* E:\temp\dtf483.tmp */
diff --git a/Source/Modulos/Fabricantes/Model/Fabricantes_model.drc b/Source/Modulos/Fabricantes/Model/Fabricantes_model.drc
index c80c673..0592778 100644
--- a/Source/Modulos/Fabricantes/Model/Fabricantes_model.drc
+++ b/Source/Modulos/Fabricantes/Model/Fabricantes_model.drc
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Model\Fabricantes_model.res */
-/* E:\temp\dtf675.tmp */
+/* E:\temp\dtf481.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas
index 63df8b8..051aa2e 100644
--- a/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas	
+++ b/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas	
@@ -177,7 +177,7 @@ begin
 //de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
   if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
      if Assigned(AArticulos) then
-       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
+       ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO
      else
        ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
 end;
diff --git a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc
index 815c87a..820988c 100644
--- a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc	
+++ b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc	
@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.DFM */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.res */
-/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.drf */
+/* E:\temp\dtf4CF.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
index fba20f9..ac7fb6c 100644
--- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm	
@@ -199,11 +199,9 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
         DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
       end
       item
-        Name = 'CLIENTE_FINAL'
+        Name = 'PERSONA_CONTACTO'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Cliente final'
-        DictionaryEntry = 'FacturasCliente_CLIENTE_FINAL'
       end
       item
         Name = 'FECHA_ALTA'
diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc
index 76897df..92de1c5 100644
--- a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc	
+++ b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.res */
-/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.drf */
+/* E:\temp\dtf4CD.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.identcache b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.identcache
index 36ae8b140e55422e14498b7886023e80fa70d451..f98b05777e1a2aa2562b85ada2498f7725c2ad44 100644
GIT binary patch
delta 24
gcmey*@}Gr~Z89fQ+2loxS(BX@6DHnHpU83@0Bnj0Hvj+t

delta 23
fcmey*@}Gr~ZSqpaTaz6b(<eSmm{^`Qk);>_bOZ^h

diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index c196b21..b238d92 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
@@ -3,15 +3,15 @@ unit schFacturasClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 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 = '{E39059AE-B71C-4FC8-8DD3-81EBB5116E6B}';
-  RID_FacturasCliente = '{287DAE4D-3DFA-4253-B9B5-0462FEAC4ED5}';
-  RID_FacturasCliente_Detalles = '{FA5F5870-5B02-450A-A71C-EB3E455AFA75}';
+  RID_ListaAnosFacturas = '{18E3B38E-05CB-4C64-875A-E3E8DD826B4A}';
+  RID_FacturasCliente = '{72415424-F8B7-4DD5-9212-36B4CD96E0E5}';
+  RID_FacturasCliente_Detalles = '{9C3C3304-5F29-463A-8363-DF71466BD707}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -52,7 +52,7 @@ const
   fld_FacturasClientePROVINCIA = 'PROVINCIA';
   fld_FacturasClienteCODIGO_POSTAL = 'CODIGO_POSTAL';
   fld_FacturasClienteDATOS_BANCARIOS = 'DATOS_BANCARIOS';
-  fld_FacturasClienteCLIENTE_FINAL = 'CLIENTE_FINAL';
+  fld_FacturasClientePERSONA_CONTACTO = 'PERSONA_CONTACTO';
   fld_FacturasClienteFECHA_ALTA = 'FECHA_ALTA';
   fld_FacturasClienteFECHA_MODIFICACION = 'FECHA_MODIFICACION';
   fld_FacturasClienteUSUARIO = 'USUARIO';
@@ -96,7 +96,7 @@ const
   idx_FacturasClientePROVINCIA = 24;
   idx_FacturasClienteCODIGO_POSTAL = 25;
   idx_FacturasClienteDATOS_BANCARIOS = 26;
-  idx_FacturasClienteCLIENTE_FINAL = 27;
+  idx_FacturasClientePERSONA_CONTACTO = 27;
   idx_FacturasClienteFECHA_ALTA = 28;
   idx_FacturasClienteFECHA_MODIFICACION = 29;
   idx_FacturasClienteUSUARIO = 30;
@@ -149,7 +149,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{02245449-B366-4C52-BD24-21593AF9429F}']
+  ['{C395660C-71FF-4520-ACB6-39D23260DDB9}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -163,7 +163,7 @@ type
   end;
 
   { TListaAnosFacturasDataTableRules }
-  TListaAnosFacturasDataTableRules = class(TDADataTableRules, IListaAnosFacturas)
+  TListaAnosFacturasDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosFacturas)
   private
   protected
     { Property getters and setters }
@@ -184,7 +184,7 @@ type
 
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{F26DF140-07D6-46AE-9851-1882FD1CA63E}']
+  ['{BEC23A5E-4807-4786-937F-D27547B1A4EF}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -293,10 +293,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String);
     function GetDATOS_BANCARIOSIsNull: Boolean;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
-    function GetCLIENTE_FINALValue: String;
-    procedure SetCLIENTE_FINALValue(const aValue: String);
-    function GetCLIENTE_FINALIsNull: Boolean;
-    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean);
+    function GetPERSONA_CONTACTOValue: String;
+    procedure SetPERSONA_CONTACTOValue(const aValue: String);
+    function GetPERSONA_CONTACTOIsNull: Boolean;
+    procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean);
     function GetFECHA_ALTAValue: DateTime;
     procedure SetFECHA_ALTAValue(const aValue: DateTime);
     function GetFECHA_ALTAIsNull: Boolean;
@@ -410,8 +410,8 @@ type
     property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
-    property CLIENTE_FINAL: String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
-    property CLIENTE_FINALIsNull: Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
+    property PERSONA_CONTACTO: String read GetPERSONA_CONTACTOValue write SetPERSONA_CONTACTOValue;
+    property PERSONA_CONTACTOIsNull: Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull;
     property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -443,7 +443,7 @@ type
   end;
 
   { TFacturasClienteDataTableRules }
-  TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente)
+  TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -556,10 +556,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
-    function GetCLIENTE_FINALValue: String; virtual;
-    procedure SetCLIENTE_FINALValue(const aValue: String); virtual;
-    function GetCLIENTE_FINALIsNull: Boolean; virtual;
-    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean); virtual;
+    function GetPERSONA_CONTACTOValue: String; virtual;
+    procedure SetPERSONA_CONTACTOValue(const aValue: String); virtual;
+    function GetPERSONA_CONTACTOIsNull: Boolean; virtual;
+    procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean); virtual;
     function GetFECHA_ALTAValue: DateTime; virtual;
     procedure SetFECHA_ALTAValue(const aValue: DateTime); virtual;
     function GetFECHA_ALTAIsNull: Boolean; virtual;
@@ -672,8 +672,8 @@ type
     property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
-    property CLIENTE_FINAL: String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
-    property CLIENTE_FINALIsNull: Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
+    property PERSONA_CONTACTO: String read GetPERSONA_CONTACTOValue write SetPERSONA_CONTACTOValue;
+    property PERSONA_CONTACTOIsNull: Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull;
     property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -711,7 +711,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{CBAB45E2-2610-41A2-BC17-402FDAE56E26}']
+  ['{5F50A8F3-8EE1-4976-8180-A2DC77231CDC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -809,7 +809,7 @@ type
   end;
 
   { TFacturasCliente_DetallesDataTableRules }
-  TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles)
+  TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles)
   private
   protected
     { Property getters and setters }
@@ -1534,25 +1534,25 @@ begin
     DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].AsVariant := Null;
 end;
 
-function TFacturasClienteDataTableRules.GetCLIENTE_FINALValue: String;
+function TFacturasClienteDataTableRules.GetPERSONA_CONTACTOValue: String;
 begin
-  result := DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsString;
+  result := DataTable.Fields[idx_FacturasClientePERSONA_CONTACTO].AsString;
 end;
 
-procedure TFacturasClienteDataTableRules.SetCLIENTE_FINALValue(const aValue: String);
+procedure TFacturasClienteDataTableRules.SetPERSONA_CONTACTOValue(const aValue: String);
 begin
-  DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsString := aValue;
+  DataTable.Fields[idx_FacturasClientePERSONA_CONTACTO].AsString := aValue;
 end;
 
-function TFacturasClienteDataTableRules.GetCLIENTE_FINALIsNull: boolean;
+function TFacturasClienteDataTableRules.GetPERSONA_CONTACTOIsNull: boolean;
 begin
-  result := DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].IsNull;
+  result := DataTable.Fields[idx_FacturasClientePERSONA_CONTACTO].IsNull;
 end;
 
-procedure TFacturasClienteDataTableRules.SetCLIENTE_FINALIsNull(const aValue: Boolean);
+procedure TFacturasClienteDataTableRules.SetPERSONA_CONTACTOIsNull(const aValue: Boolean);
 begin
   if aValue then
-    DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsVariant := Null;
+    DataTable.Fields[idx_FacturasClientePERSONA_CONTACTO].AsVariant := Null;
 end;
 
 function TFacturasClienteDataTableRules.GetFECHA_ALTAValue: DateTime;
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
index a0894b0..11385d0 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas	
@@ -9,14 +9,14 @@ 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 = '{2F79221D-DBAF-40B5-AE82-8CA4E267AFE3}';
-  RID_FacturasClienteDelta = '{22F82387-32E0-42FB-9BCF-6AA6C11881F4}';
-  RID_FacturasCliente_DetallesDelta = '{04D705AA-0C8D-42E5-98A4-3EA9BBB35577}';
+  RID_ListaAnosFacturasDelta = '{AB07EDD0-7B38-4CC2-9C5D-2FBCD2E784AF}';
+  RID_FacturasClienteDelta = '{54580672-73BD-4949-859A-E906E7EBCD03}';
+  RID_FacturasCliente_DetallesDelta = '{F5138939-68CB-41A9-8AAF-204711F0E911}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{2F79221D-DBAF-40B5-AE82-8CA4E267AFE3}']
+  ['{AB07EDD0-7B38-4CC2-9C5D-2FBCD2E784AF}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{22F82387-32E0-42FB-9BCF-6AA6C11881F4}']
+  ['{54580672-73BD-4949-859A-E906E7EBCD03}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -79,7 +79,7 @@ type
     function GetOldPROVINCIAValue : String;
     function GetOldCODIGO_POSTALValue : String;
     function GetOldDATOS_BANCARIOSValue : String;
-    function GetOldCLIENTE_FINALValue : String;
+    function GetOldPERSONA_CONTACTOValue : String;
     function GetOldFECHA_ALTAValue : DateTime;
     function GetOldFECHA_MODIFICACIONValue : DateTime;
     function GetOldUSUARIOValue : String;
@@ -123,7 +123,7 @@ type
     property OldPROVINCIA : String read GetOldPROVINCIAValue;
     property OldCODIGO_POSTAL : String read GetOldCODIGO_POSTALValue;
     property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
-    property OldCLIENTE_FINAL : String read GetOldCLIENTE_FINALValue;
+    property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue;
     property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
     property OldUSUARIO : String read GetOldUSUARIOValue;
@@ -308,12 +308,12 @@ type
     function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
-    function GetCLIENTE_FINALValue: String; virtual;
-    function GetCLIENTE_FINALIsNull: Boolean; virtual;
-    function GetOldCLIENTE_FINALValue: String; virtual;
-    function GetOldCLIENTE_FINALIsNull: Boolean; virtual;
-    procedure SetCLIENTE_FINALValue(const aValue: String); virtual;
-    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean); virtual;
+    function GetPERSONA_CONTACTOValue: String; virtual;
+    function GetPERSONA_CONTACTOIsNull: Boolean; virtual;
+    function GetOldPERSONA_CONTACTOValue: String; virtual;
+    function GetOldPERSONA_CONTACTOIsNull: Boolean; virtual;
+    procedure SetPERSONA_CONTACTOValue(const aValue: String); virtual;
+    procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean); virtual;
     function GetFECHA_ALTAValue: DateTime; virtual;
     function GetFECHA_ALTAIsNull: Boolean; virtual;
     function GetOldFECHA_ALTAValue: DateTime; virtual;
@@ -508,10 +508,10 @@ type
     property DATOS_BANCARIOSIsNull : Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
     property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
     property OldDATOS_BANCARIOSIsNull : Boolean read GetOldDATOS_BANCARIOSIsNull;
-    property CLIENTE_FINAL : String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
-    property CLIENTE_FINALIsNull : Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
-    property OldCLIENTE_FINAL : String read GetOldCLIENTE_FINALValue;
-    property OldCLIENTE_FINALIsNull : Boolean read GetOldCLIENTE_FINALIsNull;
+    property PERSONA_CONTACTO : String read GetPERSONA_CONTACTOValue write SetPERSONA_CONTACTOValue;
+    property PERSONA_CONTACTOIsNull : Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull;
+    property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue;
+    property OldPERSONA_CONTACTOIsNull : Boolean read GetOldPERSONA_CONTACTOIsNull;
     property FECHA_ALTA : DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull : Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
@@ -577,7 +577,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{04D705AA-0C8D-42E5-98A4-3EA9BBB35577}']
+  ['{F5138939-68CB-41A9-8AAF-204711F0E911}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1681,35 +1681,35 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS] := Null;
 end;
 
-function TFacturasClienteBusinessProcessorRules.GetCLIENTE_FINALValue: String;
+function TFacturasClienteBusinessProcessorRules.GetPERSONA_CONTACTOValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL];
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePERSONA_CONTACTO];
 end;
 
-function TFacturasClienteBusinessProcessorRules.GetCLIENTE_FINALIsNull: Boolean;
+function TFacturasClienteBusinessProcessorRules.GetPERSONA_CONTACTOIsNull: Boolean;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL]);
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePERSONA_CONTACTO]);
 end;
 
-function TFacturasClienteBusinessProcessorRules.GetOldCLIENTE_FINALValue: String;
+function TFacturasClienteBusinessProcessorRules.GetOldPERSONA_CONTACTOValue: String;
 begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteCLIENTE_FINAL];
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePERSONA_CONTACTO];
 end;
 
-function TFacturasClienteBusinessProcessorRules.GetOldCLIENTE_FINALIsNull: Boolean;
+function TFacturasClienteBusinessProcessorRules.GetOldPERSONA_CONTACTOIsNull: Boolean;
 begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteCLIENTE_FINAL]);
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePERSONA_CONTACTO]);
 end;
 
-procedure TFacturasClienteBusinessProcessorRules.SetCLIENTE_FINALValue(const aValue: String);
+procedure TFacturasClienteBusinessProcessorRules.SetPERSONA_CONTACTOValue(const aValue: String);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL] := aValue;
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePERSONA_CONTACTO] := aValue;
 end;
 
-procedure TFacturasClienteBusinessProcessorRules.SetCLIENTE_FINALIsNull(const aValue: Boolean);
+procedure TFacturasClienteBusinessProcessorRules.SetPERSONA_CONTACTOIsNull(const aValue: Boolean);
 begin
   if aValue then
-    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL] := Null;
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePERSONA_CONTACTO] := Null;
 end;
 
 function TFacturasClienteBusinessProcessorRules.GetFECHA_ALTAValue: DateTime;
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
index 20c4e67..2a480c1 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas	
@@ -44,7 +44,6 @@ type
 //    procedure CalcularDescuento;
     procedure CalcularIVA;
     procedure CalcularRE;
-    procedure CalcularRetencion;
     procedure CalcularBaseImponible;
     procedure AsignarTipoIVA (IDTipoIVA : Integer);
 
@@ -68,9 +67,9 @@ type
     procedure IMPORTE_NETOOnChange(Sender: TDACustomField);
     procedure IMPORTE_PORTEOnChange(Sender: TDACustomField);
     procedure DESCUENTOOnChange(Sender: TDACustomField);
+    procedure DESCUENTO2OnChange(Sender: TDACustomField);
     procedure IVAOnChange(Sender: TDACustomField);
     procedure REOnChange(Sender: TDACustomField);
-    procedure RetencionOnChange(Sender: TDACustomField);
 
     procedure OnNewRecord(Sender: TDADataTable); override;
 
@@ -138,7 +137,8 @@ begin
   if not Self.DataTable.Editing then
     Edit;
   IMPORTE_DESCUENTO := IMPORTE_NETO * (DESCUENTO/100);
-  BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO + IMPORTE_PORTE; 
+  IMPORTE_DESCUENTO2 := IMPORTE_NETO * (DESCUENTO2/100);
+  BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO - IMPORTE_DESCUENTO2 + IMPORTE_PORTE; 
 end;
 
 {procedure TBizFacturaCliente.CalcularDescuento;
@@ -156,7 +156,6 @@ begin
     CalcularBaseImponible;
     CalcularIVA;
     CalcularRE;
-    CalcularRetencion;    
 
     if not Self.DataTable.Editing then
       Edit;
@@ -181,13 +180,6 @@ begin
   IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE;
 end;
 
-procedure TBizFacturaCliente.CalcularRetencion;
-begin
-  if not Self.DataTable.Editing then
-    Edit;
-  IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE;
-end;
-
 constructor TBizFacturaCliente.Create(aDataTable: TDADataTable);
 begin
   inherited;
@@ -201,9 +193,9 @@ begin
     FieldByName(fld_FacturasClienteIMPORTE_NETO).OnChange := IMPORTE_NETOOnChange;
     FieldByName(fld_FacturasClienteIMPORTE_PORTE).OnChange := IMPORTE_PORTEOnChange;
     FieldByName(fld_FacturasClienteDESCUENTO).OnChange := DESCUENTOOnChange;
+    FieldByName(fld_FacturasClienteDESCUENTO2).OnChange := DESCUENTO2OnChange;
     FieldByName(fld_FacturasClienteIVA).OnChange := IVAOnChange;
     FieldByName(fld_FacturasClienteRE).OnChange := REOnChange;
-    FieldByName(fld_FacturasClienteRetencion).OnChange := RetencionOnChange;
   end;
 
   FDetallesLink := TDADataSource.Create(NIL);
@@ -212,6 +204,11 @@ begin
   FSeleccionableInterface := TSeleccionable.Create(aDataTable);
 end;
 
+procedure TBizFacturaCliente.DESCUENTO2OnChange(Sender: TDACustomField);
+begin
+  CalcularImporteTotal;
+end;
+
 procedure TBizFacturaCliente.DESCUENTOOnChange(Sender: TDACustomField);
 begin
   CalcularImporteTotal;
@@ -294,11 +291,6 @@ begin
   CalcularImporteTotal;
 end;
 
-procedure TBizFacturaCliente.RetencionOnChange(Sender: TDACustomField);
-begin
-  CalcularImporteTotal;
-end;
-
 procedure TBizFacturaCliente.SetCliente(AValue: IBizCliente);
 var
   bEnEdicion : Boolean;
@@ -326,7 +318,8 @@ begin
     if FCliente.ID_TIPO_IVA > 0 then
        ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
     RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA;
-    DESCUENTO := FCliente.DESCUENTO;    
+    DESCUENTO := FCliente.DESCUENTO;
+    DESCUENTO2 := FCliente.DESCUENTO2;        
     Post;
 
     if bEnEdicion then
diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc
index 81c8dee..4ce38ac 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc	
+++ b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
-/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.drf */
+/* E:\temp\dtf525.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index 4d162d0..fb0a51c 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
@@ -184,10 +184,6 @@ object srvFacturasCliente: TsrvFacturasCliente
                 DatasetField = 'DATOS_BANCARIOS'
                 TableField = 'DATOS_BANCARIOS'
               end
-              item
-                DatasetField = 'CLIENTE_FINAL'
-                TableField = 'CLIENTE_FINAL'
-              end
               item
                 DatasetField = 'ID_DIRECCION'
                 TableField = 'ID_DIRECCION'
@@ -215,6 +211,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'IMPORTE_DESCUENTO2'
                 TableField = 'IMPORTE_DESCUENTO2'
+              end
+              item
+                DatasetField = 'PERSONA_CONTACTO'
+                TableField = 'PERSONA_CONTACTO'
               end>
           end>
         Name = 'FacturasCliente'
@@ -365,10 +365,9 @@ object srvFacturasCliente: TsrvFacturasCliente
             DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
           end
           item
-            Name = 'CLIENTE_FINAL'
+            Name = 'PERSONA_CONTACTO'
             DataType = datString
             Size = 255
-            DictionaryEntry = 'FacturasCliente_CLIENTE_FINAL'
           end
           item
             Name = 'FECHA_ALTA'
@@ -985,7 +984,7 @@ object srvFacturasCliente: TsrvFacturasCliente
             Value = ''
           end
           item
-            Name = 'CLIENTE_FINAL'
+            Name = 'PERSONA_CONTACTO'
             DataType = datString
             Size = 255
             Value = ''
@@ -1025,19 +1024,19 @@ object srvFacturasCliente: TsrvFacturasCliente
               'CODIGO_POSTAL,'#10'    FECHA_ALTA,'#10'    FECHA_MODIFICACION,'#10'    USUAR' +
               'IO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_IVA' +
               ','#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    DATOS_BANCARIOS,'#10'    ' +
-              'CLIENTE_FINAL,'#10'    RETENCION,'#10'    IMPORTE_RETENCION,'#10'    DESCUEN' +
-              'TO2,'#10'    IMPORTE_DESCUENTO2)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPRESA' +
-              ','#10'    :REFERENCIA,'#10'    :FECHA_FACTURA,'#10'    :FECHA_VENCIMIENTO,'#10' ' +
-              '   :FECHA_RETENCION,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUENTO,'#10'    :I' +
-              'MPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE,'#10'    :IMPO' +
-              'RTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :ID_CLIENTE,' +
-              #10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :ID_DIRECCION,'#10'    :CALLE,'#10'    :' +
-              'POBLACION,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    :FECHA_ALTA,'#10 +
-              '    :FECHA_MODIFICACION,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :' +
-              'RECARGO_EQUIVALENCIA,'#10'    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :' +
-              'IMPORTE_PORTE,'#10'    :DATOS_BANCARIOS,'#10'    :CLIENTE_FINAL,'#10'    :RE' +
-              'TENCION,'#10'    :IMPORTE_RETENCION,'#10'    :DESCUENTO2,'#10'    :IMPORTE_D' +
-              'ESCUENTO2);'#10
+              'PERSONA_CONTACTO,'#10'    RETENCION,'#10'    IMPORTE_RETENCION,'#10'    DESC' +
+              'UENTO2,'#10'    IMPORTE_DESCUENTO2)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPR' +
+              'ESA,'#10'    :REFERENCIA,'#10'    :FECHA_FACTURA,'#10'    :FECHA_VENCIMIENTO' +
+              ','#10'    :FECHA_RETENCION,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUENTO,'#10'   ' +
+              ' :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE,'#10'    :I' +
+              'MPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :ID_CLIEN' +
+              'TE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :ID_DIRECCION,'#10'    :CALLE,'#10'  ' +
+              '  :POBLACION,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    :FECHA_ALT' +
+              'A,'#10'    :FECHA_MODIFICACION,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'  ' +
+              '  :RECARGO_EQUIVALENCIA,'#10'    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'  ' +
+              '  :IMPORTE_PORTE,'#10'    :DATOS_BANCARIOS,'#10'    :PERSONA_CONTACTO,'#10' ' +
+              '   :RETENCION,'#10'    :IMPORTE_RETENCION,'#10'    :DESCUENTO2,'#10'    :IMP' +
+              'ORTE_DESCUENTO2);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1210,7 +1209,7 @@ object srvFacturasCliente: TsrvFacturasCliente
             Value = ''
           end
           item
-            Name = 'CLIENTE_FINAL'
+            Name = 'PERSONA_CONTACTO'
             DataType = datString
             Size = 255
             Value = ''
@@ -1260,10 +1259,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               'RMA_PAGO,'#10'    RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,'#10'    ' +
               'ID_TIPO_IVA = :ID_TIPO_IVA,'#10'    IMPORTE_NETO = :IMPORTE_NETO,'#10'  ' +
               '  IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    DATOS_BANCARIOS = :DATOS_B' +
-              'ANCARIOS,'#10'    CLIENTE_FINAL = :CLIENTE_FINAL,'#10'    RETENCION = :R' +
-              'ETENCION,'#10'    IMPORTE_RETENCION = :IMPORTE_RETENCION,'#10'    DESCUE' +
-              'NTO2 = :DESCUENTO2,'#10'    IMPORTE_DESCUENTO2 = :IMPORTE_DESCUENTO2' +
-              #10'  WHERE'#10'  (ID = :OLD_ID);'#10
+              'ANCARIOS,'#10'    PERSONA_CONTACTO = :PERSONA_CONTACTO,'#10'    RETENCIO' +
+              'N = :RETENCION,'#10'    IMPORTE_RETENCION = :IMPORTE_RETENCION,'#10'    ' +
+              'DESCUENTO2 = :DESCUENTO2,'#10'    IMPORTE_DESCUENTO2 = :IMPORTE_DESC' +
+              'UENTO2'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc
index 15966c1..c43f9de 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc	
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc	
@@ -18,11 +18,11 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewDatosYSeleccionClienteFacturaCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewFacturaCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewDetallesFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewTotalesFactura.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorFacturaCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorFacturasClienteReport.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewElegirArticulosFacturasCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
-/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewTotalesFactura.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.drf */
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm
index 9e9e2de..4bda84a 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm	
@@ -1,7 +1,51 @@
 inherited fEditorElegirArticulosFacturaCliente: TfEditorElegirArticulosFacturaCliente
   Caption = 'fEditorElegirArticulosFacturaCliente'
-  ExplicitWidth = 320
-  ExplicitHeight = 478
+  ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
+  inherited JvNavPanelHeader: TJvNavPanelHeader
+    ExplicitTop = 113
+  end
+  inherited TBXDock: TTBXDock
+    ExplicitTop = 64
+    inherited tbxMain: TTBXToolbar
+      Left = 346
+      DockPos = 346
+      ExplicitLeft = 346
+      ExplicitWidth = 126
+    end
+    inherited tbxFiltro: TTBXToolbar
+      Left = 3
+      DockPos = 3
+      ExplicitLeft = 3
+    end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 472
+      ExplicitLeft = 472
+    end
+  end
+  inherited pnlHeader: TPanel
+    ExplicitTop = 0
+    inherited lblTitle: TLabel
+      Width = 606
+    end
+    inherited lblComments: TLabel
+      Width = 581
+      Height = 24
+    end
+  end
+  inherited EditorActionList: TActionList
+    inherited actNuevo: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actModificar: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
+  end
 end
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index bc31a2e..0d9be55 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
@@ -2,20 +2,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
   Left = 454
   Top = 208
   Caption = 'Nueva factura de cliente'
-  ClientHeight = 608
-  ClientWidth = 812
+  ClientHeight = 649
+  ClientWidth = 902
   Position = poScreenCenter
   OnClose = CustomEditorClose
-  ExplicitWidth = 820
-  ExplicitHeight = 642
+  ExplicitWidth = 910
+  ExplicitHeight = 683
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 812
+    Width = 902
     Caption = 'Nueva factura de cliente'
     ExplicitWidth = 812
     inherited Image1: TImage
-      Left = 785
+      Left = 875
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -38,17 +38,17 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
       ExplicitLeft = 742
     end
     inherited lblDesbloquear: TcxLabel
-      Left = 687
+      Left = 777
       ExplicitLeft = 687
-      AnchorX = 732
+      AnchorX = 822
       AnchorY = 14
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 812
+    Width = 902
     ExplicitWidth = 812
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 613
+      ExplicitWidth = 488
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -66,7 +66,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 812
+      ExplicitWidth = 902
       inherited TBXSubmenuItem4: TTBXSubmenuItem
         inherited TBXItem8: TTBXItem
           Visible = False
@@ -87,21 +87,21 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 806
-    Height = 312
+    Width = 896
+    Height = 351
     OnChanging = pgPaginasChanging
     ExplicitWidth = 806
-    ExplicitHeight = 312
+    ExplicitHeight = 310
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 798
-      ExplicitHeight = 284
+      ExplicitHeight = 282
       inline frViewFacturaCliente1: TfrViewFacturaCliente
         Left = 0
         Top = 0
-        Width = 798
-        Height = 284
+        Width = 888
+        Height = 323
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -112,21 +112,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 798
-        ExplicitHeight = 284
+        ExplicitHeight = 282
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 798
-          Height = 284
+          Width = 888
+          Height = 323
           ExplicitWidth = 798
-          ExplicitHeight = 284
+          ExplicitHeight = 282
           DesignSize = (
-            798
-            284)
-          inherited Label1: TLabel
-            Left = 378
-            Width = 311
-            ExplicitLeft = 378
-            ExplicitWidth = 311
-          end
+            888
+            323)
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -148,10 +142,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 351
-            ExplicitHeight = 136
-            Height = 136
-            Width = 351
+            ExplicitWidth = 844
+            ExplicitHeight = 58
+            Height = 58
+            Width = 844
           end
           inherited cbFormaPago: TcxDBLookupComboBox
             Style.LookAndFeel.SkinName = ''
@@ -162,8 +156,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             Width = 111
           end
           inherited bFormasPago: TButton
-            Left = 196
-            ExplicitLeft = 196
+            Left = 244
+            ExplicitLeft = 244
           end
           inherited cbCuentaBancaria: TcxDBComboBox
             Style.LookAndFeel.SkinName = ''
@@ -173,24 +167,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitWidth = 249
             Width = 249
           end
-          inherited cbClienteFinal: TcxDBTextEdit
-            Left = 378
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 378
-            ExplicitWidth = 339
-            Width = 339
-          end
-          inherited bElegirClienteFinal: TButton
-            Left = 725
-            ExplicitLeft = 725
-          end
           inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
-            Left = 367
+            Left = 415
             Width = 505
-            ExplicitLeft = 367
+            ExplicitLeft = 415
             ExplicitWidth = 505
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 505
@@ -203,18 +183,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Width = 224
               end
               inherited edtNIFCIF: TcxDBTextEdit
-                Left = 279
+                Left = 321
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 279
+                ExplicitLeft = 321
               end
               inherited Button3: TBitBtn
-                Left = 190
-                ExplicitLeft = 190
+                Left = 232
+                ExplicitLeft = 232
               end
-              inherited edtDireccion: TcxTextEdit
+              inherited Button4: TButton
+                Left = 401
+                ExplicitLeft = 401
+              end
+              inherited edtPersonaContacto: TcxDBTextEdit
+                Style.LookAndFeel.SkinName = ''
+                StyleDisabled.LookAndFeel.SkinName = ''
+                StyleFocused.LookAndFeel.SkinName = ''
+                StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 403
+                Width = 403
+              end
+              inherited Button5: TButton
+                Left = 401
+                ExplicitLeft = 401
+              end
+              inherited edtDireccion: TcxMemo
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
@@ -222,10 +218,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 ExplicitWidth = 121
                 Width = 121
               end
-              inherited Button4: TButton
-                Left = 359
-                ExplicitLeft = 359
-              end
             end
           end
           inherited edtFechaVemcimiento: TcxDBDateEdit
@@ -242,11 +234,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitWidth = 798
+      ExplicitHeight = 282
       inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
         Left = 0
         Top = 0
-        Width = 798
-        Height = 284
+        Width = 888
+        Height = 323
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -259,110 +253,115 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 798
-        ExplicitHeight = 284
+        ExplicitHeight = 282
         inherited ToolBar1: TToolBar
-          Width = 798
-          Height = 46
+          Width = 888
+          Height = 51
           ExplicitWidth = 798
-          ExplicitHeight = 46
+          ExplicitHeight = 73
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
-            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton
-            Left = 0
-            Wrap = False
-            ExplicitLeft = 0
-          end
           inherited FontName: TJvFontComboBox
-            Left = 65
-            Top = 22
-            ExplicitTop = 22
+            Left = 334
+            Top = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton
+            Left = 479
+            Top = 0
+            ExplicitLeft = 479
+            ExplicitTop = 0
           end
           inherited FontSize: TEdit
-            Top = 22
+            Left = 544
+            Top = 0
             Width = 248
-            ExplicitTop = 22
+            ExplicitLeft = 544
+            ExplicitTop = 0
             ExplicitWidth = 248
           end
           inherited UpDown1: TUpDown
-            Left = 393
-            Top = 22
-            ExplicitLeft = 393
-            ExplicitTop = 22
+            Left = 792
+            Top = 0
+            ExplicitLeft = 792
+            ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 410
-            Top = 22
-            ExplicitLeft = 410
-            ExplicitTop = 22
-          end
-          inherited ToolButton6: TToolButton
-            Left = 418
-            Top = 22
-            ExplicitLeft = 418
-            ExplicitTop = 22
-          end
-          inherited ToolButton7: TToolButton
-            Left = 484
-            Top = 22
-            ExplicitLeft = 484
-            ExplicitTop = 22
-          end
-          inherited ToolButton8: TToolButton
-            Left = 551
-            Top = 22
-            ExplicitLeft = 551
-            ExplicitTop = 22
-          end
-          inherited ToolButton12: TToolButton
             Left = 0
-            Top = 22
+            Top = 0
             Wrap = True
             ExplicitLeft = 0
-            ExplicitTop = 22
+            ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited ToolButton9: TToolButton
+          inherited ToolButton11: TToolButton
             Left = 0
-            Top = 49
+            Top = 27
             ExplicitLeft = 0
-            ExplicitTop = 49
+            ExplicitTop = 27
+          end
+          inherited ToolButton12: TToolButton
+            Left = 141
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 141
+            ExplicitTop = 27
+            ExplicitHeight = 22
+          end
+          inherited ToolButton9: TToolButton
+            Left = 149
+            Top = 27
+            ExplicitLeft = 149
+            ExplicitTop = 27
           end
           inherited ToolButton10: TToolButton
-            Left = 145
-            Top = 49
-            ExplicitLeft = 145
-            ExplicitTop = 49
+            Left = 294
+            Top = 27
+            ExplicitLeft = 294
+            ExplicitTop = 27
           end
-          inherited ToolButton11: TToolButton
-            Left = 270
-            Top = 49
-            ExplicitLeft = 270
-            ExplicitTop = 49
+          inherited ToolButton6: TToolButton
+            Left = 419
+            Top = 27
+            ExplicitLeft = 419
+            ExplicitTop = 27
+          end
+          inherited ToolButton7: TToolButton
+            Left = 485
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 485
+            ExplicitTop = 27
+          end
+          inherited ToolButton8: TToolButton
+            Left = 552
+            Top = 27
+            ExplicitLeft = 552
+            ExplicitTop = 27
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 99
-          Width = 798
-          Height = 185
-          ExplicitTop = 104
+          Top = 77
+          Width = 888
+          Height = 246
           ExplicitWidth = 798
-          ExplicitHeight = 180
+          ExplicitHeight = 183
         end
         inherited TBXDock1: TTBXDock
-          Top = 73
-          Width = 798
-          ExplicitTop = 78
+          Top = 51
+          Width = 888
+          ExplicitTop = 73
           ExplicitWidth = 798
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 798
+            ExplicitWidth = 838
           end
         end
         inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -378,8 +377,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 589
-    Width = 812
+    Top = 630
+    Width = 902
     Panels = <
       item
         Width = 200
@@ -387,11 +386,11 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     ExplicitTop = 589
     ExplicitWidth = 812
   end
-  inline frViewTotales1: TfrViewTotales [4]
+  inline frViewTotalesFactura1: TfrViewTotalesFactura [4]
     Left = 0
-    Top = 394
-    Width = 812
-    Height = 195
+    Top = 433
+    Width = 902
+    Height = 197
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -401,258 +400,139 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 394
+    ExplicitTop = 392
     ExplicitWidth = 812
-    ExplicitHeight = 195
+    ExplicitHeight = 197
     inherited dxLayoutControl1: TdxLayoutControl
-      Width = 812
-      Height = 195
-      LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1
+      Width = 902
+      Height = 197
       ExplicitWidth = 812
-      ExplicitHeight = 195
+      ExplicitHeight = 197
       inherited Bevel3: TBevel
-        Left = 405
-        Top = 30
-        Height = 122
-        ExplicitLeft = 405
-        ExplicitTop = 30
-        ExplicitHeight = 122
+        Left = 472
+        ExplicitLeft = 472
       end
       inherited Bevel4: TBevel
-        Left = 517
-        Top = 60
-        Width = 192
-        ExplicitLeft = 517
-        ExplicitTop = 60
-        ExplicitWidth = 192
-      end
-      inherited Bevel1: TBevel
-        Left = 517
-        Top = 164
-        Width = 368
-        ExplicitLeft = 517
-        ExplicitTop = 164
-        ExplicitWidth = 368
-      end
-      inherited Bevel2: TBevel
-        Top = 190
-        Width = 368
-        ExplicitTop = 190
-        ExplicitWidth = 368
+        Left = 584
+        Width = 317
+        ExplicitLeft = 584
+        ExplicitWidth = 317
       end
       inherited ImporteDto: TcxDBCurrencyEdit
-        Top = 57
-        Enabled = False
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 57
-        ExplicitWidth = 184
-        Width = 184
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 588
-        Top = 83
+        Left = 655
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 588
-        ExplicitTop = 83
-        ExplicitWidth = 249
-        Width = 249
+        ExplicitLeft = 655
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 518
-        Top = 137
+        Left = 585
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 518
-        ExplicitTop = 137
-        ExplicitWidth = 319
-        Width = 319
+        ExplicitLeft = 585
       end
       inherited edtDescuento: TcxDBSpinEdit
-        Top = 57
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 57
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 517
-        Top = 83
+        Left = 584
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 517
-        ExplicitTop = 83
+        ExplicitLeft = 584
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 517
-        Top = 30
+        Left = 584
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 517
-        ExplicitTop = 30
-        ExplicitWidth = 320
-        Width = 320
+        ExplicitLeft = 584
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 517
-        Top = 110
+        Left = 584
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 517
-        ExplicitTop = 110
+        ExplicitLeft = 584
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 588
-        Top = 110
+        Left = 655
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 588
-        ExplicitTop = 110
-        ExplicitWidth = 249
-        Width = 249
+        ExplicitLeft = 655
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
-        Top = 30
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 30
-        ExplicitWidth = 255
-        Width = 255
       end
       inherited ePorte: TcxDBCurrencyEdit
-        Top = 84
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 84
-        ExplicitWidth = 255
-        Width = 255
       end
       inherited eIVA: TcxDBLookupComboBox
-        Top = 111
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 111
-        ExplicitWidth = 117
-        Width = 117
       end
       inherited bTiposIVA: TButton
-        Left = 257
-        Top = 111
-        ExplicitLeft = 257
-        ExplicitTop = 111
+        Left = 324
+        ExplicitLeft = 324
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
-        Top = 138
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 138
-        ExplicitWidth = 255
-        Width = 255
+        ExplicitWidth = 221
+        Width = 221
       end
-      inherited edtRetencion: TcxDBSpinEdit
-        Left = 517
-        Top = 184
-        DataBinding.DataField = 'RETENCION'
+      inherited eDescuento2: TcxDBSpinEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 517
-        ExplicitTop = 184
       end
-      inherited edtImporteRetencion: TcxDBCurrencyEdit
-        Left = 588
-        Top = 184
-        DataBinding.DataField = 'IMPORTE_RETENCION'
+      inherited eImporteDto2: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 588
-        ExplicitTop = 184
-        ExplicitWidth = 152
-        Width = 152
-      end
-      inherited edtFechaRetencion: TcxDBDateEdit
-        Top = 210
-        DataBinding.DataField = 'FECHA_RETENCION'
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 210
-        ExplicitWidth = 150
-        Width = 150
-      end
-      inherited dxLayoutControl1Group_Root: TdxLayoutGroup
-        inherited dxLayoutControl1Group1: TdxLayoutGroup
-          inherited dxLayoutControl1Group2: TdxLayoutGroup
-            inherited dxLayoutControl1Group7: TdxLayoutGroup
-              inherited dxLayoutControl1Item9: TdxLayoutItem
-                Visible = False
-              end
-            end
-            inherited dxLayoutControl1Item16: TdxLayoutItem
-              Visible = False
-            end
-            inherited dxLayoutControl1Item21: TdxLayoutItem
-              Visible = True
-            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 dxLayoutControl1Group11: TdxLayoutGroup
-                Visible = True
-              end
-            end
-          end
-        end
+        ExplicitWidth = 293
+        Width = 293
       end
     end
   end
@@ -662,7 +542,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     object actEnviarEMail: TAction
       Category = 'Acciones'
       Caption = 'Enviar por e-mail...'
+      Enabled = False
       ImageIndex = 21
+      Visible = False
       OnExecute = actEnviarEMailExecute
       OnUpdate = actEnviarEMailUpdate
     end
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
index 999bf9f..f24921a 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
@@ -17,19 +17,19 @@ uses
   uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar,
   uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids,
-  uViewDetallesArticulosParaVenta, cxLabel;
+  uViewDetallesArticulosParaVenta, cxLabel, uViewTotalesFactura;
 
 
 type
   TfEditorFacturaCliente = class(TfEditorDBItem, IEditorFacturaCliente)
     frViewFacturaCliente1: TfrViewFacturaCliente;
-    frViewTotales1: TfrViewTotales;
     frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente;
     actEnviarEMail: TAction;
     TBXSeparatorItem6: TTBXSeparatorItem;
     TBXItem7: TTBXItem;
     TBXSubmenuItem2: TTBXSubmenuItem;
     TBXItem33: TTBXItem;
+    frViewTotalesFactura1: TfrViewTotalesFactura;
     procedure FormShow(Sender: TObject);
     procedure frViewClienteFactura1edtlNombrePropertiesEditValueChanged(Sender: TObject);
     procedure dsDataTableDataChange(Sender: TObject; Field: TField);
@@ -181,9 +181,9 @@ procedure TfEditorFacturaCliente.FormCloseQuery(Sender: TObject; var CanClose: B
 begin
   inherited;
 
-  frViewTotales1.cbRecargoEquivalencia.Properties.OnEditValueChanged := nil;
- 	frViewTotales1.eIVA.Properties.OnValidate := nil;
- 	frViewTotales1.ePorte.Properties.OnValidate := nil;
+  frViewTotalesFactura1.cbRecargoEquivalencia.Properties.OnEditValueChanged := nil;
+ 	frViewTotalesFactura1.eIVA.Properties.OnValidate := nil;
+ 	frViewTotalesFactura1.ePorte.Properties.OnValidate := nil;
 end;
 
 procedure TfEditorFacturaCliente.FormShow(Sender: TObject);
@@ -352,9 +352,9 @@ begin
      FFactura.DataTable.Edit;
 
   // Actualizar IVA y RE a partir del tipo de IVA del cliente.
-  Factura.IVA := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
+  Factura.IVA := ((frViewTotalesFactura1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
   if FFactura.Cliente.RECARGO_EQUIVALENCIA = 1 then
-    Factura.RE := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).RE
+    Factura.RE := ((frViewTotalesFactura1.dsTiposIVA.DataTable) as IBizTipoIVA).RE
   else
     Factura.RE := 0;
 
@@ -461,10 +461,10 @@ begin
   if Assigned(FFactura) then
   begin
     dsDataTable.DataTable := FFactura.DataTable;
-    frViewTotales1.DADataSource.DataTable := FFactura.DataTable;
+    frViewTotalesFactura1.DADataSource.DataTable := FFactura.DataTable;
 
     FTiposIVA := FTiposIVAController.BuscarTodos;
-    frViewTotales1.dsTiposIVA.DataTable := FTiposIVA.DataTable;
+    frViewTotalesFactura1.dsTiposIVA.DataTable := FTiposIVA.DataTable;
     FTiposIVA.DataTable.Active := True;
 
     if Assigned(FViewFactura) then
@@ -482,8 +482,8 @@ begin
   else begin
     ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := NIL;
     dsDataTable.DataTable := NIL;
-    frViewTotales1.DADataSource.DataTable := NIL;
-    frViewTotales1.dsTiposIVA.DataTable := NIL;
+    frViewTotalesFactura1.DADataSource.DataTable := NIL;
+    frViewTotalesFactura1.dsTiposIVA.DataTable := NIL;
   end
 end;
 
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
index 151d0f7..11668c8 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm	
@@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     Width = 842
     ExplicitWidth = 842
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 842
+      ExplicitWidth = 632
       object TBXSubmenuItem2: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText
@@ -80,7 +80,6 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       Left = 427
       Visible = True
       ExplicitLeft = 427
-      ExplicitWidth = 66
       object TBXItem41: TTBXItem
         Action = actInformes
       end
@@ -247,6 +246,10 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     inherited actDuplicar: TAction
       Hint = 'Generar una factura nueva a partir de la factura seleccionada'
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
     object actNuevaFactura: TAction
       Category = 'Archivo'
       Caption = 'Factura'
@@ -262,12 +265,16 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     object actEnviarEMail: TAction
       Category = 'Acciones'
       Caption = 'Enviar por e-mail...'
+      Enabled = False
+      Visible = False
       OnExecute = actEnviarEMailExecute
       OnUpdate = actEnviarEMailUpdate
     end
     object actInformes: TAction
       Category = 'Acciones'
       Caption = 'Informes'
+      Enabled = False
+      Visible = False
       OnExecute = actInformesExecute
     end
   end
@@ -1904,15 +1911,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
         Default = True
       end
       item
-        Caption = 'Utilizar uno o m'#225's presupuestos de cliente.'
-        Value = 200
-        Info.Strings = (
-          
-            'Puede utilizar uno o m'#225's presupuestos existentes para dar de alt' +
-            'a una factura nueva.')
-      end
-      item
-        Caption = 'Utilizar uno o m'#225's albaranes de cliente.'
+        Caption = 'Utilizar un albar'#225'n de cliente.'
         Value = 300
         Info.Strings = (
           
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm
index b7df537..15beb62 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm	
@@ -1,13 +1,13 @@
 inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClienteFacturaCliente
-  Width = 505
-  Height = 138
-  ExplicitWidth = 505
-  ExplicitHeight = 138
+  Width = 634
+  Height = 193
+  ExplicitWidth = 634
+  ExplicitHeight = 193
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 505
-    Height = 138
+    Width = 634
+    Height = 193
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -18,10 +18,10 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     DesignSize = (
-      505
-      138)
+      634
+      193)
     object edtlNombre: TcxDBTextEdit
-      Left = 58
+      Left = 63
       Top = 41
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -48,7 +48,7 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
       Width = 224
     end
     object edtNIFCIF: TcxDBTextEdit
-      Left = 392
+      Left = 521
       Top = 41
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -163,13 +163,13 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
         FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
     end
     object Button3: TBitBtn
-      Left = 303
-      Top = 99
+      Left = 432
+      Top = 158
       Width = 192
       Height = 25
       Action = actVerContacto
       Caption = 'Ver ficha completa del cliente...'
-      TabOrder = 6
+      TabOrder = 8
       Glyph.Data = {
         36040000424D3604000000000000360000002800000010000000100000000100
         2000000000000004000000000000000000000000000000000000FF00FF00FF00
@@ -206,9 +206,51 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
         FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
         FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
     end
-    object edtDireccion: TcxTextEdit
-      Left = 58
-      Top = 70
+    object Button4: TButton
+      Left = 601
+      Top = 68
+      Width = 23
+      Height = 25
+      Action = actElegirDireccion
+      Enabled = False
+      TabOrder = 5
+    end
+    object edtPersonaContacto: TcxDBTextEdit
+      Left = 63
+      Top = 127
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'PERSONA_CONTACTO'
+      DataBinding.DataSource = dsFactura
+      ParentFont = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      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 = 6
+      Height = 21
+      Width = 403
+    end
+    object Button5: TButton
+      Left = 601
+      Top = 127
+      Width = 23
+      Height = 25
+      Caption = '...'
+      Enabled = False
+      TabOrder = 7
+    end
+    object edtDireccion: TcxMemo
+      Left = 63
+      Top = 68
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -226,15 +268,8 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 4
-      Width = 121
-    end
-    object Button4: TButton
-      Left = 472
-      Top = 68
-      Width = 23
-      Height = 25
-      Action = actElegirDireccion
-      TabOrder = 5
+      Height = 53
+      Width = 403
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
@@ -285,23 +320,48 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
         object dxLayoutControl1Group3: TdxLayoutGroup
           ShowCaption = False
           Hidden = True
-          LayoutDirection = ldHorizontal
           ShowBorder = False
-          object dxLayoutControl1Item4: TdxLayoutItem
-            AutoAligns = []
-            AlignHorz = ahClient
-            AlignVert = avCenter
-            Caption = 'Direcci'#243'n'
-            Control = edtDireccion
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item5: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahRight
-            Caption = 'Button4'
+          object dxLayoutControl1Group5: TdxLayoutGroup
             ShowCaption = False
-            Control = Button4
-            ControlOptions.ShowBorder = False
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControl1Item4: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Direcci'#243'n:'
+              Control = edtDireccion
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item5: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              Caption = 'Button4'
+              Enabled = False
+              ShowCaption = False
+              Visible = False
+              Control = Button4
+              ControlOptions.ShowBorder = False
+            end
+          end
+          object dxLayoutControl1Group6: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControl1Item3: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Contacto:'
+              Control = edtPersonaContacto
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item6: TdxLayoutItem
+              Enabled = False
+              ShowCaption = False
+              Visible = False
+              Control = Button5
+              ControlOptions.ShowBorder = False
+            end
           end
         end
       end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas
index cc242d2..b59d8ec 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas	
@@ -10,7 +10,8 @@ uses
   pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
   DBCtrls, uClientesController, dxLayoutControl, Buttons, uDAInterfaces,
   cxMaskEdit, cxButtonEdit, uBizFacturasCliente, uBizDireccionesContacto,
-  uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons;
+  uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons,
+  cxMemo;
 
 type
   IViewDatosYSeleccionClienteFacturaCliente = interface(IViewBase)
@@ -63,11 +64,17 @@ type
     dsFactura: TDADataSource;
     actElegirDireccion: TAction;
     dxLayoutControl1Group4: TdxLayoutGroup;
-    dxLayoutControl1Item4: TdxLayoutItem;
-    edtDireccion: TcxTextEdit;
     Button4: TButton;
     dxLayoutControl1Item5: TdxLayoutItem;
     dxLayoutControl1Group3: TdxLayoutGroup;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    edtPersonaContacto: TcxDBTextEdit;
+    dxLayoutControl1Item6: TdxLayoutItem;
+    Button5: TButton;
+    dxLayoutControl1Group6: TdxLayoutGroup;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    edtDireccion: TcxMemo;
+    dxLayoutControl1Group5: TdxLayoutGroup;
     procedure actElegirContactoExecute(Sender: TObject);
     procedure actAnadirContactoExecute(Sender: TObject);
     procedure actVerContactoUpdate(Sender: TObject);
@@ -256,8 +263,8 @@ begin
 
   if Assigned(FDireccion) then
     ACadena := Format('%s %s %s %s',
-      [FFactura.CALLE, FFactura.POBLACION,
-      FFactura.CODIGO_POSTAL, FFactura.PROVINCIA]);
+      [FDireccion.CALLE, FDireccion.POBLACION,
+      FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
 
   edtDireccion.Text := ACadena;
 end;
@@ -287,7 +294,11 @@ begin
     if FCliente.Direcciones.RecordCount > 0 then
        ElegirDireccionCliente
     else
-       RefrescarDireccion;
+    begin
+      FFactura.Edit;
+      FFactura.PERSONA_CONTACTO := FCliente.PERSONA_CONTACTO;
+      RefrescarDireccion;
+    end;
   end
   else begin
     dsCliente.DataTable := NIL;
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 0f9b5c1..1a28e7a 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm	
@@ -1,43 +1,51 @@
 inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
-    inherited FontName: TJvFontComboBox [4]
-      Left = 56
+    Height = 73
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
       Top = 22
-      ExplicitLeft = 56
       ExplicitTop = 22
     end
-    inherited ToolButton14: TToolButton [5]
-      Left = 201
-      Wrap = False
-      ExplicitLeft = 201
-    end
     inherited FontSize: TEdit
-      Left = 266
       Top = 22
-      ExplicitLeft = 266
       ExplicitTop = 22
     end
     inherited UpDown1: TUpDown
-      Left = 308
       Top = 22
-      ExplicitLeft = 308
       ExplicitTop = 22
     end
     inherited ToolButton13: TToolButton
-      Left = 325
       Top = 22
-      ExplicitLeft = 325
       ExplicitTop = 22
     end
-    inherited ToolButton11: TToolButton [9]
-      Left = 333
+    inherited ToolButton6: TToolButton
       Top = 22
-      ExplicitLeft = 333
       ExplicitTop = 22
     end
-    inherited ToolButton12: TToolButton [10]
+    inherited ToolButton7: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton8: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton12: TToolButton
       Left = 0
       Top = 22
       Wrap = True
@@ -45,45 +53,59 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
       ExplicitTop = 22
       ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton [11]
+    inherited ToolButton9: TToolButton
       Left = 0
       Top = 49
       ExplicitLeft = 0
       ExplicitTop = 49
     end
-    inherited ToolButton10: TToolButton [12]
+    inherited ToolButton10: TToolButton
       Left = 145
       Top = 49
       ExplicitLeft = 145
       ExplicitTop = 49
     end
-    inherited ToolButton6: TToolButton [13]
+    inherited ToolButton11: TToolButton
       Left = 270
       Top = 49
       ExplicitLeft = 270
       ExplicitTop = 49
     end
-    inherited ToolButton7: TToolButton [14]
-      Left = 336
-      Top = 49
-      Wrap = True
-      ExplicitLeft = 336
-      ExplicitTop = 49
-    end
-    inherited ToolButton8: TToolButton [15]
-      Left = 0
-      Top = 71
-      ExplicitLeft = 0
-      ExplicitTop = 71
-    end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
-    Height = 183
-    ExplicitHeight = 210
+    Top = 99
+    Height = 205
+    ExplicitTop = 99
+    ExplicitHeight = 205
+    inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewTIPO: TcxGridDBColumn
+        Visible = False
+        VisibleForCustomization = False
+      end
+      inherited cxGridViewCANTIDAD: TcxGridDBColumn
+        Properties.ReadOnly = True
+      end
+      inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
+        Visible = False
+        VisibleForCustomization = False
+      end
+    end
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
-    ExplicitTop = 68
+    Top = 73
+    ExplicitTop = 73
+    inherited TBXToolbar1: TTBXToolbar
+      DockPos = 0
+      inherited TBXSubmenuItem1: TTBXSubmenuItem
+        Enabled = False
+        Visible = False
+      end
+    end
+  end
+  inherited ActionListContenido: TActionList
+    inherited actAnadirArticulos: TAction
+      Enabled = False
+      Visible = False
+    end
   end
 end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index b24fdaa..01dc2a3 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
@@ -1,6 +1,6 @@
 inherited frViewFacturaCliente: TfrViewFacturaCliente
-  Width = 893
-  Height = 516
+  Width = 882
+  Height = 522
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 893
-    Height = 516
+    Width = 882
+    Height = 522
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -20,18 +20,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     ExplicitWidth = 451
     ExplicitHeight = 304
     DesignSize = (
-      893
-      516)
-    object Label1: TLabel
-      Left = 486
-      Top = 193
-      Width = 311
-      Height = 26
-      Caption = 
-        'Opcionalmente, puede escribir el nombre del cliente final de est' +
-        'e presupuesto o elegirlo de la lista de clientes.'
-      WordWrap = True
-    end
+      882
+      522)
     object eReferencia: TcxDBTextEdit
       Left = 124
       Top = 30
@@ -84,7 +74,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     object memObservaciones: TcxDBMemo
       Left = 22
-      Top = 285
+      Top = 260
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -100,7 +90,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 7
       Height = 345
       Width = 355
     end
@@ -142,7 +132,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Width = 269
     end
     object bFormasPago: TButton
-      Left = 304
+      Left = 404
       Top = 103
       Width = 132
       Height = 23
@@ -172,47 +162,11 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       TabOrder = 5
       Width = 165
     end
-    object cbClienteFinal: TcxDBTextEdit
-      Left = 486
-      Top = 227
-      Anchors = [akLeft, akTop, akRight]
-      DataBinding.DataField = 'CLIENTE_FINAL'
-      DataBinding.DataSource = DADataSource
-      Properties.ReadOnly = False
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.Color = clWindow
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.Color = clMenuBar
-      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
-      Width = 339
-    end
-    object bElegirClienteFinal: TButton
-      Left = 837
-      Top = 225
-      Width = 23
-      Height = 25
-      Action = actElegirClienteFinal
-      TabOrder = 8
-    end
     inline frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
-      Left = 475
+      Left = 575
       Top = 30
-      Width = 505
-      Height = 138
+      Width = 295
+      Height = 200
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
@@ -221,30 +175,48 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       ParentFont = False
       TabOrder = 6
       ReadOnly = False
-      ExplicitLeft = 475
+      ExplicitLeft = 575
       ExplicitTop = 30
+      ExplicitWidth = 295
+      ExplicitHeight = 200
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 295
+        Height = 200
+        ExplicitWidth = 101
+        ExplicitHeight = 138
         inherited edtlNombre: TcxDBTextEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 224
-          Width = 224
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Left = 283
+          Left = 172
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 283
+          ExplicitLeft = 172
         end
         inherited Button3: TBitBtn
-          Left = 194
-          ExplicitLeft = 194
+          Left = 83
+          ExplicitLeft = 83
         end
-        inherited edtDireccion: TcxTextEdit
+        inherited Button4: TButton
+          Left = 252
+          ExplicitLeft = 252
+        end
+        inherited edtPersonaContacto: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+        end
+        inherited Button5: TButton
+          Left = 252
+          ExplicitLeft = 252
+        end
+        inherited edtDireccion: TcxMemo
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
@@ -252,10 +224,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           ExplicitWidth = 121
           Width = 121
         end
-        inherited Button4: TButton
-          Left = 363
-          ExplicitLeft = 363
-        end
       end
       inherited ActionList1: TActionList
         Left = 120
@@ -276,6 +244,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_VENCIMIENTO'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.OnEditValueChanged = edtFechaVemcimientoPropertiesEditValueChanged
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
@@ -349,6 +318,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
               end
               object ledtFechaVencimiento: TdxLayoutItem
                 Caption = 'Fecha de vencimiento:'
+                Enabled = False
                 Visible = False
                 Control = edtFechaVemcimiento
                 ControlOptions.ShowBorder = False
@@ -373,43 +343,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
           end
-          object dxLayoutControl1Group7: TdxLayoutGroup
-            Caption = 'Cliente final'
-            Visible = False
-            object dxLayoutControl1Item7: TdxLayoutItem
-              ShowCaption = False
-              Control = Label1
-              ControlOptions.AutoColor = True
-              ControlOptions.ShowBorder = False
-            end
-            object dxLayoutControl1Group8: TdxLayoutGroup
-              ShowCaption = False
-              Hidden = True
-              LayoutDirection = ldHorizontal
-              ShowBorder = False
-              object dxLayoutControl1Item8: TdxLayoutItem
-                AutoAligns = []
-                AlignHorz = ahClient
-                AlignVert = avCenter
-                Control = cbClienteFinal
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item9: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahRight
-                ShowCaption = False
-                Control = bElegirClienteFinal
-                ControlOptions.ShowBorder = False
-              end
-            end
-          end
         end
       end
       object dxLayoutControl1Group5: TdxLayoutGroup
         AutoAligns = []
         AlignHorz = ahClient
         AlignVert = avClient
-        Caption = 'Descripci'#243'n'
+        Caption = 'Observaciones'
         LayoutDirection = ldHorizontal
         object dxLayoutControl1Item5: TdxLayoutItem
           AutoAligns = []
@@ -442,13 +382,4 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     Left = 16
     Top = 24
   end
-  object ActionList1: TActionList
-    Left = 16
-    Top = 96
-    object actElegirClienteFinal: TAction
-      Caption = '...'
-      OnExecute = actElegirClienteFinalExecute
-      OnUpdate = actElegirClienteFinalUpdate
-    end
-  end
 end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
index ff51ba4..80658d1 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
@@ -49,16 +49,6 @@ type
     bFormasPago: TButton;
     dxLayoutControl1Item3: TdxLayoutItem;
     cbCuentaBancaria: TcxDBComboBox;
-    dxLayoutControl1Item7: TdxLayoutItem;
-    Label1: TLabel;
-    dxLayoutControl1Item8: TdxLayoutItem;
-    cbClienteFinal: TcxDBTextEdit;
-    dxLayoutControl1Item9: TdxLayoutItem;
-    bElegirClienteFinal: TButton;
-    dxLayoutControl1Group7: TdxLayoutGroup;
-    dxLayoutControl1Group8: TdxLayoutGroup;
-    ActionList1: TActionList;
-    actElegirClienteFinal: TAction;
     frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente;
     dxLayoutControl1Group9: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
@@ -69,8 +59,6 @@ type
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);
-    procedure actElegirClienteFinalExecute(Sender: TObject);
-    procedure actElegirClienteFinalUpdate(Sender: TObject);
     procedure edtFechaVemcimientoPropertiesEditValueChanged(Sender: TObject);
   protected
     FFactura : IBizFacturaCliente;
@@ -102,37 +90,6 @@ uses
 
 { TfrViewFacturaCliente }
 
-procedure TfrViewFacturaCliente.actElegirClienteFinalExecute(Sender: TObject);
-var
-  ACliente : IBizCliente;
-  AClienteController : IClientesController;
-begin
-  inherited;
-  AClienteController := TClientesController.Create;
-  try
-    ACliente := (AClienteController.ElegirContacto(AClienteController.BuscarTodos,
-      'Elija el cliente final de esta factura', False) as IBizCliente);
-    if Assigned(ACliente) then
-    begin
-      ShowHourglassCursor;
-      try
-        FFactura.Edit;
-        FFactura.CLIENTE_FINAL := ACliente.NOMBRE;
-      finally
-        HideHourglassCursor;
-      end;
-    end;
-  finally
-    ACliente := NIL;
-    AClienteController := NIL;
-  end;
-end;
-
-procedure TfrViewFacturaCliente.actElegirClienteFinalUpdate(Sender: TObject);
-begin
-  inherited;
-  (Sender as TAction).Enabled := (not ReadOnly);
-end;
 
 procedure TfrViewFacturaCliente.bFormasPagoClick(Sender: TObject);
 begin
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
index efe9345..534dd1d 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm	
@@ -55,11 +55,6 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         PropertiesClassName = 'TcxDateEditProperties'
         Width = 28
       end
-      object cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn
-        Caption = 'Fecha vto.'
-        DataBinding.FieldName = 'FECHA_VENCIMIENTO'
-        PropertiesClassName = 'TcxDateEditProperties'
-      end
       object cxGridViewNIF_CIF: TcxGridDBColumn
         DataBinding.FieldName = 'NIF_CIF'
         Visible = False
@@ -126,19 +121,9 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         HeaderAlignmentHorz = taRightJustify
         Width = 128
       end
-      object cxGridViewIMPORTE_RETENCION: TcxGridDBColumn
-        Caption = 'Importe retenido'
-        DataBinding.FieldName = 'IMPORTE_RETENCION'
-        PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.Alignment.Horz = taRightJustify
-        FooterAlignmentHorz = taRightJustify
-        HeaderAlignmentHorz = taRightJustify
-      end
       object cxGridViewREFERENCIA_COMISION: TcxGridDBColumn
         Caption = 'Liquidaci'#243'n'
         DataBinding.FieldName = 'REFERENCIA_COMISION'
-        Visible = False
-        VisibleForCustomization = False
         Width = 54
       end
     end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
index 7fc4f33..02b9c6d 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas	
@@ -56,8 +56,6 @@ type
     TBXItem3: TTBXItem;
     TBXSeparatorItem2: TTBXSeparatorItem;
     cxGridViewTIPO: TcxGridDBColumn;
-    cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
-    cxGridViewIMPORTE_RETENCION: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm
index abc258a..d4ff12f 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm	
@@ -1,129 +1,306 @@
 inherited frViewTotalesFactura: TfrViewTotalesFactura
+  Height = 221
+  ExplicitHeight = 221
   inherited dxLayoutControl1: TdxLayoutControl
+    Height = 221
     ExplicitWidth = 451
+    ExplicitHeight = 221
     inherited Bevel3: TBevel
-      Height = 100
-      ExplicitHeight = 100
+      Left = 276
+      Top = 10
+      Height = 156
+      ExplicitLeft = 276
+      ExplicitTop = 10
+      ExplicitHeight = 156
     end
     inherited Bevel4: TBevel
-      Width = 342
-      ExplicitWidth = 342
-    end
-    inherited Bevel1: TBevel
-      Width = 368
-      ExplicitWidth = 368
-    end
-    inherited Bevel2: TBevel
-      Width = 368
-      ExplicitWidth = 368
+      Left = 388
+      Top = 52
+      Width = 317
+      ExplicitLeft = 388
+      ExplicitTop = 52
+      ExplicitWidth = 317
     end
     inherited ImporteDto: TcxDBCurrencyEdit
+      Left = 173
+      Top = 37
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 173
+      ExplicitTop = 37
     end
     inherited ImporteIVA: TcxDBCurrencyEdit
+      Left = 459
+      Top = 87
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 11
+      ExplicitLeft = 459
+      ExplicitTop = 87
     end
     inherited ImporteTotal: TcxDBCurrencyEdit
+      Left = 389
+      Top = 141
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 14
+      ExplicitLeft = 389
+      ExplicitTop = 141
     end
     inherited edtDescuento: TcxDBSpinEdit
+      Left = 102
+      Top = 37
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 102
+      ExplicitTop = 37
     end
     inherited edtIVA: TcxDBSpinEdit
+      Left = 388
+      Top = 87
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 10
+      ExplicitLeft = 388
+      ExplicitTop = 87
     end
     inherited ImporteBase: TcxDBCurrencyEdit
+      Left = 388
+      Top = 10
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 9
+      ExplicitLeft = 388
+      ExplicitTop = 10
     end
     inherited edtRE: TcxDBSpinEdit
+      Left = 388
+      Top = 114
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 12
+      ExplicitLeft = 388
+      ExplicitTop = 114
     end
     inherited ImporteRE: TcxDBCurrencyEdit
+      Left = 459
+      Top = 114
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 13
+      ExplicitLeft = 459
+      ExplicitTop = 114
     end
     inherited eImporteNeto: TcxDBCurrencyEdit
+      Left = 102
+      Top = 10
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 102
+      ExplicitTop = 10
     end
     inherited ePorte: TcxDBCurrencyEdit
+      Left = 102
+      Top = 91
+      Enabled = False
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 5
+      ExplicitLeft = 102
+      ExplicitTop = 91
     end
     inherited eIVA: TcxDBLookupComboBox
+      Left = 102
+      Top = 118
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 6
+      ExplicitLeft = 102
+      ExplicitTop = 118
+    end
+    inherited bTiposIVA: TButton
+      Left = 128
+      Top = 118
+      TabOrder = 7
+      ExplicitLeft = 128
+      ExplicitTop = 118
     end
     inherited cbRecargoEquivalencia: TcxDBCheckBox
+      Left = 102
+      Top = 145
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 8
+      ExplicitLeft = 102
+      ExplicitTop = 145
       ExplicitWidth = 221
       Width = 221
     end
-    inherited edtRetencion: TcxDBSpinEdit
+    object eDescuento2: TcxDBSpinEdit [15]
+      Left = 102
+      Top = 64
+      AutoSize = False
+      DataBinding.DataField = 'DESCUENTO2'
+      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 = 3
+      Height = 21
+      Width = 65
     end
-    inherited edtImporteRetencion: TcxDBCurrencyEdit
+    object eImporteDto2: TcxDBCurrencyEdit [16]
+      Left = 173
+      Top = 64
+      AutoSize = False
+      DataBinding.DataField = 'IMPORTE_DESCUENTO2'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
+      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.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 = ''
-      ExplicitWidth = 180
-      Width = 180
+      TabOrder = 4
+      Height = 21
+      Width = 293
     end
-    inherited edtFechaRetencion: TcxDBDateEdit
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitWidth = 280
-      Width = 280
+    inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+      inherited dxLayoutControl1Group1: TdxLayoutGroup
+        ShowCaption = False
+        ShowBorder = False
+        inherited dxLayoutControl1Group2: TdxLayoutGroup
+          inherited dxLayoutControl1Item8: TdxLayoutItem
+            Enabled = False
+          end
+          inherited dxLayoutControl1Group7: TdxLayoutGroup
+            inherited dxLayoutControl1Group10: TdxLayoutGroup
+              inherited dxLayoutControl1Item4: TdxLayoutItem
+                Caption = 'Dto. cliente (%):'
+              end
+              inherited dxLayoutControl1Item1: TdxLayoutItem
+                Enabled = False
+              end
+            end
+            object dxLayoutControl1Group12: TdxLayoutGroup [1]
+              ShowCaption = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControl1Item20: TdxLayoutItem
+                Caption = 'Dto. pronto pago:'
+                Control = eDescuento2
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item22: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Enabled = False
+                Control = eImporteDto2
+                ControlOptions.ShowBorder = False
+              end
+            end
+            inherited dxLayoutControl1Item9: TdxLayoutItem
+              Enabled = False
+              Visible = False
+            end
+          end
+        end
+        inherited dxLayoutControl1Group5: TdxLayoutGroup
+          inherited dxLayoutControl1Group3: TdxLayoutGroup
+            inherited dxLayoutControl1Group9: TdxLayoutGroup
+              inherited dxLayoutControl1Item5: TdxLayoutItem
+                CaptionOptions.AlignHorz = taLeftJustify
+              end
+            end
+            inherited dxLayoutControl1Group8: TdxLayoutGroup
+              inherited dxLayoutControl1Item6: TdxLayoutItem
+                CaptionOptions.AlignHorz = taLeftJustify
+              end
+              inherited dxLayoutControl1Item7: TdxLayoutItem
+                Visible = True
+              end
+            end
+          end
+        end
+      end
     end
   end
 end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas
index 778fc41..d0a5158 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas	
@@ -12,6 +12,11 @@ uses
 
 type
   TfrViewTotalesFactura = class(TfrViewTotales)
+    dxLayoutControl1Item20: TdxLayoutItem;
+    eDescuento2: TcxDBSpinEdit;
+    dxLayoutControl1Item22: TdxLayoutItem;
+    eImporteDto2: TcxDBCurrencyEdit;
+    dxLayoutControl1Group12: TdxLayoutGroup;
   private
     { Private declarations }
   public
diff --git a/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc b/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc
index 980a6ee..662babd 100644
--- a/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc	
+++ b/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Controller\FacturasProveedor_controller.res */
-/* E:\temp\dtf6EF.tmp */
+/* E:\temp\dtf4FB.tmp */
diff --git a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc
index ae014d2..5d43b74 100644
--- a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc	
+++ b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Data\uDataModuleFacturasProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Data\FacturasProveedor_data.res */
-/* E:\temp\dtf6ED.tmp */
+/* E:\temp\dtf4F9.tmp */
diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc
index 65b778d..5d381b8 100644
--- a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc	
+++ b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Model\FacturasProveedor_model.res */
-/* E:\temp\dtf6EB.tmp */
+/* E:\temp\dtf4F7.tmp */
diff --git a/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc b/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc
index 302fdd4..16a1f25 100644
--- a/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc	
+++ b/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Plugin\uPluginFacturasProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.res */
-/* E:\temp\dtf72D.tmp */
+/* E:\temp\dtf539.tmp */
diff --git a/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc b/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc
index cd7234d..7337c60 100644
--- a/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc	
+++ b/Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */
-/* E:\temp\dtf681.tmp */
+/* E:\temp\dtf48D.tmp */
diff --git a/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc b/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc
index 17aeaee..1545979 100644
--- a/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc	
+++ b/Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */
-/* E:\temp\dtf67F.tmp */
+/* E:\temp\dtf48B.tmp */
diff --git a/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc b/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc
index 40e8be7..832a579 100644
--- a/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc	
+++ b/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.res */
-/* E:\temp\dtf6CB.tmp */
+/* E:\temp\dtf4D7.tmp */
diff --git a/Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc b/Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc
index 99ba066..2a748e4 100644
--- a/Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc	
+++ b/Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Data\uDataModulePedidosProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Data\PedidosProveedor_data.res */
-/* E:\temp\dtf6C9.tmp */
+/* E:\temp\dtf4D5.tmp */
diff --git a/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc b/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc
index b00a836..e2c8acf 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc	
+++ b/Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Model\PedidosProveedor_model.res */
-/* E:\temp\dtf6C7.tmp */
+/* E:\temp\dtf4D3.tmp */
diff --git a/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc b/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc
index c94de2f..01131ef 100644
--- a/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc	
+++ b/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Plugin\uPluginPedidosProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.res */
-/* E:\temp\dtf725.tmp */
+/* E:\temp\dtf531.tmp */
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc
index d1618e9..6a04c4f 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc	
@@ -30,4 +30,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorDireccionEntregaPedidoProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorSituacionPedidoProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\PedidosProveedor_view.res */
-/* E:\temp\dtf723.tmp */
+/* E:\temp\dtf52F.tmp */
diff --git a/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc b/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc
index 9bf8cfc..743b361 100644
--- a/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc	
+++ b/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Controller\PresupuestosCliente_controller.res */
-/* E:\temp\dtf6B9.tmp */
+/* E:\temp\dtf4C5.tmp */
diff --git a/Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc b/Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc
index 828b503..780d539 100644
--- a/Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc	
+++ b/Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Data\uDataModulePresupuestosCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Data\PresupuestosCliente_data.res */
-/* E:\temp\dtf6B7.tmp */
+/* E:\temp\dtf4C3.tmp */
diff --git a/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc b/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc
index b138a1f..db5501c 100644
--- a/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc	
+++ b/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Model\PresupuestosCliente_model.res */
-/* E:\temp\dtf6B5.tmp */
+/* E:\temp\dtf4C1.tmp */
diff --git a/Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc b/Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc
index 1aaf531..dbb635f 100644
--- a/Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc	
+++ b/Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Plugin\uPluginPresupuestosCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Plugin\PresupuestosCliente_plugin.res */
-/* E:\temp\dtf711.tmp */
+/* E:\temp\dtf51D.tmp */
diff --git a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc
index f89c91a..3464c81 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc	
+++ b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc	
@@ -28,4 +28,4 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosClienteReport.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorAsignarDescuento.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\PresupuestosCliente_view.res */
-/* E:\temp\dtf70F.tmp */
+/* E:\temp\dtf51B.tmp */
diff --git a/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc b/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc
index 0c45846..3cddbc0 100644
--- a/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc	
+++ b/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Data\uDataModuleRecibosCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Data\RecibosCliente_data.res */
-/* E:\temp\dtf6A3.tmp */
+/* E:\temp\dtf4AF.tmp */
diff --git a/Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc b/Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc
index b490752..9da7868 100644
--- a/Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc	
+++ b/Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Plugin\uPluginRecibosCliente.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.res */
-/* E:\temp\dtf6A9.tmp */
+/* E:\temp\dtf4B5.tmp */
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm
index 4d85dc5..1ee7574 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
@@ -40,6 +40,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
     inherited lblDesbloquear: TcxLabel
       Left = 593
       ExplicitLeft = 593
+      AnchorX = 638
+      AnchorY = 14
     end
   end
   inherited TBXDock: TTBXDock
@@ -316,6 +318,18 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
         inherited ToolBar1: TToolBar
           Width = 677
           ExplicitWidth = 677
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
           inherited ToolButton3: TToolButton
             ExplicitWidth = 98
           end
@@ -367,6 +381,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
       end
       inherited eOtrosGastos: TcxDBCurrencyEdit
         DataBinding.DataSource = dsDataTable
+        Enabled = False
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
@@ -388,9 +403,15 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
             Offsets.Right = 10
+            inherited dxLayoutControl1Item2: TdxLayoutItem
+              Enabled = False
+              Visible = False
+            end
           end
           inherited dxLayoutControl1Item3: TdxLayoutItem
             AlignHorz = ahRight
+            Enabled = False
+            Visible = False
           end
         end
       end
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
index 6aa96bb..8e111ad 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm	
@@ -97,38 +97,6 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
       ExplicitWidth = 645
       ExplicitHeight = 312
       inherited cxGridView: TcxGridDBTableView
-        DataController.Summary.DefaultGroupSummaryItems = <
-          item
-            Format = ',0.00 '#8364';-,0.00 '#8364
-            Position = spFooter
-            Column = frViewRecibosCliente1.cxGridViewIMPORTE_TOTAL
-          end
-          item
-            Format = ',0.00 '#8364';-,0.00 '#8364
-            Kind = skSum
-            Position = spFooter
-            Column = frViewRecibosCliente1.cxGridViewIMPORTE
-          end>
-        DataController.Summary.FooterSummaryItems = <
-          item
-            Format = ',0.00 '#8364';-,0.00 '#8364
-            Column = frViewRecibosCliente1.cxGridViewIMPORTE_TOTAL
-          end
-          item
-            Format = '0 recibos'
-            Kind = skCount
-            Column = frViewRecibosCliente1.cxGridViewREFERENCIA
-          end
-          item
-            Format = ',0.00 '#8364';-,0.00 '#8364
-            Kind = skSum
-            Column = frViewRecibosCliente1.cxGridViewIMPORTE
-          end
-          item
-            Format = ',0.00 '#8364';-,0.00 '#8364
-            Kind = skSum
-            Column = frViewRecibosCliente1.cxGridViewOTROS_GASTOS
-          end>
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm
index aad7a36..09f0e75 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm	
@@ -1,13 +1,13 @@
 inherited frViewReciboCliente: TfrViewReciboCliente
-  Width = 690
-  Height = 361
-  ExplicitWidth = 690
-  ExplicitHeight = 361
+  Width = 795
+  Height = 333
+  ExplicitWidth = 795
+  ExplicitHeight = 333
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 690
-    Height = 361
+    Width = 795
+    Height = 333
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -15,8 +15,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
     DesignSize = (
-      690
-      361)
+      795
+      333)
     object eReferencia: TcxDBTextEdit
       Left = 120
       Top = 30
@@ -121,12 +121,12 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 13
       Height = 49
       Width = 314
     end
     object eFechaEmision: TcxDBTextEdit
-      Left = 440
+      Left = 545
       Top = 30
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_FACTURA'
@@ -152,11 +152,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 7
       Width = 228
     end
     object eFormaPago: TcxDBTextEdit
-      Left = 440
+      Left = 545
       Top = 57
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FORMA_PAGO_FACTURA'
@@ -182,11 +182,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 8
       Width = 228
     end
     object eImporteTotal: TcxDBCurrencyEdit
-      Left = 440
+      Left = 545
       Top = 111
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_FACTURA'
@@ -217,12 +217,12 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 10
       Height = 21
       Width = 228
     end
     object eNombreCliente: TcxDBTextEdit
-      Left = 440
+      Left = 545
       Top = 194
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'NOMBRE_CLIENTE'
@@ -248,11 +248,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 12
       Width = 228
     end
     object eNifCif: TcxDBTextEdit
-      Left = 440
+      Left = 545
       Top = 167
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'NIF_CIF_CLIENTE'
@@ -278,7 +278,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 11
       Width = 228
     end
     object eRemesa: TcxDBTextEdit
@@ -400,7 +400,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       Width = 216
     end
     object eCuenta: TcxDBTextEdit
-      Left = 440
+      Left = 545
       Top = 84
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'DATOS_BANCARIOS'
@@ -426,128 +426,136 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 9
       Width = 228
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
-      LayoutDirection = ldHorizontal
       ShowBorder = False
-      object dxLayoutControl1Group3: TdxLayoutGroup
-        AutoAligns = [aaVertical]
-        AlignHorz = ahClient
+      object dxLayoutControl1Group9: TdxLayoutGroup
         ShowCaption = False
         Hidden = True
+        LayoutDirection = ldHorizontal
         ShowBorder = False
-        object dxLayoutControl1Group1: TdxLayoutGroup
+        object dxLayoutControl1Group3: TdxLayoutGroup
           AutoAligns = [aaVertical]
           AlignHorz = ahClient
-          Caption = 'Datos del recibo'
-          object dxLayoutControl1Item1: TdxLayoutItem
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Group1: TdxLayoutGroup
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
-            Caption = 'Referencia:'
-            Control = eReferencia
-            ControlOptions.ShowBorder = False
+            Caption = 'Datos del recibo'
+            object dxLayoutControl1Item1: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Referencia:'
+              Control = eReferencia
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item19: TdxLayoutItem
+              Caption = 'Fecha emisi'#243'n:'
+              Control = edtFechaEmision
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item3: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Fecha vencimiento:'
+              Control = edtFechaVencimiento
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item2: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Situaci'#243'n:'
+              Control = eSituacion
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item16: TdxLayoutItem
+              Caption = 'Ref. remesa:'
+              Control = eRemesa
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item6: TdxLayoutItem
+              Caption = 'Concepto:'
+              Control = eConcepto
+              ControlOptions.ShowBorder = False
+            end
           end
-          object dxLayoutControl1Item19: TdxLayoutItem
-            Caption = 'Fecha emisi'#243'n:'
-            Control = edtFechaEmision
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item3: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Fecha vencimiento:'
-            Control = edtFechaVencimiento
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item2: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Situaci'#243'n:'
-            Control = eSituacion
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item16: TdxLayoutItem
-            Caption = 'Ref. remesa:'
-            Control = eRemesa
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item6: TdxLayoutItem
-            Caption = 'Concepto:'
-            Control = eConcepto
-            ControlOptions.ShowBorder = False
+          object dxLayoutControl1Group2: TdxLayoutGroup
+            Caption = 'Compensado en recibo'
+            Enabled = False
+            Visible = False
+            object dxLayoutControl1Item4: TdxLayoutItem
+              Caption = 'Ref. recibo:'
+              Control = rRefReciboCompensado
+              ControlOptions.ShowBorder = False
+            end
           end
         end
-        object dxLayoutControl1Group2: TdxLayoutGroup
-          Caption = 'Compensado en recibo'
-          object dxLayoutControl1Item4: TdxLayoutItem
-            Caption = 'Ref. recibo:'
-            Control = rRefReciboCompensado
-            ControlOptions.ShowBorder = False
+        object dxLayoutControl1Group8: TdxLayoutGroup
+          AutoAligns = [aaVertical]
+          Caption = 'New Group'
+          ShowCaption = False
+          ShowBorder = False
+          object dxLayoutControl1Group5: TdxLayoutGroup
+            Caption = 'Datos de la factura'
+            object dxLayoutControl1Item7: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Fecha emisi'#243'n:'
+              Control = eFechaEmision
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item8: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Forma pago:'
+              Control = eFormaPago
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item15: TdxLayoutItem
+              Caption = 'Cuenta bancaria:'
+              Control = eCuenta
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item9: TdxLayoutItem
+              Caption = 'Total factura:'
+              Control = eImporteTotal
+              ControlOptions.ShowBorder = False
+            end
           end
-        end
-        object dxLayoutControl1Group7: TdxLayoutGroup
-          Caption = 'Observaciones'
-          object dxLayoutControl1Item5: TdxLayoutItem
+          object dxLayoutControl1Group6: TdxLayoutGroup
             AutoAligns = [aaHorizontal]
             AlignVert = avClient
-            Caption = 'Observaciones:'
-            ShowCaption = False
-            Control = memObservaciones
-            ControlOptions.ShowBorder = False
+            Caption = 'Datos del cliente'
+            Offsets.Top = 5
+            object dxLayoutControl1Item11: TdxLayoutItem
+              Caption = 'NIF/CIF:'
+              Control = eNifCif
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item10: TdxLayoutItem
+              Caption = 'Nombre:'
+              Control = eNombreCliente
+              ControlOptions.ShowBorder = False
+            end
           end
         end
       end
-      object dxLayoutControl1Group8: TdxLayoutGroup
-        AutoAligns = [aaVertical]
-        Caption = 'New Group'
-        ShowCaption = False
-        ShowBorder = False
-        object dxLayoutControl1Group5: TdxLayoutGroup
-          Caption = 'Datos de la factura'
-          object dxLayoutControl1Item7: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Fecha emisi'#243'n:'
-            Control = eFechaEmision
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item8: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Forma pago:'
-            Control = eFormaPago
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item15: TdxLayoutItem
-            Caption = 'Cuenta bancaria:'
-            Control = eCuenta
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item9: TdxLayoutItem
-            Caption = 'Total factura:'
-            Control = eImporteTotal
-            ControlOptions.ShowBorder = False
-          end
-        end
-        object dxLayoutControl1Group6: TdxLayoutGroup
+      object dxLayoutControl1Group7: TdxLayoutGroup
+        AutoAligns = [aaHorizontal]
+        Caption = 'Observaciones'
+        object dxLayoutControl1Item5: TdxLayoutItem
           AutoAligns = [aaHorizontal]
           AlignVert = avClient
-          Caption = 'Datos del cliente'
-          Offsets.Top = 5
-          object dxLayoutControl1Item11: TdxLayoutItem
-            Caption = 'NIF/CIF:'
-            Control = eNifCif
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item10: TdxLayoutItem
-            Caption = 'Nombre:'
-            Control = eNombreCliente
-            ControlOptions.ShowBorder = False
-          end
+          Caption = 'Observaciones:'
+          ShowCaption = False
+          Control = memObservaciones
+          ControlOptions.ShowBorder = False
         end
       end
     end
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas
index 2b1a7c7..e346391 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas	
@@ -59,6 +59,7 @@ type
     eConcepto: TcxDBTextEdit;
     dxLayoutControl1Item15: TdxLayoutItem;
     eCuenta: TcxDBTextEdit;
+    dxLayoutControl1Group9: TdxLayoutGroup;
   private
     FRecibo : IBizRecibosCliente;
     function GetRecibo: IBizRecibosCliente;
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index 96c920b..7d8793a 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
@@ -124,7 +124,9 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
         DataBinding.FieldName = 'OTROS_GASTOS'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        Visible = False
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
         Width = 55
       end
       object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn
@@ -132,8 +134,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
         DataBinding.FieldName = 'IMPORTE_TOTAL'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        Visible = False
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
         Width = 117
       end
       object cxGridViewREFERENCIA_REMESA: TcxGridDBColumn
@@ -200,6 +204,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 389
+          ExplicitWidth = 215
+          Width = 215
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas
index 8cbf8f5..43b6bcf 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
@@ -222,6 +222,7 @@ procedure TfrViewRecibosCliente.cxGridViewIMPORTE_TOTALGetDisplayText(
 var
   ImporteTotal : Double;
 begin
+{
   //Se encarga de mostrar el campo calculado de importe total
   ImporteTotal := -1;
 
@@ -239,6 +240,7 @@ begin
     cxGridViewIMPORTE_TOTAL.EditValue := ImporteTotal;
     cxGridViewIMPORTE_TOTAL.DataBinding.Field.Value := ImporteTotal;
   end;
+  }
 end;
 
 procedure TfrViewRecibosCliente.cxGridViewStylesGetContentStyle(
diff --git a/Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc b/Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc
index 7496308..a1e69b1 100644
--- a/Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc	
+++ b/Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Data\uDataModuleRecibosProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Data\RecibosProveedor_data.res */
-/* E:\temp\dtf6CF.tmp */
+/* E:\temp\dtf4DB.tmp */
diff --git a/Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc b/Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc
index ae4fb77..32c0316 100644
--- a/Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc	
+++ b/Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Plugin\uPluginRecibosProveedor.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Plugin\RecibosProveedor_plugin.res */
-/* E:\temp\dtf6D5.tmp */
+/* E:\temp\dtf4E1.tmp */
diff --git a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas
index d2e9b3c..b61ef6b 100644
--- a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas	
+++ b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas	
@@ -295,7 +295,7 @@ begin
 
     AAlbaranes := AAlbaranesClienteController.ElegirAlbaranes(AAlbaranesClienteController.BuscarSinFacturar,
                   'Elija el albarán o albaranes de cliente que desea utilizar para dar de alta la factura.'
-                  + #10#13 + 'Si elige albaranes de clientes diferentes se dará de alta una factura por cada uno de ellos.' , True);
+                  + #10#13 + 'Si elige albaranes de clientes diferentes se dará de alta una factura por cada uno de ellos.' , False);
 
     if Assigned(AAlbaranes) then
     begin
diff --git a/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc b/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc
index cbf38a7..35d3a13 100644
--- a/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc	
+++ b/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* E:\temp\dtf645.tmp */
+/* E:\temp\dtf451.tmp */
diff --git a/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc b/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc
index d62d61d..7410a70 100644
--- a/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc	
+++ b/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* E:\temp\dtf643.tmp */
+/* E:\temp\dtf44F.tmp */
diff --git a/Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc b/Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc
index 95640a3..500105d 100644
--- a/Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc	
+++ b/Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc	
@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Data\uDataModuleUnidadesMedida.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Data\UnidadesMedida_data.res */
-/* E:\temp\dtf659.tmp */
+/* E:\temp\dtf465.tmp */
diff --git a/Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc b/Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc
index c822de0..4f31443 100644
--- a/Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc	
+++ b/Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc	
@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Model\UnidadesMedida_model.res */
-/* E:\temp\dtf657.tmp */
+/* E:\temp\dtf463.tmp */
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 71a05c9e831269070d7384de508890cffc99983c..30c121ee465e1e3c55b2b2f52c81deb1f3baffb0 100644
GIT binary patch
delta 73
zcmZ3nm2tsV#tnBO7?(`G8zB!Q|3*YJvP_PQRAziIxi+$zIfX%K^6yAl;VgzyhE#?!
bATDOmVNhT&WH6a*7^Tf@z+g5xG0GhP_}v$2

delta 81
zcmZ3mm2t&Z#tnBO7}rd`8zB!Q|3*YJa!rnmRAziOxi+$zIg3Gc^6yAl$y|m^hL;RQ
l49N`n3^@#`48;sO3<?Z}491hSqqJE~7%UhVCPzlO0|3#98A1R6

diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 8a2c60c..1c472fa 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -136,7 +136,8 @@ uses
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
   schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
-  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas';
+  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
+  srvComisiones_Impl in '..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas' {srvComisiones: TDARemoteService};
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 85f2c28..e266bf6 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -107,6 +107,10 @@
       <Form>srvArticulos</Form>
       <DesignClass>TDARemoteService</DesignClass>
     </DCCReference>
+    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+      <Form>srvComisiones</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
     <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
     <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
     <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
diff --git a/Source/Servidor/FactuGES_Server.drc b/Source/Servidor/FactuGES_Server.drc
index d0aed0d..a874cbc 100644
--- a/Source/Servidor/FactuGES_Server.drc
+++ b/Source/Servidor/FactuGES_Server.drc
@@ -310,150 +310,150 @@
 #define pnglang_EPNGOutMemoryText 64525
 #define pnglang_EPNGHeaderNotPresentText 64526
 #define cxDataConsts_cxSDataReadError 64527
-#define IBSQLMonitor_StrBLOB 64528
-#define IBSQLMonitor_StrFetch 64529
-#define IBSQLMonitor_StrPrepare 64530
-#define IBSQLMonitor_StrPlan 64531
-#define IBSQLMonitor_StrPlanCantRetrive 64532
-#define IBSQLMonitor_StrCommitHardComm 64533
-#define IBSQLMonitor_StrCommitRetaining 64534
-#define IBSQLMonitor_StrRollback 64535
-#define IBSQLMonitor_StrRollbackRetainin 64536
-#define IBSQLMonitor_StrStartTransaction 64537
-#define IBSQLMonitor_StrApplication 64538
+#define IBXConst_STPBConstantUnknownEx 64528
+#define IBXConst_SUnknownPlan 64529
+#define IBXConst_SFieldSizeMismatch 64530
+#define IBXConst_SEventAlreadyRegistered 64531
+#define IBXConst_SStringTooLarge 64532
+#define IBXConst_SNoTimers 64533
+#define IBXConst_SIB65feature 64534
+#define IBXConst_SLoginPromptFailure 64535
+#define IBXConst_SIB70feature 64536
+#define IBXConst_SIB71feature 64537
+#define IBXConst_SIB80feature 64538
 #define pnglang_EPngInvalidCRCText 64539
 #define pnglang_EPNGInvalidIHDRText 64540
 #define pnglang_EPNGMissingMultipleIDATText 64541
 #define pnglang_EPNGZLIBErrorText 64542
 #define pnglang_EPNGInvalidPaletteText 64543
-#define IBXConst_SNoTimers 64544
-#define IBXConst_SIB65feature 64545
-#define IBXConst_SLoginPromptFailure 64546
-#define IBXConst_SIB70feature 64547
-#define IBXConst_SIB71feature 64548
-#define IBXConst_SIB80feature 64549
-#define IBSQLMonitor_StrConnect 64550
-#define IBSQLMonitor_StrDisconnect 64551
-#define IBSQLMonitor_StrMisc 64552
-#define IBSQLMonitor_StrError 64553
-#define IBSQLMonitor_StrAttach 64554
-#define IBSQLMonitor_StrDetach 64555
-#define IBSQLMonitor_StrQuery 64556
-#define IBSQLMonitor_StrStart 64557
-#define IBSQLMonitor_StrExecute 64558
-#define IBSQLMonitor_StrNULL 64559
-#define IBXConst_SDelphiException 64560
-#define IBXConst_SNoOptionsSet 64561
-#define IBXConst_SNoDestinationDirectory 64562
-#define IBXConst_SNosourceDirectory 64563
-#define IBXConst_SNoUninstallFile 64564
-#define IBXConst_SOptionNeedsClient 64565
-#define IBXConst_SOptionNeedsServer 64566
-#define IBXConst_SInvalidOption 64567
-#define IBXConst_SInvalidOnErrorResult 64568
-#define IBXConst_SInvalidOnStatusResult 64569
-#define IBXConst_SDPBConstantUnknownEx 64570
-#define IBXConst_STPBConstantUnknownEx 64571
-#define IBXConst_SUnknownPlan 64572
-#define IBXConst_SFieldSizeMismatch 64573
-#define IBXConst_SEventAlreadyRegistered 64574
-#define IBXConst_SStringTooLarge 64575
-#define IBXConst_SSPBConstantNotSupported 64576
-#define IBXConst_SSPBConstantUnknown 64577
-#define IBXConst_SServiceActive 64578
-#define IBXConst_SServiceInActive 64579
-#define IBXConst_SServerNameMissing 64580
-#define IBXConst_SQueryParamsError 64581
-#define IBXConst_SStartParamsError 64582
-#define IBXConst_SOutputParsingError 64583
-#define IBXConst_SUseSpecificProcedures 64584
-#define IBXConst_SSQLMonitorAlreadyPresent 64585
-#define IBXConst_SCantPrintValue 64586
-#define IBXConst_SEOFReached 64587
-#define IBXConst_SEOFInComment 64588
-#define IBXConst_SEOFInString 64589
-#define IBXConst_SParamNameExpected 64590
-#define IBXConst_SSuccess 64591
-#define IBXConst_SNotLiveRequest 64592
-#define IBXConst_SNoProvider 64593
-#define IBXConst_SNoRecordsAffected 64594
-#define IBXConst_SNoTableName 64595
-#define IBXConst_SCannotCreatePrimaryIndex 64596
-#define IBXConst_SCannotDropSystemIndex 64597
-#define IBXConst_STableNameMismatch 64598
-#define IBXConst_SIndexFieldMissing 64599
-#define IBXConst_SInvalidCancellation 64600
-#define IBXConst_SInvalidEvent 64601
-#define IBXConst_SMaximumEvents 64602
-#define IBXConst_SNoEventsRegistered 64603
-#define IBXConst_SInvalidQueueing 64604
-#define IBXConst_SInvalidRegistration 64605
-#define IBXConst_SInvalidBatchMove 64606
-#define IBXConst_SSQLDialectInvalid 64607
-#define IBXConst_SUserAbort 64608
-#define IBXConst_SDataSetUniDirectional 64609
-#define IBXConst_SCannotCreateSharedResource 64610
-#define IBXConst_SWindowsAPIError 64611
-#define IBXConst_SColumnListsDontMatch 64612
-#define IBXConst_SColumnTypesDontMatch 64613
-#define IBXConst_SCantEndSharedTransaction 64614
-#define IBXConst_SFieldUnsupportedType 64615
-#define IBXConst_SCircularDataLink 64616
-#define IBXConst_SEmptySQLStatement 64617
-#define IBXConst_SIsASelectStatement 64618
-#define IBXConst_SRequiredParamNotSet 64619
-#define IBXConst_SNoStoredProcName 64620
-#define IBXConst_SIsAExecuteProcedure 64621
-#define IBXConst_SUpdateFailed 64622
-#define IBXConst_SNotCachedUpdates 64623
-#define IBXConst_SBlobCannotBeRead 64624
-#define IBXConst_SBlobCannotBeWritten 64625
-#define IBXConst_SEmptyQuery 64626
-#define IBXConst_SCannotOpenNonSQLSelect 64627
-#define IBXConst_SNoFieldAccess 64628
-#define IBXConst_SFieldReadOnly 64629
-#define IBXConst_SFieldNotFound 64630
-#define IBXConst_SNotEditing 64631
-#define IBXConst_SCannotInsert 64632
-#define IBXConst_SCannotPost 64633
-#define IBXConst_SCannotUpdate 64634
-#define IBXConst_SCannotDelete 64635
-#define IBXConst_SCannotRefresh 64636
-#define IBXConst_SBufferNotSet 64637
-#define IBXConst_SCircularReference 64638
-#define IBXConst_SSQLParseError 64639
-#define IBXConst_SDatabaseNotAssigned 64640
-#define IBXConst_STransactionNotAssigned 64641
-#define IBXConst_SXSQLDAIndexOutOfRange 64642
-#define IBXConst_SXSQLDANameDoesNotExist 64643
-#define IBXConst_SEOF 64644
-#define IBXConst_SBOF 64645
-#define IBXConst_SInvalidStatementHandle 64646
-#define IBXConst_SSQLOpen 64647
-#define IBXConst_SSQLClosed 64648
-#define IBXConst_SDatasetOpen 64649
-#define IBXConst_SDatasetClosed 64650
-#define IBXConst_SUnknownSQLDataType 64651
-#define IBXConst_SInvalidColumnIndex 64652
-#define IBXConst_SInvalidParamColumnIndex 64653
-#define IBXConst_SInvalidDataConversion 64654
-#define IBXConst_SColumnIsNotNullable 64655
-#define IBXConst_SCannotSetDatabase 64656
-#define IBXConst_SCannotSetTransaction 64657
-#define IBXConst_SOperationCancelled 64658
-#define IBXConst_SDPBConstantNotSupported 64659
-#define IBXConst_SDPBConstantUnknown 64660
-#define IBXConst_STPBConstantNotSupported 64661
-#define IBXConst_STPBConstantUnknown 64662
-#define IBXConst_SDatabaseClosed 64663
-#define IBXConst_SDatabaseOpen 64664
-#define IBXConst_SDatabaseNameMissing 64665
-#define IBXConst_SNotInTransaction 64666
-#define IBXConst_SInTransaction 64667
-#define IBXConst_STimeoutNegative 64668
-#define IBXConst_SNoDatabasesInTransaction 64669
-#define IBXConst_SUpdateWrongDB 64670
-#define IBXConst_SUpdateWrongTR 64671
+#define IBXConst_SEOFReached 64544
+#define IBXConst_SEOFInComment 64545
+#define IBXConst_SEOFInString 64546
+#define IBXConst_SParamNameExpected 64547
+#define IBXConst_SSuccess 64548
+#define IBXConst_SDelphiException 64549
+#define IBXConst_SNoOptionsSet 64550
+#define IBXConst_SNoDestinationDirectory 64551
+#define IBXConst_SNosourceDirectory 64552
+#define IBXConst_SNoUninstallFile 64553
+#define IBXConst_SOptionNeedsClient 64554
+#define IBXConst_SOptionNeedsServer 64555
+#define IBXConst_SInvalidOption 64556
+#define IBXConst_SInvalidOnErrorResult 64557
+#define IBXConst_SInvalidOnStatusResult 64558
+#define IBXConst_SDPBConstantUnknownEx 64559
+#define IBXConst_SNoEventsRegistered 64560
+#define IBXConst_SInvalidQueueing 64561
+#define IBXConst_SInvalidRegistration 64562
+#define IBXConst_SInvalidBatchMove 64563
+#define IBXConst_SSQLDialectInvalid 64564
+#define IBXConst_SSPBConstantNotSupported 64565
+#define IBXConst_SSPBConstantUnknown 64566
+#define IBXConst_SServiceActive 64567
+#define IBXConst_SServiceInActive 64568
+#define IBXConst_SServerNameMissing 64569
+#define IBXConst_SQueryParamsError 64570
+#define IBXConst_SStartParamsError 64571
+#define IBXConst_SOutputParsingError 64572
+#define IBXConst_SUseSpecificProcedures 64573
+#define IBXConst_SSQLMonitorAlreadyPresent 64574
+#define IBXConst_SCantPrintValue 64575
+#define IBXConst_SRequiredParamNotSet 64576
+#define IBXConst_SNoStoredProcName 64577
+#define IBXConst_SIsAExecuteProcedure 64578
+#define IBXConst_SUpdateFailed 64579
+#define IBXConst_SNotCachedUpdates 64580
+#define IBXConst_SNotLiveRequest 64581
+#define IBXConst_SNoProvider 64582
+#define IBXConst_SNoRecordsAffected 64583
+#define IBXConst_SNoTableName 64584
+#define IBXConst_SCannotCreatePrimaryIndex 64585
+#define IBXConst_SCannotDropSystemIndex 64586
+#define IBXConst_STableNameMismatch 64587
+#define IBXConst_SIndexFieldMissing 64588
+#define IBXConst_SInvalidCancellation 64589
+#define IBXConst_SInvalidEvent 64590
+#define IBXConst_SMaximumEvents 64591
+#define IBXConst_SCannotDelete 64592
+#define IBXConst_SCannotRefresh 64593
+#define IBXConst_SBufferNotSet 64594
+#define IBXConst_SCircularReference 64595
+#define IBXConst_SSQLParseError 64596
+#define IBXConst_SUserAbort 64597
+#define IBXConst_SDataSetUniDirectional 64598
+#define IBXConst_SCannotCreateSharedResource 64599
+#define IBXConst_SWindowsAPIError 64600
+#define IBXConst_SColumnListsDontMatch 64601
+#define IBXConst_SColumnTypesDontMatch 64602
+#define IBXConst_SCantEndSharedTransaction 64603
+#define IBXConst_SFieldUnsupportedType 64604
+#define IBXConst_SCircularDataLink 64605
+#define IBXConst_SEmptySQLStatement 64606
+#define IBXConst_SIsASelectStatement 64607
+#define IBXConst_SUnknownSQLDataType 64608
+#define IBXConst_SInvalidColumnIndex 64609
+#define IBXConst_SInvalidParamColumnIndex 64610
+#define IBXConst_SInvalidDataConversion 64611
+#define IBXConst_SColumnIsNotNullable 64612
+#define IBXConst_SBlobCannotBeRead 64613
+#define IBXConst_SBlobCannotBeWritten 64614
+#define IBXConst_SEmptyQuery 64615
+#define IBXConst_SCannotOpenNonSQLSelect 64616
+#define IBXConst_SNoFieldAccess 64617
+#define IBXConst_SFieldReadOnly 64618
+#define IBXConst_SFieldNotFound 64619
+#define IBXConst_SNotEditing 64620
+#define IBXConst_SCannotInsert 64621
+#define IBXConst_SCannotPost 64622
+#define IBXConst_SCannotUpdate 64623
+#define IBXConst_SInTransaction 64624
+#define IBXConst_STimeoutNegative 64625
+#define IBXConst_SNoDatabasesInTransaction 64626
+#define IBXConst_SUpdateWrongDB 64627
+#define IBXConst_SUpdateWrongTR 64628
+#define IBXConst_SDatabaseNotAssigned 64629
+#define IBXConst_STransactionNotAssigned 64630
+#define IBXConst_SXSQLDAIndexOutOfRange 64631
+#define IBXConst_SXSQLDANameDoesNotExist 64632
+#define IBXConst_SEOF 64633
+#define IBXConst_SBOF 64634
+#define IBXConst_SInvalidStatementHandle 64635
+#define IBXConst_SSQLOpen 64636
+#define IBXConst_SSQLClosed 64637
+#define IBXConst_SDatasetOpen 64638
+#define IBXConst_SDatasetClosed 64639
+#define IBXConst_SIB60feature 64640
+#define IBXConst_SNotSupported 64641
+#define IBXConst_SNotPermitted 64642
+#define IBXConst_SFileAccessError 64643
+#define IBXConst_SConnectionTimeout 64644
+#define IBXConst_SCannotSetDatabase 64645
+#define IBXConst_SCannotSetTransaction 64646
+#define IBXConst_SOperationCancelled 64647
+#define IBXConst_SDPBConstantNotSupported 64648
+#define IBXConst_SDPBConstantUnknown 64649
+#define IBXConst_STPBConstantNotSupported 64650
+#define IBXConst_STPBConstantUnknown 64651
+#define IBXConst_SDatabaseClosed 64652
+#define IBXConst_SDatabaseOpen 64653
+#define IBXConst_SDatabaseNameMissing 64654
+#define IBXConst_SNotInTransaction 64655
+#define IBSQLMonitor_StrExecute 64656
+#define IBSQLMonitor_StrNULL 64657
+#define IBSQLMonitor_StrBLOB 64658
+#define IBSQLMonitor_StrFetch 64659
+#define IBSQLMonitor_StrPrepare 64660
+#define IBSQLMonitor_StrPlan 64661
+#define IBSQLMonitor_StrPlanCantRetrive 64662
+#define IBSQLMonitor_StrCommitHardComm 64663
+#define IBSQLMonitor_StrCommitRetaining 64664
+#define IBSQLMonitor_StrRollback 64665
+#define IBSQLMonitor_StrRollbackRetainin 64666
+#define IBSQLMonitor_StrStartTransaction 64667
+#define IBSQLMonitor_StrApplication 64668
+#define IBXConst_SUnknownError 64669
+#define IBXConst_SInterBaseMissing 64670
+#define IBXConst_SInterBaseInstallMissing 64671
 #define uDARes_err_DARDMInvalidSchema 64672
 #define uDARes_err_DARDMCannotFindProxessorForDelta 64673
 #define uDARes_err_NeedShareMem 64674
@@ -462,14 +462,14 @@
 #define uDARes_err_SQLNotPermitted 64677
 #define uDARes_err_UTF8DecodeError 64678
 #define uDAMemDataset_SNoDetailFilter 64679
-#define IBXConst_SUnknownError 64680
-#define IBXConst_SInterBaseMissing 64681
-#define IBXConst_SInterBaseInstallMissing 64682
-#define IBXConst_SIB60feature 64683
-#define IBXConst_SNotSupported 64684
-#define IBXConst_SNotPermitted 64685
-#define IBXConst_SFileAccessError 64686
-#define IBXConst_SConnectionTimeout 64687
+#define IBSQLMonitor_StrConnect 64680
+#define IBSQLMonitor_StrDisconnect 64681
+#define IBSQLMonitor_StrMisc 64682
+#define IBSQLMonitor_StrError 64683
+#define IBSQLMonitor_StrAttach 64684
+#define IBSQLMonitor_StrDetach 64685
+#define IBSQLMonitor_StrQuery 64686
+#define IBSQLMonitor_StrStart 64687
 #define uDARes_err_DriverManagerNotAssigned 64688
 #define uDARes_err_FieldTypeNotSupported 64689
 #define uDARes_err_NotSupported 64690
@@ -758,86 +758,86 @@
 #define frxpnglang_EPNGInvalidIHDRText 64973
 #define frxpnglang_EPNGMissingMultipleIDATText 64974
 #define frxpnglang_EPNGZLIBErrorText 64975
-#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 64976
-#define IdResourceStringsCore_RSConnectTimeout 64977
-#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 64978
-#define IdResourceStringsCore_RSAlreadyConnected 64979
-#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 64980
-#define IdResourceStringsCore_RSchedMaxThreadEx 64981
-#define IdResourceStringsCore_RSTransparentProxyCannotBind 64982
-#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 64983
-#define IdResourceStringsCore_RSBufferMissingTerminator 64984
-#define IdResourceStringsCore_RSBufferInvalidStartPos 64985
-#define IdResourceStringsCore_RSReplyInvalidCode 64986
-#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64987
-#define IdResourceStringsCore_RSNoOnExecute 64988
-#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64989
+#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 64976
+#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 64977
+#define IdResourceStringsProtocols_RSHTTPInternalServerError 64978
+#define IdResourceStringsProtocols_RSHTTPNotImplemented 64979
+#define IdResourceStringsProtocols_RSHTTPBadGateway 64980
+#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64981
+#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64982
+#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64983
+#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64984
+#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64985
+#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64986
+#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64987
+#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 64988
+#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 64989
 #define ComStrs_sTabFailClear 64990
 #define ComStrs_sTabFailDelete 64991
-#define IdResourceStringsCore_RSSocksServerGeneralError 64992
-#define IdResourceStringsCore_RSSocksServerPermissionError 64993
-#define IdResourceStringsCore_RSSocksServerNetUnreachableError 64994
-#define IdResourceStringsCore_RSSocksServerHostUnreachableError 64995
-#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 64996
-#define IdResourceStringsCore_RSSocksServerTTLExpiredError 64997
-#define IdResourceStringsCore_RSSocksServerCommandError 64998
-#define IdResourceStringsCore_RSSocksServerAddressError 64999
-#define IdResourceStringsCore_RSInterceptCircularLink 65000
-#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65001
-#define IdResourceStringsCore_RSTooMuchDataInBuffer 65002
-#define IdResourceStringsCore_RSFileNotFound 65003
-#define IdResourceStringsCore_RSNotConnected 65004
-#define IdResourceStringsCore_RSObjectTypeNotSupported 65005
-#define IdResourceStringsCore_RSIdNoDataToRead 65006
-#define IdResourceStringsCore_RSReadTimeout 65007
-#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 65008
-#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 65009
-#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 65010
-#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 65011
-#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 65012
-#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 65013
-#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 65014
-#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 65015
-#define IdResourceStringsCore_RSSocksUDPNotSupported 65016
-#define IdResourceStringsCore_RSSocksRequestFailed 65017
-#define IdResourceStringsCore_RSSocksRequestServerFailed 65018
-#define IdResourceStringsCore_RSSocksRequestIdentFailed 65019
-#define IdResourceStringsCore_RSSocksUnknownError 65020
-#define IdResourceStringsCore_RSSocksServerRespondError 65021
-#define IdResourceStringsCore_RSSocksAuthMethodError 65022
-#define IdResourceStringsCore_RSSocksAuthError 65023
-#define IdResourceStringsProtocols_RSHTTPNotFound 65024
-#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65025
-#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65026
-#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65027
-#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65028
-#define IdResourceStringsProtocols_RSHTTPConflict 65029
-#define IdResourceStringsProtocols_RSHTTPGone 65030
-#define IdResourceStringsProtocols_RSHTTPLengthRequired 65031
-#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65032
-#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65033
-#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 65034
-#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 65035
-#define IdResourceStringsProtocols_RSHTTPInternalServerError 65036
-#define IdResourceStringsProtocols_RSHTTPNotImplemented 65037
-#define IdResourceStringsProtocols_RSHTTPBadGateway 65038
-#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 65039
-#define IdResourceStringsProtocols_RSHTTPContinue 65040
-#define IdResourceStringsProtocols_RSHTTPOK 65041
-#define IdResourceStringsProtocols_RSHTTPCreated 65042
-#define IdResourceStringsProtocols_RSHTTPAccepted 65043
-#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65044
-#define IdResourceStringsProtocols_RSHTTPNoContent 65045
-#define IdResourceStringsProtocols_RSHTTPResetContent 65046
-#define IdResourceStringsProtocols_RSHTTPPartialContent 65047
-#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65048
-#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65049
-#define IdResourceStringsProtocols_RSHTTPSeeOther 65050
-#define IdResourceStringsProtocols_RSHTTPNotModified 65051
-#define IdResourceStringsProtocols_RSHTTPUseProxy 65052
-#define IdResourceStringsProtocols_RSHTTPBadRequest 65053
-#define IdResourceStringsProtocols_RSHTTPUnauthorized 65054
-#define IdResourceStringsProtocols_RSHTTPForbidden 65055
+#define IdResourceStringsProtocols_RSHTTPSeeOther 64992
+#define IdResourceStringsProtocols_RSHTTPNotModified 64993
+#define IdResourceStringsProtocols_RSHTTPUseProxy 64994
+#define IdResourceStringsProtocols_RSHTTPBadRequest 64995
+#define IdResourceStringsProtocols_RSHTTPUnauthorized 64996
+#define IdResourceStringsProtocols_RSHTTPForbidden 64997
+#define IdResourceStringsProtocols_RSHTTPNotFound 64998
+#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 64999
+#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65000
+#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65001
+#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65002
+#define IdResourceStringsProtocols_RSHTTPConflict 65003
+#define IdResourceStringsProtocols_RSHTTPGone 65004
+#define IdResourceStringsProtocols_RSHTTPLengthRequired 65005
+#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65006
+#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65007
+#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 65008
+#define IdResourceStringsCore_RSNoOnExecute 65009
+#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 65010
+#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65011
+#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65012
+#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65013
+#define IdResourceStringsProtocols_RSHTTPContinue 65014
+#define IdResourceStringsProtocols_RSHTTPOK 65015
+#define IdResourceStringsProtocols_RSHTTPCreated 65016
+#define IdResourceStringsProtocols_RSHTTPAccepted 65017
+#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65018
+#define IdResourceStringsProtocols_RSHTTPNoContent 65019
+#define IdResourceStringsProtocols_RSHTTPResetContent 65020
+#define IdResourceStringsProtocols_RSHTTPPartialContent 65021
+#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65022
+#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65023
+#define IdResourceStringsCore_RSFileNotFound 65024
+#define IdResourceStringsCore_RSNotConnected 65025
+#define IdResourceStringsCore_RSObjectTypeNotSupported 65026
+#define IdResourceStringsCore_RSIdNoDataToRead 65027
+#define IdResourceStringsCore_RSReadTimeout 65028
+#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65029
+#define IdResourceStringsCore_RSConnectTimeout 65030
+#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65031
+#define IdResourceStringsCore_RSAlreadyConnected 65032
+#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65033
+#define IdResourceStringsCore_RSchedMaxThreadEx 65034
+#define IdResourceStringsCore_RSTransparentProxyCannotBind 65035
+#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 65036
+#define IdResourceStringsCore_RSBufferMissingTerminator 65037
+#define IdResourceStringsCore_RSBufferInvalidStartPos 65038
+#define IdResourceStringsCore_RSReplyInvalidCode 65039
+#define IdResourceStringsCore_RSSocksRequestIdentFailed 65040
+#define IdResourceStringsCore_RSSocksUnknownError 65041
+#define IdResourceStringsCore_RSSocksServerRespondError 65042
+#define IdResourceStringsCore_RSSocksAuthMethodError 65043
+#define IdResourceStringsCore_RSSocksAuthError 65044
+#define IdResourceStringsCore_RSSocksServerGeneralError 65045
+#define IdResourceStringsCore_RSSocksServerPermissionError 65046
+#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65047
+#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65048
+#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65049
+#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65050
+#define IdResourceStringsCore_RSSocksServerCommandError 65051
+#define IdResourceStringsCore_RSSocksServerAddressError 65052
+#define IdResourceStringsCore_RSInterceptCircularLink 65053
+#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65054
+#define IdResourceStringsCore_RSTooMuchDataInBuffer 65055
 #define IdResourceStrings_RSAntiFreezeOnlyOne 65056
 #define IdResourceStrings_RSCannotSetIPVersionWhenConnected 65057
 #define IdResourceStrings_RSCannotBindRange 65058
@@ -851,9 +851,9 @@
 #define IdResourceStrings_RSNotAllBytesSent 65066
 #define IdResourceStrings_RSPackageSizeTooBig 65067
 #define IdResourceStrings_RSSetSizeExceeded 65068
-#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65069
-#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65070
-#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65071
+#define IdResourceStringsCore_RSSocksUDPNotSupported 65069
+#define IdResourceStringsCore_RSSocksRequestFailed 65070
+#define IdResourceStringsCore_RSSocksRequestServerFailed 65071
 #define IdResourceStrings_RSStackECONNRESET 65072
 #define IdResourceStrings_RSStackENOBUFS 65073
 #define IdResourceStrings_RSStackEISCONN 65074
@@ -950,86 +950,86 @@
 #define DBConsts_SDataSetMissing 65165
 #define DBConsts_SInvalidCalcType 65166
 #define DBConsts_SFieldReadOnly 65167
-#define uRORes_err_IDispatchMarshalingNotSupported 65168
-#define uRORes_err_UnsupportedVariantType 65169
-#define uRORes_err_VariantIsNotArray 65170
-#define uRORes_err_InvalidVarArrayDimCount 65171
-#define uRORes_err_CannotFindParameter 65172
-#define uRORes_err_MessageNotAssigned 65173
-#define ComConst_SOleError 65174
-#define ComConst_SNoMethod 65175
-#define ComConst_SVarNotObject 65176
-#define ComConst_STooManyParams 65177
-#define ComConst_SDCOMNotInstalled 65178
+#define uRODECConst_sStringFormatExists 65168
+#define uRODECConst_sInvalidStringFormat 65169
+#define uRODECConst_sInvalidFormatString 65170
+#define uRODECConst_sFMT_COPY 65171
+#define uRODECConst_sFMT_HEX 65172
+#define uRODECConst_sFMT_HEXL 65173
+#define uRODECConst_sFMT_MIME64 65174
+#define uRODECConst_sFMT_UU 65175
+#define uRODECConst_sFMT_XX 65176
+#define uRODECConst_sInvalidKeySize 65177
+#define uRODECConst_sNotInitialized 65178
 #define DBConsts_SInvalidFieldSize 65179
 #define DBConsts_SInvalidFieldKind 65180
 #define DBConsts_SUnknownFieldType 65181
 #define DBConsts_SFieldNameMissing 65182
 #define DBConsts_SDuplicateFieldName 65183
-#define uRORes_err_CannotFindMessageDispatcher 65184
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65185
-#define uRORes_err_UnhandledException 65186
-#define uRORes_err_ChannelBusy 65187
-#define uRORes_err_ArrayIndexOutOfBounds 65188
-#define uRORes_err_InvalidHeader 65189
-#define uRORes_err_InvalidHeaderEncrypted 65190
-#define uRORes_err_UnknownClassInStream 65191
-#define uRORes_err_UnexpectedClassInStream 65192
-#define uRORes_err_SessionNotFound 65193
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65194
-#define uRORes_err_TooManySessions 65195
-#define uRORes_err_DOMElementIsNIL 65196
-#define uRORes_err_CannotLoadXMLDocument 65197
-#define uRORes_err_ErrorCreatingMsXmlDoc 65198
-#define uRORes_err_NoXMLParsersAvailable 65199
-#define uRORes_str_ExceptionReraisedFromServer 65200
-#define uRORes_err_AssignError 65201
-#define uRORes_err_InvalidRequestStream 65202
-#define uRORes_err_NILMessage 65203
-#define uRORes_err_UnspecifiedInterface 65204
-#define uRORes_err_UnspecifiedMessage 65205
-#define uRORes_err_UnknownMethod 65206
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65207
-#define uRORes_err_AbstractService 65208
-#define uRORes_err_TypeNotSupported 65209
-#define uRORes_err_ClassFactoryNotFound 65210
-#define uRORes_err_IROMessageNotSupported 65211
-#define uRORes_err_ClassAlreadyRegistered 65212
-#define uRORes_err_UnknownClass 65213
-#define uRORes_err_UnknownProxyInterface 65214
-#define uRORes_err_DispatcherAlreadyAssigned 65215
-#define uRORes_err_InvalidStringLength 65216
-#define uRORes_str_InvalidClassTypeInStream 65217
-#define uRORes_err_UnexpectedEndOfStream 65218
-#define uRORes_err_RodlDuplicateName 65219
-#define uRORes_err_RodlNoDataTypeSpecified 65220
-#define uRORes_err_RodlNoEnumValues 65221
-#define uRORes_err_RodlNoStructElementsDefined 65222
-#define uRORes_err_RodlNoOperationsDefined 65223
-#define uRORes_err_RodlUsedFileDoesNotExist 65224
-#define uRORes_err_RodlInvalidDataType 65225
-#define uRORes_err_RodlStructCannotBeNested 65226
-#define uRORes_err_RodlInvalidAncestorType 65227
-#define uRORes_err_RodlItemExistsInAnsector 65228
-#define uRORes_err_RodlCircularReference 65229
-#define uRORes_err_RodlCircularityWarning 65230
-#define uRORes_str_ExceptionOnServer 65231
-#define uRODECConst_sInvalidStringFormat 65232
-#define uRODECConst_sInvalidFormatString 65233
-#define uRODECConst_sFMT_COPY 65234
-#define uRODECConst_sFMT_HEX 65235
-#define uRODECConst_sFMT_HEXL 65236
-#define uRODECConst_sFMT_MIME64 65237
-#define uRODECConst_sFMT_UU 65238
-#define uRODECConst_sFMT_XX 65239
-#define uRODECConst_sInvalidKeySize 65240
-#define uRODECConst_sNotInitialized 65241
-#define uRORes_err_InvalidIndex 65242
-#define uRORes_err_InvalidType 65243
-#define uRORes_err_InvalidLibrary 65244
-#define uRORes_err_InvalidStream 65245
-#define uRORes_err_InvalidTargetEntity 65246
-#define uRORes_err_InvalidParamFlag 65247
+#define uRORes_err_DOMElementIsNIL 65184
+#define uRORes_err_CannotLoadXMLDocument 65185
+#define uRORes_err_ErrorCreatingMsXmlDoc 65186
+#define uRORes_err_NoXMLParsersAvailable 65187
+#define uRORes_err_IDispatchMarshalingNotSupported 65188
+#define uRORes_err_UnsupportedVariantType 65189
+#define uRORes_err_VariantIsNotArray 65190
+#define uRORes_err_InvalidVarArrayDimCount 65191
+#define uRORes_err_CannotFindParameter 65192
+#define uRORes_err_MessageNotAssigned 65193
+#define ComConst_SOleError 65194
+#define ComConst_SNoMethod 65195
+#define ComConst_SVarNotObject 65196
+#define ComConst_STooManyParams 65197
+#define ComConst_SDCOMNotInstalled 65198
+#define uRODECConst_sProtectionCircular 65199
+#define uRORes_err_ClassAlreadyRegistered 65200
+#define uRORes_err_UnknownClass 65201
+#define uRORes_err_UnknownProxyInterface 65202
+#define uRORes_err_DispatcherAlreadyAssigned 65203
+#define uRORes_err_CannotFindMessageDispatcher 65204
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65205
+#define uRORes_err_UnhandledException 65206
+#define uRORes_err_ChannelBusy 65207
+#define uRORes_err_ArrayIndexOutOfBounds 65208
+#define uRORes_err_InvalidHeader 65209
+#define uRORes_err_InvalidHeaderEncrypted 65210
+#define uRORes_err_UnknownClassInStream 65211
+#define uRORes_err_UnexpectedClassInStream 65212
+#define uRORes_err_SessionNotFound 65213
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65214
+#define uRORes_err_TooManySessions 65215
+#define uRORes_err_RodlItemExistsInAnsector 65216
+#define uRORes_err_RodlCircularReference 65217
+#define uRORes_err_RodlCircularityWarning 65218
+#define uRORes_str_ExceptionOnServer 65219
+#define uRORes_str_ExceptionReraisedFromServer 65220
+#define uRORes_err_AssignError 65221
+#define uRORes_err_InvalidRequestStream 65222
+#define uRORes_err_NILMessage 65223
+#define uRORes_err_UnspecifiedInterface 65224
+#define uRORes_err_UnspecifiedMessage 65225
+#define uRORes_err_UnknownMethod 65226
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65227
+#define uRORes_err_AbstractService 65228
+#define uRORes_err_TypeNotSupported 65229
+#define uRORes_err_ClassFactoryNotFound 65230
+#define uRORes_err_IROMessageNotSupported 65231
+#define uRORes_err_InvalidLibrary 65232
+#define uRORes_err_InvalidStream 65233
+#define uRORes_err_InvalidTargetEntity 65234
+#define uRORes_err_InvalidParamFlag 65235
+#define uRORes_err_InvalidStringLength 65236
+#define uRORes_str_InvalidClassTypeInStream 65237
+#define uRORes_err_UnexpectedEndOfStream 65238
+#define uRORes_err_RodlDuplicateName 65239
+#define uRORes_err_RodlNoDataTypeSpecified 65240
+#define uRORes_err_RodlNoEnumValues 65241
+#define uRORes_err_RodlNoStructElementsDefined 65242
+#define uRORes_err_RodlNoOperationsDefined 65243
+#define uRORes_err_RodlUsedFileDoesNotExist 65244
+#define uRORes_err_RodlInvalidDataType 65245
+#define uRORes_err_RodlStructCannotBeNested 65246
+#define uRORes_err_RodlInvalidAncestorType 65247
 #define Consts_SASCIIEncoding 65248
 #define Consts_SUnicodeEncoding 65249
 #define Consts_SBigEndianEncoding 65250
@@ -1044,8 +1044,8 @@
 #define HelpIntfs_hNoContext 65259
 #define HelpIntfs_hNoContextFound 65260
 #define HelpIntfs_hNoTopics 65261
-#define uRODECConst_sProtectionCircular 65262
-#define uRODECConst_sStringFormatExists 65263
+#define uRORes_err_InvalidIndex 65262
+#define uRORes_err_InvalidType 65263
 #define Consts_SShutdown 65264
 #define Consts_SCustomError 65265
 #define Consts_SServiceInstallOK 65266
@@ -1622,38 +1622,27 @@ BEGIN
 	pnglang_EPNGOutMemoryText,	"Some operation could not be performed because the system is out of resources. Close some windows and try again."
 	pnglang_EPNGHeaderNotPresentText,	"This operation is not valid because the current image contains no valid header."
 	cxDataConsts_cxSDataReadError,	"Stream read error"
-	IBSQLMonitor_StrBLOB,	"<BLOB>"
-	IBSQLMonitor_StrFetch,	": [Fetch] "
-	IBSQLMonitor_StrPrepare,	": [Prepare] "
-	IBSQLMonitor_StrPlan,	"  Plan: "
-	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
-	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
-	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
-	IBSQLMonitor_StrRollback,	": [Rollback]"
-	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
-	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
-	IBSQLMonitor_StrApplication,	"[Application: "
-	pnglang_EPngInvalidCRCText,	"This \"Portable Network Graphics\" image is not valid because it contains invalid pieces of data (crc error)"
-	pnglang_EPNGInvalidIHDRText,	"The \"Portable Network Graphics\" image could not be loaded because one of its main piece of data (ihdr) might be corrupted"
-	pnglang_EPNGMissingMultipleIDATText,	"This \"Portable Network Graphics\" image is invalid because it has missing image parts."
-	pnglang_EPNGZLIBErrorText,	"Could not decompress the image because it contains invalid compressed data.\r\n Description: "
-	pnglang_EPNGInvalidPaletteText,	"The \"Portable Network Graphics\" image contains an invalid palette."
+	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
+	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
+	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
+	IBXConst_SEventAlreadyRegistered,	"Events already registered"
+	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
 	IBXConst_SNoTimers,	"Not enough timers available"
 	IBXConst_SIB65feature,	"%s is an InterBase 6.5 function. Please upgrade to InterBase 6.5 to use this functonality"
 	IBXConst_SLoginPromptFailure,	"Can not find default login prompt dialog.  Please add DBLogDlg to the uses section of your main file."
 	IBXConst_SIB70feature,	"%s is an InterBase 7.0 function. Please upgrade to InterBase 7.0 to use this functonality"
 	IBXConst_SIB71feature,	"%s is an InterBase 7.1 function. Please upgrade to InterBase 7.1 to use this functonality"
 	IBXConst_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
-	IBSQLMonitor_StrConnect,	": [Connect]"
-	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
-	IBSQLMonitor_StrMisc,	"[Misc] "
-	IBSQLMonitor_StrError,	"[Error] "
-	IBSQLMonitor_StrAttach,	": [Attach]"
-	IBSQLMonitor_StrDetach,	": [Detach]"
-	IBSQLMonitor_StrQuery,	": [Query]"
-	IBSQLMonitor_StrStart,	": [Start]"
-	IBSQLMonitor_StrExecute,	": [Execute] "
-	IBSQLMonitor_StrNULL,	"<NULL>"
+	pnglang_EPngInvalidCRCText,	"This \"Portable Network Graphics\" image is not valid because it contains invalid pieces of data (crc error)"
+	pnglang_EPNGInvalidIHDRText,	"The \"Portable Network Graphics\" image could not be loaded because one of its main piece of data (ihdr) might be corrupted"
+	pnglang_EPNGMissingMultipleIDATText,	"This \"Portable Network Graphics\" image is invalid because it has missing image parts."
+	pnglang_EPNGZLIBErrorText,	"Could not decompress the image because it contains invalid compressed data.\r\n Description: "
+	pnglang_EPNGInvalidPaletteText,	"The \"Portable Network Graphics\" image contains an invalid palette."
+	IBXConst_SEOFReached,	"SEOFReached"
+	IBXConst_SEOFInComment,	"EOF in comment detected"
+	IBXConst_SEOFInString,	"EOF in string detected"
+	IBXConst_SParamNameExpected,	"Parameter name expected"
+	IBXConst_SSuccess,	"Successful execution"
 	IBXConst_SDelphiException,	"DelphiException %s"
 	IBXConst_SNoOptionsSet,	"No Install Options selected"
 	IBXConst_SNoDestinationDirectory,	"DestinationDirectory is not set"
@@ -1665,11 +1654,11 @@ BEGIN
 	IBXConst_SInvalidOnErrorResult,	"Unexpected onError return value"
 	IBXConst_SInvalidOnStatusResult,	"Unexpected onStatus return value"
 	IBXConst_SDPBConstantUnknownEx,	"DPB Constant (%s) is unknown"
-	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
-	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
-	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
-	IBXConst_SEventAlreadyRegistered,	"Events already registered"
-	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
+	IBXConst_SNoEventsRegistered,	"No Events Registered"
+	IBXConst_SInvalidQueueing,	"Invalid Queueing"
+	IBXConst_SInvalidRegistration,	"Invalid Registration"
+	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
+	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
 	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
 	IBXConst_SSPBConstantUnknown,	"SPB Constant Unknown"
 	IBXConst_SServiceActive,	"Cannot perform operation -- service is not attached"
@@ -1681,11 +1670,11 @@ BEGIN
 	IBXConst_SUseSpecificProcedures,	"Generic ServiceStart not applicable: Use Specific Procedures to set configuration params"
 	IBXConst_SSQLMonitorAlreadyPresent,	"SQL Monitor Instance is already present"
 	IBXConst_SCantPrintValue,	"Cannot print value"
-	IBXConst_SEOFReached,	"SEOFReached"
-	IBXConst_SEOFInComment,	"EOF in comment detected"
-	IBXConst_SEOFInString,	"EOF in string detected"
-	IBXConst_SParamNameExpected,	"Parameter name expected"
-	IBXConst_SSuccess,	"Successful execution"
+	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
+	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
+	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
+	IBXConst_SUpdateFailed,	"Update Failed"
+	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
 	IBXConst_SNotLiveRequest,	"Request is not live - cannot modify"
 	IBXConst_SNoProvider,	"No Provider"
 	IBXConst_SNoRecordsAffected,	"No Records Affected"
@@ -1697,11 +1686,11 @@ BEGIN
 	IBXConst_SInvalidCancellation,	"Cannot Cancel events while processing"
 	IBXConst_SInvalidEvent,	"Invalid Event"
 	IBXConst_SMaximumEvents,	"Exceded Maximum Event limits"
-	IBXConst_SNoEventsRegistered,	"No Events Registered"
-	IBXConst_SInvalidQueueing,	"Invalid Queueing"
-	IBXConst_SInvalidRegistration,	"Invalid Registration"
-	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
-	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
+	IBXConst_SCannotDelete,	"Cannot delete from dataset. (No delete query)"
+	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
+	IBXConst_SBufferNotSet,	"Buffer not set"
+	IBXConst_SCircularReference,	"Circular references not permitted"
+	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
 	IBXConst_SUserAbort,	"User abort"
 	IBXConst_SDataSetUniDirectional,	"Data set is uni-directional"
 	IBXConst_SCannotCreateSharedResource,	"Cannot create shared resource. (Windows error %d)"
@@ -1713,11 +1702,11 @@ BEGIN
 	IBXConst_SCircularDataLink,	"Circular DataLink Reference"
 	IBXConst_SEmptySQLStatement,	"Empty SQL Statement"
 	IBXConst_SIsASelectStatement,	"use Open for a Select Statement"
-	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
-	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
-	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
-	IBXConst_SUpdateFailed,	"Update Failed"
-	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
+	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
+	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
+	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
+	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
+	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
 	IBXConst_SBlobCannotBeRead,	"Blob stream cannot be read"
 	IBXConst_SBlobCannotBeWritten,	"Blob stream cannot be written"
 	IBXConst_SEmptyQuery,	"Empty query"
@@ -1729,11 +1718,11 @@ BEGIN
 	IBXConst_SCannotInsert,	"Cannot insert into dataset. (No insert query)"
 	IBXConst_SCannotPost,	"Cannot post. (No update/insert query)"
 	IBXConst_SCannotUpdate,	"Cannot update. (No update query)"
-	IBXConst_SCannotDelete,	"Cannot delete from dataset. (No delete query)"
-	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
-	IBXConst_SBufferNotSet,	"Buffer not set"
-	IBXConst_SCircularReference,	"Circular references not permitted"
-	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
+	IBXConst_SInTransaction,	"Transaction is active"
+	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
+	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
+	IBXConst_SUpdateWrongDB,	"Updating wrong database"
+	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
 	IBXConst_SDatabaseNotAssigned,	"Database not assigned"
 	IBXConst_STransactionNotAssigned,	"Transaction not assigned"
 	IBXConst_SXSQLDAIndexOutOfRange,	"XSQLDA index out of range"
@@ -1745,11 +1734,11 @@ BEGIN
 	IBXConst_SSQLClosed,	"IBSQL Closed"
 	IBXConst_SDatasetOpen,	"Dataset open"
 	IBXConst_SDatasetClosed,	"Dataset closed"
-	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
-	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
-	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
-	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
-	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
+	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
+	IBXConst_SNotSupported,	"Unsupported feature"
+	IBXConst_SNotPermitted,	"Not permitted"
+	IBXConst_SFileAccessError,	"Temporary file access error"
+	IBXConst_SConnectionTimeout,	"Database connection timed out"
 	IBXConst_SCannotSetDatabase,	"Cannot set database"
 	IBXConst_SCannotSetTransaction,	"Cannot set transaction"
 	IBXConst_SOperationCancelled,	"Operation cancelled at user's request"
@@ -1761,11 +1750,22 @@ BEGIN
 	IBXConst_SDatabaseOpen,	"Cannot perform operation -- DB is currently open"
 	IBXConst_SDatabaseNameMissing,	"Database name is missing"
 	IBXConst_SNotInTransaction,	"Transaction is not active"
-	IBXConst_SInTransaction,	"Transaction is active"
-	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
-	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
-	IBXConst_SUpdateWrongDB,	"Updating wrong database"
-	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
+	IBSQLMonitor_StrExecute,	": [Execute] "
+	IBSQLMonitor_StrNULL,	"<NULL>"
+	IBSQLMonitor_StrBLOB,	"<BLOB>"
+	IBSQLMonitor_StrFetch,	": [Fetch] "
+	IBSQLMonitor_StrPrepare,	": [Prepare] "
+	IBSQLMonitor_StrPlan,	"  Plan: "
+	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
+	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
+	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
+	IBSQLMonitor_StrRollback,	": [Rollback]"
+	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
+	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
+	IBSQLMonitor_StrApplication,	"[Application: "
+	IBXConst_SUnknownError,	"Unknown error"
+	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
+	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
 	uDARes_err_DARDMInvalidSchema,	"Schema must be assigned and must point to a ConnectionManager"
 	uDARes_err_DARDMCannotFindProxessorForDelta,	"Cannot find a business processor for delta \"%s\""
 	uDARes_err_NeedShareMem,	"To use dynamically loaded drivers, you must build your application with ShareMem."
@@ -1774,14 +1774,14 @@ BEGIN
 	uDARes_err_SQLNotPermitted,	"Execution of the specified SQL statement has not been permitted."
 	uDARes_err_UTF8DecodeError,	"Can't decode UTF8 string: \"%s\""
 	uDAMemDataset_SNoDetailFilter,	"Filter property cannot be used for detail tables"
-	IBXConst_SUnknownError,	"Unknown error"
-	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
-	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
-	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
-	IBXConst_SNotSupported,	"Unsupported feature"
-	IBXConst_SNotPermitted,	"Not permitted"
-	IBXConst_SFileAccessError,	"Temporary file access error"
-	IBXConst_SConnectionTimeout,	"Database connection timed out"
+	IBSQLMonitor_StrConnect,	": [Connect]"
+	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
+	IBSQLMonitor_StrMisc,	"[Misc] "
+	IBSQLMonitor_StrError,	"[Error] "
+	IBSQLMonitor_StrAttach,	": [Attach]"
+	IBSQLMonitor_StrDetach,	": [Detach]"
+	IBSQLMonitor_StrQuery,	": [Query]"
+	IBSQLMonitor_StrStart,	": [Start]"
 	uDARes_err_DriverManagerNotAssigned,	"Driver Manager is not assigned"
 	uDARes_err_FieldTypeNotSupported,	"FieldType %s (%d) is not supported"
 	uDARes_err_NotSupported,	"Not supported"
@@ -2070,6 +2070,59 @@ BEGIN
 	frxpnglang_EPNGInvalidIHDRText,	"The \"Portable Network Graphics\" image could not be loaded because one of its main piece of data (ihdr) might be corrupted"
 	frxpnglang_EPNGMissingMultipleIDATText,	"This \"Portable Network Graphics\" image is invalid because it has missing image parts."
 	frxpnglang_EPNGZLIBErrorText,	"Could not decompress the image because it contains invalid compressed data.\r\n Description: "
+	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
+	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
+	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
+	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
+	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
+	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
+	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
+	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
+	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
+	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
+	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
+	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
+	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
+	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
+	ComStrs_sTabFailClear,	"Failed to clear tab control"
+	ComStrs_sTabFailDelete,	"Failed to delete tab at index %d"
+	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
+	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
+	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
+	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
+	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
+	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
+	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
+	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
+	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
+	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
+	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
+	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
+	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
+	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
+	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
+	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
+	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
+	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
+	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
+	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
+	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
+	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
+	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
+	IdResourceStringsProtocols_RSHTTPOK,	"OK"
+	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
+	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
+	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
+	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
+	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
+	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
+	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
+	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
+	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
+	IdResourceStringsCore_RSNotConnected,	"Not Connected"
+	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
+	IdResourceStringsCore_RSIdNoDataToRead,	"No data to read."
+	IdResourceStringsCore_RSReadTimeout,	"Read Timeout"
 	IdResourceStringsCore_RSReadLnMaxLineLengthExceeded,	"Max line length exceeded."
 	IdResourceStringsCore_RSConnectTimeout,	"Connect timed out."
 	IdResourceStringsCore_RSThreadTerminateAndWaitFor,	"Cannot call TerminateAndWaitFor on FreeAndTerminate threads"
@@ -2081,11 +2134,11 @@ BEGIN
 	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
 	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
 	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
-	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
-	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
-	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
-	ComStrs_sTabFailClear,	"Failed to clear tab control"
-	ComStrs_sTabFailDelete,	"Failed to delete tab at index %d"
+	IdResourceStringsCore_RSSocksRequestIdentFailed,	"Request rejected because the client program and identd report different user-ids."
+	IdResourceStringsCore_RSSocksUnknownError,	"Unknown socks error."
+	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
+	IdResourceStringsCore_RSSocksAuthMethodError,	"Invalid socks authentication method."
+	IdResourceStringsCore_RSSocksAuthError,	"Authentication error to socks server."
 	IdResourceStringsCore_RSSocksServerGeneralError,	"General SOCKS server failure."
 	IdResourceStringsCore_RSSocksServerPermissionError,	"Connection not allowed by ruleset."
 	IdResourceStringsCore_RSSocksServerNetUnreachableError,	"Network unreachable."
@@ -2097,59 +2150,6 @@ BEGIN
 	IdResourceStringsCore_RSInterceptCircularLink,	"%d: Circular links are not allowed"
 	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
 	IdResourceStringsCore_RSTooMuchDataInBuffer,	"Too much data in buffer."
-	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
-	IdResourceStringsCore_RSNotConnected,	"Not Connected"
-	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
-	IdResourceStringsCore_RSIdNoDataToRead,	"No data to read."
-	IdResourceStringsCore_RSReadTimeout,	"Read Timeout"
-	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
-	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
-	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
-	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
-	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
-	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
-	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
-	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
-	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
-	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
-	IdResourceStringsCore_RSSocksRequestServerFailed,	"Request rejected because SOCKS server cannot connect."
-	IdResourceStringsCore_RSSocksRequestIdentFailed,	"Request rejected because the client program and identd report different user-ids."
-	IdResourceStringsCore_RSSocksUnknownError,	"Unknown socks error."
-	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
-	IdResourceStringsCore_RSSocksAuthMethodError,	"Invalid socks authentication method."
-	IdResourceStringsCore_RSSocksAuthError,	"Authentication error to socks server."
-	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
-	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
-	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
-	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
-	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
-	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
-	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
-	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
-	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
-	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
-	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
-	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
-	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
-	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
-	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
-	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
-	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
-	IdResourceStringsProtocols_RSHTTPOK,	"OK"
-	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
-	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
-	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
-	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
-	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
-	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
-	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
-	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
-	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
-	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
-	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
-	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
-	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
-	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
 	IdResourceStrings_RSAntiFreezeOnlyOne,	"Only one TIdAntiFreeze can exist per application."
 	IdResourceStrings_RSCannotSetIPVersionWhenConnected,	"Cannot change IPVersion when connected"
 	IdResourceStrings_RSCannotBindRange,	"Can not bind in port range (%d - %d)"
@@ -2163,9 +2163,9 @@ BEGIN
 	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
 	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
 	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
-	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
-	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
-	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
+	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
+	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
+	IdResourceStringsCore_RSSocksRequestServerFailed,	"Request rejected because SOCKS server cannot connect."
 	IdResourceStrings_RSStackECONNRESET,	"Connection reset by peer."
 	IdResourceStrings_RSStackENOBUFS,	"No buffer space available."
 	IdResourceStrings_RSStackEISCONN,	"Socket is already connected."
@@ -2262,6 +2262,26 @@ BEGIN
 	DBConsts_SDataSetMissing,	"Field '%s' has no dataset"
 	DBConsts_SInvalidCalcType,	"Field '%s' cannot be a calculated or lookup field"
 	DBConsts_SFieldReadOnly,	"Field '%s' cannot be modified"
+	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
+	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
+	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
+	uRODECConst_sFMT_COPY,	"copy Input to Output"
+	uRODECConst_sFMT_HEX,	"Hexadecimal"
+	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
+	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRODECConst_sFMT_UU,	"UU Coding"
+	uRODECConst_sFMT_XX,	"XX Coding"
+	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
+	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
+	DBConsts_SInvalidFieldSize,	"Invalid field size"
+	DBConsts_SInvalidFieldKind,	"Invalid FieldKind"
+	DBConsts_SUnknownFieldType,	"Field '%s' is of an unknown type"
+	DBConsts_SFieldNameMissing,	"Field name missing"
+	DBConsts_SDuplicateFieldName,	"Duplicate field name '%s'"
+	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
+	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
+	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
+	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
 	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
 	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
 	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
@@ -2273,11 +2293,11 @@ BEGIN
 	ComConst_SVarNotObject,	"Variant does not reference an automation object"
 	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
 	ComConst_SDCOMNotInstalled,	"DCOM not installed"
-	DBConsts_SInvalidFieldSize,	"Invalid field size"
-	DBConsts_SInvalidFieldKind,	"Invalid FieldKind"
-	DBConsts_SUnknownFieldType,	"Field '%s' is of an unknown type"
-	DBConsts_SFieldNameMissing,	"Field name missing"
-	DBConsts_SDuplicateFieldName,	"Duplicate field name '%s'"
+	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
+	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
+	uRORes_err_UnknownClass,	"Unknown class \"%s\""
+	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
+	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
 	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
 	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
 	uRORes_err_UnhandledException,	"Unhandled exception"
@@ -2290,10 +2310,10 @@ BEGIN
 	uRORes_err_SessionNotFound,	"Session %s could not be found"
 	uRORes_err_ChannelDoesntSupportIROMetadataReader,	"Channel does not support IROMetadataReader"
 	uRORes_err_TooManySessions,	"Too many sessions. Try again in %d minute(s)"
-	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
-	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
-	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
-	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
+	uRORes_err_RodlItemExistsInAnsector,	"An item named \"%s\" already exists in ancestor \"%s\"."
+	uRORes_err_RodlCircularReference,	"Circular reference detected between %s and %s"
+	uRORes_err_RodlCircularityWarning,	"Contained items have been not checked for name duplicates in ancestors because of the ancestors' circularity"
+	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
 	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
 	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
 	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
@@ -2306,10 +2326,10 @@ BEGIN
 	uRORes_err_TypeNotSupported,	"Type \"%s\" not supported"
 	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
 	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
-	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
-	uRORes_err_UnknownClass,	"Unknown class \"%s\""
-	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
+	uRORes_err_InvalidLibrary,	"Invalid library"
+	uRORes_err_InvalidStream,	"Invalid stream"
+	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
+	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
 	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
 	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
 	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
@@ -2322,26 +2342,6 @@ BEGIN
 	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
 	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
 	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
-	uRORes_err_RodlItemExistsInAnsector,	"An item named \"%s\" already exists in ancestor \"%s\"."
-	uRORes_err_RodlCircularReference,	"Circular reference detected between %s and %s"
-	uRORes_err_RodlCircularityWarning,	"Contained items have been not checked for name duplicates in ancestors because of the ancestors' circularity"
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
-	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
-	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
-	uRODECConst_sFMT_COPY,	"copy Input to Output"
-	uRODECConst_sFMT_HEX,	"Hexadecimal"
-	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
-	uRODECConst_sFMT_MIME64,	"MIME Base 64"
-	uRODECConst_sFMT_UU,	"UU Coding"
-	uRODECConst_sFMT_XX,	"XX Coding"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
-	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
-	uRORes_err_InvalidIndex,	"Invalid index %d"
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
-	uRORes_err_InvalidLibrary,	"Invalid library"
-	uRORes_err_InvalidStream,	"Invalid stream"
-	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
-	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
 	Consts_SASCIIEncoding,	"ASCII"
 	Consts_SUnicodeEncoding,	"Unicode"
 	Consts_SBigEndianEncoding,	"Big Endian Unicode"
@@ -2356,8 +2356,8 @@ BEGIN
 	HelpIntfs_hNoContext,	"No context-sensitive help installed"
 	HelpIntfs_hNoContextFound,	"No help found for context"
 	HelpIntfs_hNoTopics,	"No topic-based help system installed"
-	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
-	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
+	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
 	Consts_SShutdown,	"shutdown"
 	Consts_SCustomError,	"Service failed in custom message(%d): %s"
 	Consts_SServiceInstallOK,	"Service installed successfully"
@@ -2632,27 +2632,27 @@ BEGIN
 	SysConst_SAccessDenied,	"File access denied"
 END
 
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\Controls.res */
-/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROPoweredByRemObjectsButton.res */
-/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROHtmlServerInfo.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\Buttons.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\ExtDlgs.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\FileCtrl.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\controls.res */
+/* C:\Codigo Noviseda\Lib\RemObjects\RemObjects_SDK\uROPoweredByRemObjectsButton.res */
+/* C:\Codigo Noviseda\Lib\RemObjects\RemObjects_SDK\uROHtmlServerInfo.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\buttons.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\extdlgs.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\filectrl.res */
 /* C:\Codigo Noviseda\Lib\FastReport4\frxInheritError.dfm */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxCtrls.RES */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxPrintDialog.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxPreviewPageSettings.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxSearchDialog.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxPreview.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxPreview.RES */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxDialogForm.DFM */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxCtrls.res */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxPrintDialog.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxPreviewPageSettings.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxSearchDialog.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxPreview.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxPreview.res */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxDialogForm.dfm */
 /* C:\Codigo Noviseda\Lib\FastReport4\frxPassw.dfm */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxProgress.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxClass.RES */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxProgress.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxClass.res */
 /* C:\Codigo Noviseda\Lib\JVCL\JvConsts.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
 /* C:\Codigo Noviseda\Lib\JVCL\JvProgressForm.dfm */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_IBXDriver_Glyphs.res */
+/* C:\Codigo Noviseda\Lib\RemObjects\Data_Abstract\DataAbstract_IBXDriver_Glyphs.res */
 /* C:\Codigo Noviseda\Lib\JVCL\JvLogForm.dfm */
 /* C:\Codigo Noviseda\Source\Servidor\uDataModuleServer.dfm */
 /* C:\Codigo Noviseda\Source\Servidor\Configuracion\uFrameConfiguracion.dfm */
@@ -2667,23 +2667,23 @@ END
 /* C:\Codigo Noviseda\Source\Servidor\uAcercaDe.dfm */
 /* C:\Codigo Noviseda\Source\Servidor\uServerMainForm.dfm */
 /* C:\Codigo Noviseda\Source\Servidor\srvLogin_Impl.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\TeeResou.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\TeePenDlg.DFM */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\TeeBmps.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\TeeGalleryAlternate.DFM */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\Tabs.res */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxPopupForm.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxInsp.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxEditFormat.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxEditHighlight.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxEditSysMemo.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxEditMemo.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxChartEditor.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxEditFrame.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxCrossEditor.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxOLEEditor.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxBarcodeEditor.DFM */
-/* C:\Codigo Noviseda\Lib\FastReport4\frxRichEditor.DFM */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Teeresou.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\TeePenDlg.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\TeeBmps.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\TeeGalleryAlternate.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\tabs.res */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxPopupForm.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxInsp.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxEditFormat.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxEditHighlight.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxEditSysMemo.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxEditMemo.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxChartEditor.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxEditFrame.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxCrossEditor.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxOLEEditor.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxBarcodeEditor.dfm */
+/* C:\Codigo Noviseda\Lib\FastReport4\frxRichEditor.dfm */
 /* C:\Codigo Noviseda\Lib\DevExpressVCL\cxShellBrowser.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.dfm */
@@ -2727,14 +2727,14 @@ END
 /* C:\Codigo Noviseda\Source\Modulos\Obras\Servidor\srvObras_Impl.dfm */
 /* C:\Codigo Noviseda\Source\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBPWDlg.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBLogDlg.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBCtrls.res */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialogDetails.dfm */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialog.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBPWDlg.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBLogDlg.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\dbctrls.res */
+/* C:\Codigo Noviseda\Lib\RemObjects\Data_Abstract\uDAReconcileDialogDetails.dfm */
+/* C:\Codigo Noviseda\Lib\RemObjects\Data_Abstract\uDAReconcileDialog.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.dfm */
 /* C:\Codigo Noviseda\Source\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.dfm */
-/* C:\Codigo Noviseda\Source\Servidor\FactuGES_Server.res */
-/* C:\Codigo Noviseda\Source\Servidor\..\Servicios\RODLFile.res */
-/* C:\Codigo Noviseda\Source\Servidor\FactuGES_Server.drf */
+/* C:\Codigo Noviseda\Source\Servidor\FactuGES_Server.RES */
+/* C:\Codigo Noviseda\Source\Servidor\..\Servicios\RODLFILE.res */
+/* E:\temp\dtf43D.tmp */
diff --git a/Source/Servidor/FactuGES_Server.identcache b/Source/Servidor/FactuGES_Server.identcache
index db1cb42ead141b6c6db0fc34cf1835658b461ee8..e78abe031f569b2ac37a5df37ae78f1a3f63bad6 100644
GIT binary patch
delta 261
zcmdm**q6lG%D}+jJK2$4Y4QdknTa!-Cu_+lD>~=rW)^4W=cN|M1g932Wv1j8#S|Bn
zA%rI{6c*hq!zj)&Szaz~^HSDe=E=HDfs?uQr8ocJDCC~(p%*^6i&c8E7FY1*JtC}3
zll$~_CRZxRPUd4%+5A+jgJtr69p%aAC51Qtklw&JnNMAMa=)^`<QdXhlN$t;H!qM|
z%Q$&Ir}E?gCeg_Uw2Yw&I46JL;op2x!HXGao+ntrI{~rDcUgHhN2s{70G*(`Sxz&H
vaq@hP7@*b4lNazwY}V86VV=km2DWg4oXF%@eZ$EsWXmVVF-A@{FlYq;S(aLa

delta 256
zcmeB6+M3ANGI_qN)np@m`N;xG%9H0a3rv<4=9%c+Jh?$iVY5Bscjn2Rdf}6$MWrY6
zYba0d=M&w0hE<w*@)c&~$$XL`lk?ShHc#W!<KAp08o@OAFRRMt-{KuClXt00Pd4D=
zoZKsCIN3p0dGac0t<4u?W-?CRsb4<XPf>aD8y<zpm8{Z}&#Nj=&gB-_{8bJp*(dG^
z)hWJNThW_&^L~{cmdR0Kj*}&|f#xxR?AO~oN7IIJ@_rTN$@Y4@lM|RYCa=`tnS4n>
yeX^OT^5ivoa+^!F+n9l>11DQ>N`q|&S}^$xE6?O9`l>)XbS5uSk)3Q{a1Q`Bl2!8n

diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index b0ea248..69f8a6b 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "2.0.0.0\0"
               VALUE "ProductVersion", "2.0.0.0\0"
-              VALUE "CompileDate", "miércoles, 13 de enero de 2010 18:48\0"
+              VALUE "CompileDate", "jueves, 14 de enero de 2010 18:06\0"
          END
     END
     BLOCK "VarFileInfo"