diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 36f26e23..86c94e6a 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj
index cc0ca6ac..cc509d49 100644
--- a/Source/Cliente/FactuGES.bdsproj
+++ b/Source/Cliente/FactuGES.bdsproj
@@ -148,8 +148,8 @@
 			<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
 			<VersionInfo Name="AutoIncBuild">False</VersionInfo>
 			<VersionInfo Name="MajorVer">2</VersionInfo>
-			<VersionInfo Name="MinorVer">0</VersionInfo>
-			<VersionInfo Name="Release">8</VersionInfo>
+			<VersionInfo Name="MinorVer">1</VersionInfo>
+			<VersionInfo Name="Release">0</VersionInfo>
 			<VersionInfo Name="Build">0</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
@@ -162,7 +162,7 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">2.0.8.0</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 3c3637b9..7276ccf5 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
index c2e536c9..ecdf04e7 100644
--- a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
@@ -91,7 +91,7 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils;
+  uDataTableUtils, DateUtils, uDateUtils, DB;
 
 { TBizAlbaranCliente }
 
@@ -211,6 +211,9 @@ begin
 end;
 
 procedure TBizAlbaranCliente.SetCliente(AValue: IBizCliente);
+var
+  bEnEdicion : Boolean;
+
 begin
   FCliente := AValue;
 
@@ -221,9 +224,17 @@ begin
 
     if ID_Cliente <> FCliente.ID then
     begin
-      DataTable.Edit;
+      bEnEdicion := (DataTable.State in dsEditModes);
+      if not bEnEdicion then
+         DataTable.Edit;
+
       ID_CLIENTE := FCliente.ID;
       ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
+
+      DataTable.Post;  //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
+                       //si se quita el id de la cabecera y los detalles se desincroniza
+      if bEnEdicion then
+         DataTable.Edit;
     end;
   end;
 end;
diff --git a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
index 6b7489d6..b9dd1b83 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
@@ -85,7 +85,7 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils;
+  uDataTableUtils, DateUtils, uDateUtils, DB;
 
 { TBizAlbaranProveedor }
 
@@ -204,6 +204,9 @@ begin
 end;
 
 procedure TBizAlbaranProveedor.SetProveedor(AValue: IBizProveedor);
+var
+  bEnEdicion : Boolean;
+
 begin
   FProveedor := AValue;
 
@@ -214,8 +217,16 @@ begin
 
     if ID_PROVEEDOR <> FProveedor.ID then
     begin
-      DataTable.Edit;
+      bEnEdicion := (DataTable.State in dsEditModes);
+      if not bEnEdicion then
+         DataTable.Edit;
+
       ID_PROVEEDOR := FProveedor.ID;
+
+      DataTable.Post;  //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
+                       //si se quita el id de la cabecera y los detalles se desincroniza
+      if bEnEdicion then
+         DataTable.Edit;
     end;
   end;
 end;
diff --git a/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas
index b85575f1..5fef610f 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas	
@@ -91,7 +91,7 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils;
+  uDataTableUtils, DateUtils, uDateUtils, DB;
 
 { TBizPedidoProveedor }
 
@@ -224,6 +224,9 @@ begin
 end;
 
 procedure TBizPedidoProveedor.SetProveedor(AValue: IBizProveedor);
+var
+  bEnEdicion : Boolean;
+
 begin
   FProveedor := AValue;
 
@@ -234,8 +237,16 @@ begin
 
     if ID_PROVEEDOR <> FProveedor.ID then
     begin
-      DataTable.Edit;
+      bEnEdicion := (DataTable.State in dsEditModes);
+      if not bEnEdicion then
+         DataTable.Edit;
+
       ID_PROVEEDOR := FProveedor.ID;
+
+      DataTable.Post;  //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
+                       //si se quita el id de la cabecera y los detalles se desincroniza
+      if bEnEdicion then
+         DataTable.Edit;
     end;
   end;
 end;
diff --git a/Source/Modulos/Pedidos de cliente/Model/uBizPedidosCliente.pas b/Source/Modulos/Pedidos de cliente/Model/uBizPedidosCliente.pas
index 799a94a3..50a15eaf 100644
--- a/Source/Modulos/Pedidos de cliente/Model/uBizPedidosCliente.pas	
+++ b/Source/Modulos/Pedidos de cliente/Model/uBizPedidosCliente.pas	
@@ -99,7 +99,7 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils;
+  uDataTableUtils, DateUtils, uDateUtils, DB;
 
 { TBizPedidoCliente }
 
@@ -231,6 +231,9 @@ begin
 end;
 
 procedure TBizPedidoCliente.SetCliente(AValue: IBizCliente);
+var
+  bEnEdicion : Boolean;
+
 begin
   FCliente := AValue;
 
@@ -241,9 +244,17 @@ begin
 
     if ID_Cliente <> FCliente.ID then
     begin
-      DataTable.Edit;
+      bEnEdicion := (DataTable.State in dsEditModes);
+      if not bEnEdicion then
+         DataTable.Edit;
+
       ID_CLIENTE := FCliente.ID;
       ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
+
+      DataTable.Post;  //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
+                       //si se quita el id de la cabecera y los detalles se desincroniza
+      if bEnEdicion then
+         DataTable.Edit;
     end;
   end;
 end;
diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj
index 3e2c9b20..efda3458 100644
--- a/Source/Servidor/FactuGES_Server.bdsproj
+++ b/Source/Servidor/FactuGES_Server.bdsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<PersonalityInfo>
 		<Option>
@@ -123,7 +123,7 @@
 			<Directories Name="UnitOutputDir"></Directories>
 			<Directories Name="PackageDLLOutputDir"></Directories>
 			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\DataAbstract_D10\Lib</Directories>
+			<Directories Name="SearchPath">..\DataAbstract_D10\Lib;..\Base\Lib;..\Base\ControllerBase;..\Base\GUIBase;..\Base\ClassRegistry;..\Base\Usuarios;..\Modulos\Articulos\Lib;..\Modulos\Empresas\Lib;..\Modulos\Contactos\Lib;..\Modulos\Facturas de cliente\Lib;..\Modulos\Pedidos a proveedor\Lib;..\Modulos\Grupos de cliente\Lib;..\Modulos\Articulos\view</Directories>
 			<Directories Name="Packages">rtl;vclx;vcl;dbrtl;vcldb;dbxcds;dbexpress;vclib;ibxpress;indy;dclOfficeXP;VclSmp;dsnap;bdertl;teeui;teedb;tee;vcldbx;vclactnband;dxBarExtItemsD10;dxComnD10;dxBarD10;cxLibraryD10;cxEditorsD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarDBNavD10;dxBarExtDBItemsD10;tbx_d10;tb2k_d10;ccpack10;ccpack10dsg;cxExportD10;cxIntl5D10;adortl;DataAbstract_Core_D10;DataAbstract_DBXDriver_D10;DataAbstract_Scripting_D10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;dxLayoutControlcxEditAdaptersD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSDBTeeChartD10;dxPSTeeChartD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;Jcl;JclVcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvNetD10R;JvPageCompsD10R;JvPluginD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;PluginSDK_D10R;PNG_D10;PngComponentsD10;inet;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Indy_D10;PascalScript_RO_D10;IndyProtocols;IndyCore;IndySystem;DataAbstract_IDE_D10;fsTee10;fs10;frx10;frxADO10;frxBDE10;frxDB10;frxDBX10;frxe10;frxIBX10;frxTee10;fsADO10;fsBDE10;fsDB10;fsIBX10</Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
@@ -153,8 +153,8 @@
 			<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
 			<VersionInfo Name="AutoIncBuild">False</VersionInfo>
 			<VersionInfo Name="MajorVer">2</VersionInfo>
-			<VersionInfo Name="MinorVer">0</VersionInfo>
-			<VersionInfo Name="Release">8</VersionInfo>
+			<VersionInfo Name="MinorVer">1</VersionInfo>
+			<VersionInfo Name="Release">0</VersionInfo>
 			<VersionInfo Name="Build">0</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
@@ -167,21 +167,20 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">2.0.8.0</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
 			<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
 			<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-			<VersionInfoKeys Name="ProductVersion">2.0.6.0</VersionInfoKeys>
+			<VersionInfoKeys Name="ProductVersion">2.0.8.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">martes, 19 de junio de 2007 17:52</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">lunes, 25 de junio de 2007 19:23</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
+<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=0