diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj
new file mode 100644
index 00000000..ad79133b
--- /dev/null
+++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj	
@@ -0,0 +1,144 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{586839ac-ba64-4412-bacf-f6b42162c99d}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
+    <Projects Include="..\..\Base\Base.dproj" />
+    <Projects Include="..\..\Cliente\FactuGES.dproj" />
+    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
+    <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
+    <Projects Include="Controller\AlbaranesCliente_controller.dproj" />
+    <Projects Include="Data\AlbaranesCliente_data.dproj" />
+    <Projects Include="Model\AlbaranesCliente_model.dproj" />
+    <Projects Include="Plugin\AlbaranesCliente_plugin.dproj" />
+    <Projects Include="Views\AlbaranesCliente_view.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+  <BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="Base">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
+  </Target>
+  <Target Name="Base:Clean">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Base:Make">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Make" />
+  </Target>
+  <Target Name="GUIBase">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="" />
+  </Target>
+  <Target Name="GUIBase:Clean">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GUIBase:Make">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_view">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_view:Clean">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_view:Make">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_view">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_view:Clean">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_view:Make">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_model">
+    <MSBuild Projects="Model\AlbaranesCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Clean">
+    <MSBuild Projects="Model\AlbaranesCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Make">
+    <MSBuild Projects="Model\AlbaranesCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_data">
+    <MSBuild Projects="Data\AlbaranesCliente_data.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Clean">
+    <MSBuild Projects="Data\AlbaranesCliente_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Make">
+    <MSBuild Projects="Data\AlbaranesCliente_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller">
+    <MSBuild Projects="Controller\AlbaranesCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Clean">
+    <MSBuild Projects="Controller\AlbaranesCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Make">
+    <MSBuild Projects="Controller\AlbaranesCliente_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_view">
+    <MSBuild Projects="Views\AlbaranesCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_view:Clean">
+    <MSBuild Projects="Views\AlbaranesCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_view:Make">
+    <MSBuild Projects="Views\AlbaranesCliente_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_plugin">
+    <MSBuild Projects="Plugin\AlbaranesCliente_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_plugin:Clean">
+    <MSBuild Projects="Plugin\AlbaranesCliente_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_plugin:Make">
+    <MSBuild Projects="Plugin\AlbaranesCliente_plugin.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES:Clean">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES:Make">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES_Server">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES_Server:Clean">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES_Server:Make">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server: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 c9fa7195..132ce74b 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 Tecsitel\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf67.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf176.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc b/Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc
index d46d49f3..b974d801 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 Tecsitel\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf65.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf174.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc b/Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc
index 8a39629b..3ad3c5de 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 Tecsitel\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf63.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf172.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
index 9c9a068c..72c5377d 100644
--- a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
@@ -56,6 +56,7 @@ type
     function GetDetalles: IBizDetallesAlbaranCliente;
     procedure SetDetalles(Value: IBizDetallesAlbaranCliente);
 
+    function GetSITUACIONValue: String; override;
     procedure SetFECHA_ALBARANValue(const aValue: TDateTime); override;
     procedure SetFECHA_ENVIOValue(const aValue: TDateTime); override;
     procedure SetFECHA_RECEPCIONValue(const aValue: TDateTime); override;
@@ -73,6 +74,8 @@ type
     procedure OnNewRecord(Sender: TDADataTable); override;
     procedure IniciarValoresAlbaranNuevo;
 
+
+
   public
     function EsNuevo : Boolean;
     procedure CalcularImporteTotal;
@@ -203,6 +206,11 @@ begin
   Result := FDetalles;
 end;
 
+function TBizAlbaranCliente.GetSITUACIONValue: String;
+begin
+  result := Trim(DataTable.Fields[idx_AlbaranesClienteSITUACION].AsString);
+end;
+
 procedure TBizAlbaranCliente.OnNewRecord(Sender: TDADataTable);
 begin
   inherited;
diff --git a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc
index 667b5ad5..c56b74c9 100644
--- a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc	
+++ b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc	
@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.drf */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf17E.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.res b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.res
index 86c94e6a..36f26e23 100644
Binary files a/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.res and b/Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc
index 2d5d6a33..627a4e72 100644
--- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc	
+++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc	
@@ -12,19 +12,19 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDetallesAlbaranCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDireccionEntregaAlbaranCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewElegirArticulosAlbaranesCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirArticulosAlbaranCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesClienteReport.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirAlbaranesCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesDevCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesDevCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
-/* C:\Codigo tecsitel\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.drf */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDetallesAlbaranCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDireccionEntregaAlbaranCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewElegirArticulosAlbaranesCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirArticulosAlbaranCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesClienteReport.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirAlbaranesCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesDevCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesDevCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
+/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf17C.tmp */
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res
index 86c94e6a..36f26e23 100644
Binary files a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res and b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
index a93ff0f1..96f00ae7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas	
@@ -25,7 +25,7 @@ type
     frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente;
     frViewTotales1: TfrViewTotales;
 
-    procedure FormShow(Sender: TObject); override;
+    procedure FormShow(Sender: TObject); 
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
     procedure pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index 6d70ff4f..6ec24540 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
@@ -14,7 +14,7 @@ uses
 
 //  uBizPedidosCliente, uPedidosClienteController,
 
-  ExtCtrls, cxLookupEdit, cxDBLookupEdit,
+  ExtCtrls, cxLookupEdit, cxDBLookupEdit, uBizFormasPago,
   cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uDAInterfaces;
 
 type
@@ -125,6 +125,7 @@ type
 //    FPedidoAsociado : IBizPedidoCliente;
 //    FPedidoController : IPedidosClienteController;
     FViewClienteAlbaran : TfrViewDatosYSeleccionCliente;
+    FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
 
     function GetAlbaran: IBizAlbaranCliente;
@@ -145,7 +146,7 @@ implementation
 
 uses
   uClientesController, uBizDireccionesContacto, uAlbaranesClienteController,
-  schAlbaranesClienteClient_Intf, uBizFormasPago, uBizAlmacenes, uDateUtils,
+  schAlbaranesClienteClient_Intf, uBizAlmacenes, uDateUtils,
   uDialogUtils;
 
 
@@ -204,7 +205,8 @@ begin
 procedure TfrViewAlbaranCliente.bFormasPagoClick(Sender: TObject);
 begin
   inherited;
-  FFormasPagoController.VerTodos((dsFormaPago.DataTable) as IBizFormaPago);
+  if Assigned(FFormasPago) then
+     FFormasPagoController.VerTodos(FFormasPago);
 end;
 
 procedure TfrViewAlbaranCliente.cbConAlmacenClick(Sender: TObject);
@@ -229,7 +231,8 @@ end;
 procedure TfrViewAlbaranCliente.CustomViewCreate(Sender: TObject);
 begin
   inherited;
-  FFormasPagoController := TFormasPagoController.Create;  
+  FFormasPago := Nil;
+  FFormasPagoController := TFormasPagoController.Create;
 //  FPedidoAsociado := NIL;
 //  FPedidoController := TPedidosClienteController.Create;
   FViewClienteAlbaran := frViewClienteAlbaran;
@@ -240,9 +243,10 @@ end;
 procedure TfrViewAlbaranCliente.CustomViewDestroy(Sender: TObject);
 begin
   inherited;
+  FFormasPago := Nil;
+  FFormasPagoController := NIL;
   FViewClienteAlbaran := Nil;
 //  FPedidoController := NIL;
-  FFormasPagoController := NIL;
 //  FPedidoAsociado := NIL;
   FAlmacenesController := NIL;
 end;
@@ -358,7 +362,8 @@ begin
     DADataSource.DataTable := FAlbaran.DataTable;
     frViewClienteAlbaran.Cliente := FAlbaran.Cliente;
 
-    dsFormaPago.DataTable := FFormasPagoController.BuscarTodos.DataTable;
+    FFormasPago := FFormasPagoController.BuscarTodos;
+    dsFormaPago.DataTable := FFormasPago.DataTable;
     dsFormaPago.DataTable.Active := True;
 
     dsAlmacenes.DataTable := (FAlmacenesController.BuscarTodos).DataTable;