diff --git a/Source/ApplicationBase/Empresas/Controller/uDatosBancariosEmpresaController.pas b/Source/ApplicationBase/Empresas/Controller/uDatosBancariosEmpresaController.pas
index d7be9c8a..935b6eb7 100644
--- a/Source/ApplicationBase/Empresas/Controller/uDatosBancariosEmpresaController.pas
+++ b/Source/ApplicationBase/Empresas/Controller/uDatosBancariosEmpresaController.pas
@@ -41,8 +41,7 @@ begin
   inherited;
 end;
 
-procedure TDatosBancariosEmpresaController.Ver(
-  ADatosBancarios : IBizEmpresasDatosBancarios);
+procedure TDatosBancariosEmpresaController.Ver(ADatosBancarios : IBizEmpresasDatosBancarios);
 var
   AEditor : IEditorDatosBancariosEmpresa;
 begin
@@ -50,22 +49,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorDatosBancariosEmpresa', IEditorDatosBancariosEmpresa, AEditor);
-    with AEditor do
-    begin
-      DatosBancarios := ADatosBancarios;
-      Controller := Self;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         DatosBancarios := ADatosBancarios;
+         Controller := Self;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 end.
diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
index d5879df9..7e6cd9ec 100644
--- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
+++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
@@ -208,22 +208,18 @@ begin
   ShowHourglassCursor;
   try
 	CreateEditor('EditorEmpresa', IEditorEmpresa, AEditor);
-	with AEditor do
-	begin
-		Empresa := AEmpresa;
-		Controller := Self;
-	end;
+  if Assigned(AEditor) then
+     with AEditor do
+     begin
+       Empresa := AEmpresa;
+       Controller := Self;
+       ShowModal;
+       Release;
+     end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 procedure TEmpresasController.VerTodos(AEmpresas: IBizEmpresa);
diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
index 46b9befc..b5fa328b 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas	
+++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas	
@@ -586,22 +586,17 @@ begin
   try
     //RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta
     CreateEditor('EditorDireccionEntregaAlbaranCliente', IEditorDireccionEntregaAlbaranCliente, AEditor);
-
-    with (AEditor as IEditorDireccionEntregaAlbaranCliente) do
-    begin
-      Albaran := AAlbaran;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorDireccionEntregaAlbaranCliente) do
+       begin
+         Albaran := AAlbaran;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TAlbaranesClienteController.VerTodosAlbaranes(AAlbarans: IBizAlbaranCliente);
diff --git a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
index 475b8e2e..c439790f 100644
--- a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas	
@@ -651,22 +651,17 @@ begin
   try
     //RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta
     CreateEditor('EditorDireccionEntregaAlbaranProveedor', IEditorDireccionEntregaAlbaranProveedor, AEditor);
-
-    with (AEditor as IEditorDireccionEntregaAlbaranProveedor) do
-    begin
-      Albaran := AAlbaran;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorDireccionEntregaAlbaranProveedor) do
+       begin
+         Albaran := AAlbaran;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TAlbaranesProveedorController.VerTodosAlbaranes(AAlbarans: IBizAlbaranProveedor);
diff --git a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
index fad9cfc9..671f6001 100644
--- a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
+++ b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
@@ -43,7 +43,6 @@ type
     //este controller
     procedure AsignarDataModule; virtual;
     procedure RecuperarObjetos(AAlmacen: IBizAlmacen); virtual;
-    procedure AsignarEditor(out AEditor: IEditorDBItem); virtual;
 
     procedure ValidarObjetos; virtual;
 //    procedure AsignarCodigo(AAlmacen: IBizAlmacen); virtual;
@@ -95,11 +94,6 @@ begin
   FDataModule := TDataModuleAlmacenes.Create(Nil);
 end;
 
-procedure TAlmacenesController.AsignarEditor(out AEditor: IEditorDBItem);
-begin
-  CreateEditor('EditorAlmacen', IEditorAlmacen, AEditor);
-end;
-
 {procedure TAlmacenesController.AssignarID(AAlmacen: IBizAlmacen; ADataModule : IDataModuleAlmacenes);
 var
   NuevoIDCabecera : Integer;
@@ -211,41 +205,38 @@ begin
   ShowHourglassCursor;
   try
     RecuperarObjetos(AAlmacen);
-    AsignarEditor(AEditor);
-
-    with (AEditor as IEditorAlmacen) do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Almacen := AAlmacen;
-    end;
+    CreateEditor('EditorAlmacen', IEditorAlmacen, AEditor);
+    if Assigned(AEditor) then
+       with (AEditor as IEditorAlmacen) do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Almacen := AAlmacen;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 function TAlmacenesController.VerLista(AAlmacenes: IBizAlmacen): IBizAlmacen;
 var
   AEditor : IEditorListaAlmacenes;
 begin
+  AEditor := NIL;
   Result := NIL;
 
-  CreateEditor('EditorListaAlmacenes', IEditorListaAlmacenes, AEditor);
   try
-    with AEditor do
-    begin
-      Almacenes := AAlmacenes;
-      if IsPositiveResult(ShowModal) then
-        Result := AlmacenSeleccionado;
-	    AEditor.Release;
-    end;
+    CreateEditor('EditorListaAlmacenes', IEditorListaAlmacenes, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Almacenes := AAlmacenes;
+         if IsPositiveResult(ShowModal) then
+            Result := AlmacenSeleccionado;
+         Release;
+      end;
   finally
     AEditor := NIL;
   end;
@@ -259,17 +250,16 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorAlmacenes', IEditorAlmacenes, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Almacenes := AAlmacenes;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Almacenes := AAlmacenes;
+         ShowEmbedded;
+       end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.ShowEmbedded;
 end;
 
 function TAlmacenesController._Vacio: IBizAlmacen;
diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas
index d17d93ab..3abbf106 100644
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@@ -388,22 +388,18 @@ begin
     RecuperarObjetos(AArticulo);
 
     CreateEditor('EditorArticulo', IEditorArticulo, AEditor);
-    with (AEditor as IEditorArticulo) do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Articulo := AArticulo;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorArticulo) do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Articulo := AArticulo;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TArticulosController.VerProveedor(AArticulo: IBizArticulo);
@@ -432,17 +428,16 @@ begin
     RecuperarObjetos(AArticulos);
 
     CreateEditor('EditorArticulos', IEditorArticulos, AEditor);
-    with (AEditor as IEditorArticulos) do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Articulos := AArticulos;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorArticulos) do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Articulos := AArticulos;
+         ShowEmbedded;
+       end;
   finally
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.ShowEmbedded;
 end;
 
 function TArticulosController._Vacio: IBizArticulo;
diff --git a/Source/Modulos/Comisiones/Controller/uComisionesController.pas b/Source/Modulos/Comisiones/Controller/uComisionesController.pas
index 783385b2..304ef75b 100644
--- a/Source/Modulos/Comisiones/Controller/uComisionesController.pas
+++ b/Source/Modulos/Comisiones/Controller/uComisionesController.pas
@@ -296,22 +296,18 @@ begin
 //    RecuperarObjetos(ARemesaCliente);
 
     CreateEditor('EditorComision', IEditorComision, AEditor);
-    with (AEditor as IEditorComision) do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Comision := AComision;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorComision) do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Comision := AComision;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TComisionesController.VerTodos(AComision: IBizComisiones);
@@ -322,21 +318,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorComisiones', IEditorComisiones, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Comisiones := AComision;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Comisiones := AComision;
+         ShowEmbedded;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowEmbedded;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TComisionesController.ElegirFacturasComision(AComision: IBizComisiones): Boolean;
diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas
index e801e726..db91e2c9 100644
--- a/Source/Modulos/Contactos/Controller/uClientesController.pas
+++ b/Source/Modulos/Contactos/Controller/uClientesController.pas
@@ -352,44 +352,44 @@ end;
 procedure TClientesController.Ver(AContacto: IBizContacto);
 var
   AEditor : IEditorCliente;
-  AItem : IBizCliente;
 begin
-  AEditor := NIL;	
+  AEditor := NIL;
   ShowHourglassCursor;
   try
-    AItem := (FDataModule as IDataModuleClientes).GetItem(AContacto.ID);
-    AItem.DataTable.Active := True;
-
     CreateEditor('EditorCliente', IEditorCliente, AEditor);
-    with AEditor do
-    begin
-      Contacto := AItem;
-      Controller := Self;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contacto := AContacto;
+         Controller := Self;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-  
-  if Assigned(AEditor) then
-    try
-      AEditor.Show;
-      //AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 procedure TClientesController.VerTodos(AContactos: IBizContacto);
 var
   AEditor : IEditorClientes;
 begin
-  CreateEditor('EditorClientes', IEditorClientes, AEditor);
-  with AEditor do
-  begin
-    Contactos := AContactos;
-    Controller := Self;
-    MultiSelect := True;
-    ShowEmbedded;
+  AEditor := NIL;
+  ShowHourglassCursor;
+  try
+    CreateEditor('EditorClientes', IEditorClientes, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contactos := AContactos;
+         Controller := Self;
+         MultiSelect := True;
+         ShowEmbedded;
+      end;
+  finally
+    AEditor := NIL;
+    HideHourglassCursor;
   end;
 end;
 
diff --git a/Source/Modulos/Contactos/Controller/uDireccionesContactoController.pas b/Source/Modulos/Contactos/Controller/uDireccionesContactoController.pas
index 4aebd33a..52093792 100644
--- a/Source/Modulos/Contactos/Controller/uDireccionesContactoController.pas
+++ b/Source/Modulos/Contactos/Controller/uDireccionesContactoController.pas
@@ -104,21 +104,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorDireccion', IEditorEditorDireccion, AEditor);
-    with AEditor do
-    begin
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
          Direccion := ADireccion;
          Controller := Self;
-    end;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-  
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
+
 end.
diff --git a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
index 426625fa..586fdbe8 100644
--- a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
+++ b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
@@ -220,36 +220,40 @@ begin
   AEditor := NIL;
   ShowHourglassCursor;
   try
-	CreateEditor('EditorEmpleado', IEditorEmpleado, AEditor);
-	with AEditor do
-	begin
-		Contacto := AContacto;
-		Controller := Self;
-	end;
+    CreateEditor('EditorEmpleado', IEditorEmpleado, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contacto := AContacto;
+         Controller := Self;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TEmpleadosController.VerTodos(AContactos: IBizContacto);
 var
   AEditor : IEditorEmpleados;
 begin
-  CreateEditor('EditorEmpleados', IEditorEmpleados, AEditor);
-  with AEditor do
-  begin
-    Contactos := AContactos;
-    Controller := Self;
-    MultiSelect := True;
-    ShowEmbedded;
+  AEditor := NIL;
+  ShowHourglassCursor;
+  try
+    CreateEditor('EditorEmpleados', IEditorEmpleados, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contactos := AContactos;
+         Controller := Self;
+         MultiSelect := True;
+         ShowEmbedded;
+       end;
+  finally
+    AEditor := NIL;
+    HideHourglassCursor;
   end;
 end;
 
diff --git a/Source/Modulos/Contactos/Controller/uGruposClienteController.pas b/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
index 29ffa3b9..66c5fcf5 100644
--- a/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
+++ b/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
@@ -144,22 +144,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorGruposCliente', IEditorGruposCliente, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      GruposCliente := AGruposCliente;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         GruposCliente := AGruposCliente;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TGruposClienteController.Eliminar(AGrupoCliente: IBizGrupoCliente): Boolean;
diff --git a/Source/Modulos/Contactos/Controller/uGruposEmpleadoController.pas b/Source/Modulos/Contactos/Controller/uGruposEmpleadoController.pas
index 4a1cae1f..8cee84b7 100644
--- a/Source/Modulos/Contactos/Controller/uGruposEmpleadoController.pas
+++ b/Source/Modulos/Contactos/Controller/uGruposEmpleadoController.pas
@@ -144,22 +144,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorGruposEmpleado', IEditorGruposEmpleado, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      GruposEmpleado := AGruposEmpleado;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         GruposEmpleado := AGruposEmpleado;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TGruposEmpleadoController.Eliminar(AGrupoEmpleado: IBizGrupoEmpleado): Boolean;
diff --git a/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas b/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
index aeb991a5..ca0d4222 100644
--- a/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
+++ b/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
@@ -144,22 +144,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorGruposProveedor', IEditorGruposProveedor, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      GruposProveedor := AGruposProveedor;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         GruposProveedor := AGruposProveedor;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TGruposProveedorController.Eliminar(AGrupoProveedor: IBizGrupoProveedor): Boolean;
diff --git a/Source/Modulos/Contactos/Controller/uProveedoresController.pas b/Source/Modulos/Contactos/Controller/uProveedoresController.pas
index 0e311c94..3744308a 100644
--- a/Source/Modulos/Contactos/Controller/uProveedoresController.pas
+++ b/Source/Modulos/Contactos/Controller/uProveedoresController.pas
@@ -283,36 +283,40 @@ begin
   AEditor := NIL;	
   ShowHourglassCursor;
   try
-	CreateEditor('EditorProveedor', IEditorProveedor, AEditor);
-	with AEditor do
-	begin
-		Contacto := AContacto;
-		Controller := Self;
-	end;
+    CreateEditor('EditorProveedor', IEditorProveedor, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contacto := AContacto;
+         Controller := Self;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 procedure TProveedoresController.VerTodos(AContactos: IBizContacto);
 var
   AEditor : IEditorProveedores;
 begin
-  CreateEditor('EditorProveedores', IEditorProveedores, AEditor);
-  with AEditor do
-  begin
-    Contactos := AContactos;
-    Controller := Self;
-    MultiSelect := True;
-    ShowEmbedded;
+  AEditor := NIL;
+  ShowHourglassCursor;
+  try
+    CreateEditor('EditorProveedores', IEditorProveedores, AEditor);
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Contactos := AContactos;
+         Controller := Self;
+         MultiSelect := True;
+         ShowEmbedded;
+       end;
+  finally
+    AEditor := NIL;
+    HideHourglassCursor;
   end;
 end;
 
diff --git a/Source/Modulos/Familias/Controller/uFamiliasController.pas b/Source/Modulos/Familias/Controller/uFamiliasController.pas
index 37536bb2..26e42df5 100644
--- a/Source/Modulos/Familias/Controller/uFamiliasController.pas
+++ b/Source/Modulos/Familias/Controller/uFamiliasController.pas
@@ -146,22 +146,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorFamilias', IEditorFamilias, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Familias := AFamilias;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Familias := AFamilias;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 function TFamiliasController.Eliminar(AFamilia: IBizFamilia): Boolean;
diff --git a/Source/Modulos/Formas de pago/Controller/uFormasPagoController.pas b/Source/Modulos/Formas de pago/Controller/uFormasPagoController.pas
index 4f1eed50..2311e525 100644
--- a/Source/Modulos/Formas de pago/Controller/uFormasPagoController.pas	
+++ b/Source/Modulos/Formas de pago/Controller/uFormasPagoController.pas	
@@ -180,19 +180,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorFormaPago', IEditorFormaPago, AEditor);
-    with AEditor do
-      FormaPago := AFormaPago;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         FormaPago := AFormaPago;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TFormasPagoController.VerTodos(AFormasPago: IBizFormaPago);
@@ -203,19 +201,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorFormasPago', IEditorFormasPago, AEditor);
-    with AEditor do
-      FormasPago := AFormasPago;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         FormasPago := AFormasPago;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TFormasPagoController.Eliminar(AFormaPago: IBizFormaPago): Boolean;
diff --git a/Source/Modulos/Historico de movimientos/Controller/uHistoricoMovimientosController.pas b/Source/Modulos/Historico de movimientos/Controller/uHistoricoMovimientosController.pas
index 467074a7..afff2442 100644
--- a/Source/Modulos/Historico de movimientos/Controller/uHistoricoMovimientosController.pas	
+++ b/Source/Modulos/Historico de movimientos/Controller/uHistoricoMovimientosController.pas	
@@ -122,24 +122,20 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Articulos := AArticulos;
-      HistoricoMovimientos := AHistoricoMovimientos;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Articulos := AArticulos;
+         HistoricoMovimientos := AHistoricoMovimientos;
+         ShowModal;
+         Result := ResultadoModalOK;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      Result := AEditor.ResultadoModalOK;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;}
 
 procedure THistoricoMovimientosController.VerTodos(AHistoricoMovimientos: IBizHistoricoMovimientos);
@@ -150,18 +146,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorHistoricoMovimientos', IEditorHistoricoMovimientos, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      HistoricoMovimientos := AHistoricoMovimientos;
-      MultiSelect := False;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         HistoricoMovimientos := AHistoricoMovimientos;
+         MultiSelect := False;
+         ShowEmbedded;
+       end;
   finally
+    AEditor := Nil;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.ShowEmbedded;
 end;
 
 function THistoricoMovimientosController._Vacio: IBizHistoricoMovimientos;
diff --git a/Source/Modulos/Inventario/Controller/uInventarioController.pas b/Source/Modulos/Inventario/Controller/uInventarioController.pas
index 0cfc4154..df0a8249 100644
--- a/Source/Modulos/Inventario/Controller/uInventarioController.pas
+++ b/Source/Modulos/Inventario/Controller/uInventarioController.pas
@@ -451,26 +451,22 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Articulos := AArticulos;
-      Inventario := AInventario;
-      if Assigned(APedido) then
-         PedidoProveedor := APedido;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Articulos := AArticulos;
+         Inventario := AInventario;
+         if Assigned(APedido) then
+            PedidoProveedor := APedido;
+         ShowModal;
+         Result := ResultadoModalOK;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      Result := AEditor.ResultadoModalOK;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TInventarioController.VerReservas(AArticulo: IBizInventario);
@@ -481,24 +477,20 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorDetalleReservas', IEditorDetalleReservas, AEditor);
-    with AEditor do
-    begin
-//      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      DetalleReservas := FDataModule.GetDetalleReservas;
-      Articulo := AArticulo;
-//      MultiSelect := False;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+   //      Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         DetalleReservas := FDataModule.GetDetalleReservas;
+         Articulo := AArticulo;
+   //      MultiSelect := False;
+         ShowModal;
+         Release;
+      end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TInventarioController.VerTodos(AInventario: IBizInventario);
@@ -509,18 +501,18 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorInventario', IEditorInventario, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Inventario := AInventario;
-      MultiSelect := False;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Inventario := AInventario;
+         MultiSelect := False;
+         ShowEmbedded;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    AEditor.ShowEmbedded;
 end;
 
 function TInventarioController._Vacio: IBizInventario;
diff --git a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
index 2888f2d8..36556624 100644
--- a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas	
@@ -435,22 +435,17 @@ begin
   try
     //RecuperarObjetos(APedido); <- No descomentar. No hace falta
     CreateEditor('EditorDireccionEntregaPedidoProveedor', IEditorDireccionEntregaPedidoProveedor, AEditor);
-
-    with (AEditor as IEditorDireccionEntregaPedidoProveedor) do
-    begin
-      Pedido := APedido;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorDireccionEntregaPedidoProveedor) do
+       begin
+         Pedido := APedido;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 function TPedidosProveedorController._Vacio: IBizPedidoProveedor;
diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas
index e0497b56..237c7065 100644
--- a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas	
@@ -373,22 +373,17 @@ begin
   try
     //RecuperarObjetos(APresupuesto); <- No descomentar. No hace falta
     CreateEditor('EditorDireccionEntregaPresupuestoCliente', IEditorDireccionEntregaPresupuestoCliente, AEditor);
-
-    with (AEditor as IEditorDireccionEntregaPresupuestoCliente) do
-    begin
-      Presupuesto := APresupuesto;
-    end;
+    if Assigned(AEditor) then
+       with (AEditor as IEditorDireccionEntregaPresupuestoCliente) do
+       begin
+         Presupuesto := APresupuesto;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 }    
 end;
 
diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas
index e4e86aa5..298e6cc3 100644
--- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas	
+++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas	
@@ -528,22 +528,18 @@ begin
   try
     RecuperarCliente(ARecibosCliente);
     CreateEditor('EditorReciboCliente', IEditorReciboCliente, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Recibo := ARecibosCliente;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Recibo := ARecibosCliente;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TRecibosClienteController.VerTodos(ARecibosCliente: IBizRecibosCliente);
diff --git a/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorController.pas b/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorController.pas
index eaca526f..d99a2cfa 100644
--- a/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorController.pas	
+++ b/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorController.pas	
@@ -506,22 +506,18 @@ begin
   try
     RecuperarCliente(ARecibosProveedor);
     CreateEditor('EditorReciboProveedor', IEditorReciboProveedor, AEditor);
-    with AEditor do
-    begin
-      Controller := Self; //OJO ORDEN MUY IMPORTANTE
-      Recibo := ARecibosProveedor;
-    end;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Controller := Self; //OJO ORDEN MUY IMPORTANTE
+         Recibo := ARecibosProveedor;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TRecibosProveedorController.VerTodos(ARecibosProveedor: IBizRecibosProveedor);
@@ -532,18 +528,16 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorRecibosProveedor', IEditorRecibosProveedor, AEditor);
-    with AEditor do
-      RecibosProveedor := ARecibosProveedor;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         RecibosProveedor := ARecibosProveedor;
+         ShowEmbedded;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowEmbedded;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 function TRecibosProveedorController.ElegirRecibos(ARecibos: IBizRecibosProveedor; AMensaje: String;
diff --git a/Source/Modulos/Referencias/Controller/uReferenciasController.pas b/Source/Modulos/Referencias/Controller/uReferenciasController.pas
index c8fbd824..d3da8faa 100644
--- a/Source/Modulos/Referencias/Controller/uReferenciasController.pas
+++ b/Source/Modulos/Referencias/Controller/uReferenciasController.pas
@@ -121,19 +121,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorReferencias', IEditorReferencias, AEditor);
-    with AEditor do
-      Referencias := AReferencias;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         Referencias := AReferencias;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 procedure TReferenciasController.RecibirAviso(ASujeto: ISujeto; ADataTable: IDAStronglyTypedDataTable);
diff --git a/Source/Modulos/Tipos de IVA/Controller/uTiposIVAController.pas b/Source/Modulos/Tipos de IVA/Controller/uTiposIVAController.pas
index aa4279ff..cb4996f4 100644
--- a/Source/Modulos/Tipos de IVA/Controller/uTiposIVAController.pas	
+++ b/Source/Modulos/Tipos de IVA/Controller/uTiposIVAController.pas	
@@ -214,19 +214,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorTipoIVA', IEditorTipoIVA, AEditor);
-    with AEditor do
-      TipoIVA := ATipoIVA;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         TipoIVA := ATipoIVA;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end;
 end;
 
 procedure TTiposIVAController.VerTodos(ATiposIVA: IBizTipoIVA);
@@ -237,19 +235,17 @@ begin
   ShowHourglassCursor;
   try
     CreateEditor('EditorTiposIVA', IEditorTiposIVA, AEditor);
-    with AEditor do
-      TiposIVA := ATiposIVA;
+    if Assigned(AEditor) then
+       with AEditor do
+       begin
+         TiposIVA := ATiposIVA;
+         ShowModal;
+         Release;
+       end;
   finally
+    AEditor := NIL;
     HideHourglassCursor;
   end;
-
-  if Assigned(AEditor) then
-    try
-      AEditor.ShowModal;
-      AEditor.Release;
-    finally
-      AEditor := NIL;
-    end; 
 end;
 
 function TTiposIVAController.Eliminar(ATipoIVA: IBizTipoIVA): Boolean;
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index acc82c91..3d3431ab 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index f90034b3..67e4dad8 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "3.0.0.0\0"
               VALUE "ProductVersion", "3.0.0.0\0"
-              VALUE "CompileDate", "domingo, 18 de noviembre de 2007 18:14\0"
+              VALUE "CompileDate", "domingo, 18 de noviembre de 2007 19:38\0"
          END
     END
     BLOCK "VarFileInfo"