diff --git a/Build/Build.fbl5 b/Build/Build.fbl5
index a0544f7d..644a97d7 100644
Binary files a/Build/Build.fbl5 and b/Build/Build.fbl5 differ
diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB
index 8c9651f2..7d5e5c7e 100644
Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ
diff --git a/Source/Base/GUIBase/uViewDetallesDTO.pas b/Source/Base/GUIBase/uViewDetallesDTO.pas
index 8467dc7d..ceff815a 100644
--- a/Source/Base/GUIBase/uViewDetallesDTO.pas
+++ b/Source/Base/GUIBase/uViewDetallesDTO.pas
@@ -58,7 +58,7 @@ procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOPropertiesValidate(Sender: TOb
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
   begin
     cxGridViewDESCUENTO.DataBinding.Field.Value := ((cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value - DisplayValue) * 100) / cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value;
     Controller.ActualizarTotales(Detalles);
diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj
index ee30cca5..eadc7eef 100644
--- a/Source/Cliente/FactuGES.bdsproj
+++ b/Source/Cliente/FactuGES.bdsproj
@@ -149,7 +149,7 @@
 			<VersionInfo Name="AutoIncBuild">False</VersionInfo>
 			<VersionInfo Name="MajorVer">2</VersionInfo>
 			<VersionInfo Name="MinorVer">3</VersionInfo>
-			<VersionInfo Name="Release">4</VersionInfo>
+			<VersionInfo Name="Release">5</VersionInfo>
 			<VersionInfo Name="Build">0</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
@@ -162,13 +162,13 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">2.3.4.0</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">2.3.5.0</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
 			<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
 			<VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys>
-			<VersionInfoKeys Name="ProductVersion">2.1.4</VersionInfoKeys>
+			<VersionInfoKeys Name="ProductVersion"></VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
 		</VersionInfoKeys>  <Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\Usuario\Mis documentos\Borland Studio Projects\Bpl\EasyListviewD10.bpl">Muststang Peak EasyListview Runtime Package</Excluded_Packages>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 91d3c63b..0a71ce87 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,3,4,0
-PRODUCTVERSION 2,3,4,0
+FILEVERSION 2,3,5,0
+PRODUCTVERSION 2,3,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.3.4.0\0"
+              VALUE "FileVersion", "2.3.5.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.1.4\0"
+              VALUE "ProductVersion", "2.3.5.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index d6a88d85..152ca943 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
index 617d5cba..e52f4895 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
@@ -169,7 +169,7 @@ procedure TfEditorAlbaranCliente.frViewTotales1ePortePropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
     FAlbaran.IMPORTE_PORTE := DisplayValue
   else
     FAlbaran.IMPORTE_PORTE := 0;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index 70af6e9c..226f53fe 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
@@ -249,7 +249,7 @@ procedure TfrViewAlbaranCliente.eFechaEnvioPropertiesValidate(Sender: TObject;
 begin
   inherited;
 
-  if VarIsNull(DisplayValue) or (DisplayValue = '') then
+  if not (VarIsNull(DisplayValue) or (DisplayValue = '')) then
   begin
      if (ShowConfirmMessage('Si elimina la fecha prevista de envio, se eliminarán tambien las fechas de envio y recepción en caso de tenerlas. ¿Desea continuar?', '') = IDYES) then
      begin
@@ -267,7 +267,7 @@ procedure TfrViewAlbaranCliente.eFechaPrevistaPropertiesValidate(Sender: TObject
   var Error: Boolean);
 begin
   inherited;
-  if VarIsNull(DisplayValue) or (DisplayValue = '') then
+  if not (VarIsNull(DisplayValue) or (DisplayValue = '')) then
   begin
      if (ShowConfirmMessage('Si elimina la fecha prevista de envio, se eliminarán tambien las fechas de envio y recepción en caso de tenerlas. ¿Desea continuar?', '') = IDYES) then
      begin
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas
index 1bd02db1..d31a0121 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas	
@@ -169,7 +169,7 @@ procedure TfEditorAlbaranProveedor.frViewTotales1ePortePropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
     FAlbaran.IMPORTE_PORTE := DisplayValue
   else
     FAlbaran.IMPORTE_PORTE := 0;
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
index 339015b2..b3280a9c 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
@@ -91,10 +91,9 @@ begin
      Exit;
 
   lsReferencia := VarToStr(DisplayValue);
-  if (length(trim(lsReferencia)) = 0) then
+  if (Length(Trim(lsReferencia)) = 0) then
      Exit;
 
-
   if not AnadirArticulo(lsReferencia, tCliente) then
   begin
     ErrorText := 'La referencia introducida no exite en el catálogo';
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
index 60332c2f..8280db33 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
@@ -212,7 +212,7 @@ procedure TfEditorFacturaCliente.frViewTotales1ePortePropertiesValidate(
 begin
   inherited;
 
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
     FFactura.IMPORTE_PORTE := DisplayValue
   else
     FFactura.IMPORTE_PORTE := 0;
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas
index 964abeab..0619d3a0 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
@@ -206,7 +206,7 @@ procedure TfEditorFacturaProveedor.frViewTotales1ePortePropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
     FFactura.IMPORTE_PORTE := DisplayValue
   else
     FFactura.IMPORTE_PORTE := 0;
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.bdsproj b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.bdsproj
index 29a33ec9..c1df3afa 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.bdsproj	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.bdsproj	
@@ -172,7 +172,7 @@
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
 		</VersionInfoKeys>
 	</Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index 454b1697..7bf07b95 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -123,6 +123,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewIncidenciasProv: TfrViewIncidencias
         Left = 0
         Top = 0
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
index c4328935..0e533c39 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
@@ -147,8 +147,8 @@ procedure TfEditorPedidoProveedor.frViewTotales1ePortePropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  if (not VarIsNull(DisplayValue)) and (VarToStr(DisplayValue) <> '') then
-    FPedido.IMPORTE_PORTE :=  DisplayValue
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
+    FPedido.IMPORTE_PORTE := DisplayValue
   else
     FPedido.IMPORTE_PORTE := 0;
 
diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas
index 6de501f0..fbfbad20 100644
--- a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas	
+++ b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas	
@@ -148,7 +148,7 @@ procedure TfEditorPedidoCliente.frViewTotales1ePortePropertiesValidate(
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+  if (not VarIsNull(DisplayValue)) and (Length(DisplayValue) > 0) then
     FPedido.IMPORTE_PORTE := DisplayValue
   else
     FPedido.IMPORTE_PORTE := 0;
diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj
index d92ed5af..2b5e6452 100644
--- a/Source/Servidor/FactuGES_Server.bdsproj
+++ b/Source/Servidor/FactuGES_Server.bdsproj
@@ -154,7 +154,7 @@
 			<VersionInfo Name="AutoIncBuild">False</VersionInfo>
 			<VersionInfo Name="MajorVer">2</VersionInfo>
 			<VersionInfo Name="MinorVer">3</VersionInfo>
-			<VersionInfo Name="Release">3</VersionInfo>
+			<VersionInfo Name="Release">5</VersionInfo>
 			<VersionInfo Name="Build">0</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
@@ -167,16 +167,19 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">2.3.3.0</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">2.3.5.0</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
 			<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
 			<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-			<VersionInfoKeys Name="ProductVersion">2.3.2.0</VersionInfoKeys>
+			<VersionInfoKeys Name="ProductVersion"></VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">miércoles, 17 de octubre de 2007 14:01</VersionInfoKeys></VersionInfoKeys>
-		<Excluded_Packages><Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages></Excluded_Packages></Delphi.Personality>
+			<VersionInfoKeys Name="CompileDate"></VersionInfoKeys></VersionInfoKeys>
+		<Excluded_Packages>
+			<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+		</Excluded_Packages>
+	</Delphi.Personality>
 	<ModelSupport>False</ModelSupport>
 	<!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 76dab738..f86dc10f 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,3,3,0
-PRODUCTVERSION 2,3,3,0
+FILEVERSION 2,3,5,0
+PRODUCTVERSION 2,3,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0904E4"
          BEGIN
-              VALUE "FileVersion", "2.3.3.0\0"
-              VALUE "ProductVersion", "2.3.3.0\0"
-              VALUE "CompileDate", "martes, 04 de diciembre de 2007 13:27\0"
+              VALUE "FileVersion", "2.3.5.0\0"
+              VALUE "ProductVersion", "2.3.5.0\0"
+              VALUE "CompileDate", "miércoles, 05 de diciembre de 2007 18:27\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index c63986cf..d80a1736 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ