Cambios en la forma de ver los editores para que libere bien, creo que tambien he arriglado error al crear clientes nuevos

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@143 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2007-11-18 18:42:04 +00:00
parent c5014e11f1
commit f632f134a3
26 changed files with 349 additions and 444 deletions

View File

@ -41,8 +41,7 @@ begin
inherited; inherited;
end; end;
procedure TDatosBancariosEmpresaController.Ver( procedure TDatosBancariosEmpresaController.Ver(ADatosBancarios : IBizEmpresasDatosBancarios);
ADatosBancarios : IBizEmpresasDatosBancarios);
var var
AEditor : IEditorDatosBancariosEmpresa; AEditor : IEditorDatosBancariosEmpresa;
begin begin
@ -50,21 +49,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorDatosBancariosEmpresa', IEditorDatosBancariosEmpresa, AEditor); CreateEditor('EditorDatosBancariosEmpresa', IEditorDatosBancariosEmpresa, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
DatosBancarios := ADatosBancarios; DatosBancarios := ADatosBancarios;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -208,21 +208,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorEmpresa', IEditorEmpresa, AEditor); CreateEditor('EditorEmpresa', IEditorEmpresa, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Empresa := AEmpresa; Empresa := AEmpresa;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -586,21 +586,16 @@ begin
try try
//RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta //RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta
CreateEditor('EditorDireccionEntregaAlbaranCliente', IEditorDireccionEntregaAlbaranCliente, AEditor); CreateEditor('EditorDireccionEntregaAlbaranCliente', IEditorDireccionEntregaAlbaranCliente, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorDireccionEntregaAlbaranCliente) do with (AEditor as IEditorDireccionEntregaAlbaranCliente) do
begin begin
Albaran := AAlbaran; Albaran := AAlbaran;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -651,21 +651,16 @@ begin
try try
//RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta //RecuperarObjetos(AAlbaran); <- No descomentar. No hace falta
CreateEditor('EditorDireccionEntregaAlbaranProveedor', IEditorDireccionEntregaAlbaranProveedor, AEditor); CreateEditor('EditorDireccionEntregaAlbaranProveedor', IEditorDireccionEntregaAlbaranProveedor, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorDireccionEntregaAlbaranProveedor) do with (AEditor as IEditorDireccionEntregaAlbaranProveedor) do
begin begin
Albaran := AAlbaran; Albaran := AAlbaran;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -43,7 +43,6 @@ type
//este controller //este controller
procedure AsignarDataModule; virtual; procedure AsignarDataModule; virtual;
procedure RecuperarObjetos(AAlmacen: IBizAlmacen); virtual; procedure RecuperarObjetos(AAlmacen: IBizAlmacen); virtual;
procedure AsignarEditor(out AEditor: IEditorDBItem); virtual;
procedure ValidarObjetos; virtual; procedure ValidarObjetos; virtual;
// procedure AsignarCodigo(AAlmacen: IBizAlmacen); virtual; // procedure AsignarCodigo(AAlmacen: IBizAlmacen); virtual;
@ -95,11 +94,6 @@ begin
FDataModule := TDataModuleAlmacenes.Create(Nil); FDataModule := TDataModuleAlmacenes.Create(Nil);
end; end;
procedure TAlmacenesController.AsignarEditor(out AEditor: IEditorDBItem);
begin
CreateEditor('EditorAlmacen', IEditorAlmacen, AEditor);
end;
{procedure TAlmacenesController.AssignarID(AAlmacen: IBizAlmacen; ADataModule : IDataModuleAlmacenes); {procedure TAlmacenesController.AssignarID(AAlmacen: IBizAlmacen; ADataModule : IDataModuleAlmacenes);
var var
NuevoIDCabecera : Integer; NuevoIDCabecera : Integer;
@ -211,23 +205,18 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
RecuperarObjetos(AAlmacen); RecuperarObjetos(AAlmacen);
AsignarEditor(AEditor); CreateEditor('EditorAlmacen', IEditorAlmacen, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorAlmacen) do with (AEditor as IEditorAlmacen) do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Almacen := AAlmacen; Almacen := AAlmacen;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -235,16 +224,18 @@ function TAlmacenesController.VerLista(AAlmacenes: IBizAlmacen): IBizAlmacen;
var var
AEditor : IEditorListaAlmacenes; AEditor : IEditorListaAlmacenes;
begin begin
AEditor := NIL;
Result := NIL; Result := NIL;
CreateEditor('EditorListaAlmacenes', IEditorListaAlmacenes, AEditor);
try try
CreateEditor('EditorListaAlmacenes', IEditorListaAlmacenes, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Almacenes := AAlmacenes; Almacenes := AAlmacenes;
if IsPositiveResult(ShowModal) then if IsPositiveResult(ShowModal) then
Result := AlmacenSeleccionado; Result := AlmacenSeleccionado;
AEditor.Release; Release;
end; end;
finally finally
AEditor := NIL; AEditor := NIL;
@ -259,17 +250,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorAlmacenes', IEditorAlmacenes, AEditor); CreateEditor('EditorAlmacenes', IEditorAlmacenes, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Almacenes := AAlmacenes; Almacenes := AAlmacenes;
ShowEmbedded;
end; end;
finally finally
HideHourglassCursor; HideHourglassCursor;
end; end;
if Assigned(AEditor) then
AEditor.ShowEmbedded;
end; end;
function TAlmacenesController._Vacio: IBizAlmacen; function TAlmacenesController._Vacio: IBizAlmacen;

View File

@ -388,21 +388,17 @@ begin
RecuperarObjetos(AArticulo); RecuperarObjetos(AArticulo);
CreateEditor('EditorArticulo', IEditorArticulo, AEditor); CreateEditor('EditorArticulo', IEditorArticulo, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorArticulo) do with (AEditor as IEditorArticulo) do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Articulo := AArticulo; Articulo := AArticulo;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -432,17 +428,16 @@ begin
RecuperarObjetos(AArticulos); RecuperarObjetos(AArticulos);
CreateEditor('EditorArticulos', IEditorArticulos, AEditor); CreateEditor('EditorArticulos', IEditorArticulos, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorArticulos) do with (AEditor as IEditorArticulos) do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Articulos := AArticulos; Articulos := AArticulos;
ShowEmbedded;
end; end;
finally finally
HideHourglassCursor; HideHourglassCursor;
end; end;
if Assigned(AEditor) then
AEditor.ShowEmbedded;
end; end;
function TArticulosController._Vacio: IBizArticulo; function TArticulosController._Vacio: IBizArticulo;

View File

@ -296,21 +296,17 @@ begin
// RecuperarObjetos(ARemesaCliente); // RecuperarObjetos(ARemesaCliente);
CreateEditor('EditorComision', IEditorComision, AEditor); CreateEditor('EditorComision', IEditorComision, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorComision) do with (AEditor as IEditorComision) do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Comision := AComision; Comision := AComision;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -322,20 +318,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorComisiones', IEditorComisiones, AEditor); CreateEditor('EditorComisiones', IEditorComisiones, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Comisiones := AComision; Comisiones := AComision;
ShowEmbedded;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowEmbedded;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -352,30 +352,22 @@ end;
procedure TClientesController.Ver(AContacto: IBizContacto); procedure TClientesController.Ver(AContacto: IBizContacto);
var var
AEditor : IEditorCliente; AEditor : IEditorCliente;
AItem : IBizCliente;
begin begin
AEditor := NIL; AEditor := NIL;
ShowHourglassCursor; ShowHourglassCursor;
try try
AItem := (FDataModule as IDataModuleClientes).GetItem(AContacto.ID);
AItem.DataTable.Active := True;
CreateEditor('EditorCliente', IEditorCliente, AEditor); CreateEditor('EditorCliente', IEditorCliente, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contacto := AItem; Contacto := AContacto;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.Show;
//AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -383,7 +375,11 @@ procedure TClientesController.VerTodos(AContactos: IBizContacto);
var var
AEditor : IEditorClientes; AEditor : IEditorClientes;
begin begin
AEditor := NIL;
ShowHourglassCursor;
try
CreateEditor('EditorClientes', IEditorClientes, AEditor); CreateEditor('EditorClientes', IEditorClientes, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contactos := AContactos; Contactos := AContactos;
@ -391,6 +387,10 @@ begin
MultiSelect := True; MultiSelect := True;
ShowEmbedded; ShowEmbedded;
end; end;
finally
AEditor := NIL;
HideHourglassCursor;
end;
end; end;
end. end.

View File

@ -104,21 +104,18 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorDireccion', IEditorEditorDireccion, AEditor); CreateEditor('EditorDireccion', IEditorEditorDireccion, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Direccion := ADireccion; Direccion := ADireccion;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
end. end.

View File

@ -221,21 +221,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorEmpleado', IEditorEmpleado, AEditor); CreateEditor('EditorEmpleado', IEditorEmpleado, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contacto := AContacto; Contacto := AContacto;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -243,7 +239,11 @@ procedure TEmpleadosController.VerTodos(AContactos: IBizContacto);
var var
AEditor : IEditorEmpleados; AEditor : IEditorEmpleados;
begin begin
AEditor := NIL;
ShowHourglassCursor;
try
CreateEditor('EditorEmpleados', IEditorEmpleados, AEditor); CreateEditor('EditorEmpleados', IEditorEmpleados, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contactos := AContactos; Contactos := AContactos;
@ -251,6 +251,10 @@ begin
MultiSelect := True; MultiSelect := True;
ShowEmbedded; ShowEmbedded;
end; end;
finally
AEditor := NIL;
HideHourglassCursor;
end;
end; end;
end. end.

View File

@ -144,21 +144,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorGruposCliente', IEditorGruposCliente, AEditor); CreateEditor('EditorGruposCliente', IEditorGruposCliente, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
GruposCliente := AGruposCliente; GruposCliente := AGruposCliente;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -144,21 +144,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorGruposEmpleado', IEditorGruposEmpleado, AEditor); CreateEditor('EditorGruposEmpleado', IEditorGruposEmpleado, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
GruposEmpleado := AGruposEmpleado; GruposEmpleado := AGruposEmpleado;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -144,21 +144,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorGruposProveedor', IEditorGruposProveedor, AEditor); CreateEditor('EditorGruposProveedor', IEditorGruposProveedor, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
GruposProveedor := AGruposProveedor; GruposProveedor := AGruposProveedor;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -284,21 +284,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorProveedor', IEditorProveedor, AEditor); CreateEditor('EditorProveedor', IEditorProveedor, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contacto := AContacto; Contacto := AContacto;
Controller := Self; Controller := Self;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -306,7 +302,11 @@ procedure TProveedoresController.VerTodos(AContactos: IBizContacto);
var var
AEditor : IEditorProveedores; AEditor : IEditorProveedores;
begin begin
AEditor := NIL;
ShowHourglassCursor;
try
CreateEditor('EditorProveedores', IEditorProveedores, AEditor); CreateEditor('EditorProveedores', IEditorProveedores, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Contactos := AContactos; Contactos := AContactos;
@ -314,6 +314,10 @@ begin
MultiSelect := True; MultiSelect := True;
ShowEmbedded; ShowEmbedded;
end; end;
finally
AEditor := NIL;
HideHourglassCursor;
end;
end; end;
end. end.

View File

@ -146,21 +146,17 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorFamilias', IEditorFamilias, AEditor); CreateEditor('EditorFamilias', IEditorFamilias, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Familias := AFamilias; Familias := AFamilias;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -180,18 +180,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorFormaPago', IEditorFormaPago, AEditor); CreateEditor('EditorFormaPago', IEditorFormaPago, AEditor);
with AEditor do
FormaPago := AFormaPago;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowModal; begin
AEditor.Release; FormaPago := AFormaPago;
ShowModal;
Release;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -203,18 +201,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorFormasPago', IEditorFormasPago, AEditor); CreateEditor('EditorFormasPago', IEditorFormasPago, AEditor);
with AEditor do
FormasPago := AFormasPago;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowModal; begin
AEditor.Release; FormasPago := AFormasPago;
ShowModal;
Release;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -122,23 +122,19 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor); CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Articulos := AArticulos; Articulos := AArticulos;
HistoricoMovimientos := AHistoricoMovimientos; HistoricoMovimientos := AHistoricoMovimientos;
ShowModal;
Result := ResultadoModalOK;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
Result := AEditor.ResultadoModalOK;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end;} end;}
@ -150,18 +146,18 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorHistoricoMovimientos', IEditorHistoricoMovimientos, AEditor); CreateEditor('EditorHistoricoMovimientos', IEditorHistoricoMovimientos, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
HistoricoMovimientos := AHistoricoMovimientos; HistoricoMovimientos := AHistoricoMovimientos;
MultiSelect := False; MultiSelect := False;
ShowEmbedded;
end; end;
finally finally
AEditor := Nil;
HideHourglassCursor; HideHourglassCursor;
end; end;
if Assigned(AEditor) then
AEditor.ShowEmbedded;
end; end;
function THistoricoMovimientosController._Vacio: IBizHistoricoMovimientos; function THistoricoMovimientosController._Vacio: IBizHistoricoMovimientos;

View File

@ -451,6 +451,7 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor); CreateEditor('EditorEntradaSalidaArticulos', IEditorEntradaSalidaArticulos, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
@ -458,18 +459,13 @@ begin
Inventario := AInventario; Inventario := AInventario;
if Assigned(APedido) then if Assigned(APedido) then
PedidoProveedor := APedido; PedidoProveedor := APedido;
ShowModal;
Result := ResultadoModalOK;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
Result := AEditor.ResultadoModalOK;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -481,23 +477,19 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorDetalleReservas', IEditorDetalleReservas, AEditor); CreateEditor('EditorDetalleReservas', IEditorDetalleReservas, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
// Controller := Self; //OJO ORDEN MUY IMPORTANTE // Controller := Self; //OJO ORDEN MUY IMPORTANTE
DetalleReservas := FDataModule.GetDetalleReservas; DetalleReservas := FDataModule.GetDetalleReservas;
Articulo := AArticulo; Articulo := AArticulo;
// MultiSelect := False; // MultiSelect := False;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -509,18 +501,18 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorInventario', IEditorInventario, AEditor); CreateEditor('EditorInventario', IEditorInventario, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Inventario := AInventario; Inventario := AInventario;
MultiSelect := False; MultiSelect := False;
ShowEmbedded;
end; end;
finally finally
AEditor := NIL;
HideHourglassCursor; HideHourglassCursor;
end; end;
if Assigned(AEditor) then
AEditor.ShowEmbedded;
end; end;
function TInventarioController._Vacio: IBizInventario; function TInventarioController._Vacio: IBizInventario;

View File

@ -435,21 +435,16 @@ begin
try try
//RecuperarObjetos(APedido); <- No descomentar. No hace falta //RecuperarObjetos(APedido); <- No descomentar. No hace falta
CreateEditor('EditorDireccionEntregaPedidoProveedor', IEditorDireccionEntregaPedidoProveedor, AEditor); CreateEditor('EditorDireccionEntregaPedidoProveedor', IEditorDireccionEntregaPedidoProveedor, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorDireccionEntregaPedidoProveedor) do with (AEditor as IEditorDireccionEntregaPedidoProveedor) do
begin begin
Pedido := APedido; Pedido := APedido;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -373,21 +373,16 @@ begin
try try
//RecuperarObjetos(APresupuesto); <- No descomentar. No hace falta //RecuperarObjetos(APresupuesto); <- No descomentar. No hace falta
CreateEditor('EditorDireccionEntregaPresupuestoCliente', IEditorDireccionEntregaPresupuestoCliente, AEditor); CreateEditor('EditorDireccionEntregaPresupuestoCliente', IEditorDireccionEntregaPresupuestoCliente, AEditor);
if Assigned(AEditor) then
with (AEditor as IEditorDireccionEntregaPresupuestoCliente) do with (AEditor as IEditorDireccionEntregaPresupuestoCliente) do
begin begin
Presupuesto := APresupuesto; Presupuesto := APresupuesto;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
} }
end; end;

View File

@ -528,21 +528,17 @@ begin
try try
RecuperarCliente(ARecibosCliente); RecuperarCliente(ARecibosCliente);
CreateEditor('EditorReciboCliente', IEditorReciboCliente, AEditor); CreateEditor('EditorReciboCliente', IEditorReciboCliente, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Recibo := ARecibosCliente; Recibo := ARecibosCliente;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -506,21 +506,17 @@ begin
try try
RecuperarCliente(ARecibosProveedor); RecuperarCliente(ARecibosProveedor);
CreateEditor('EditorReciboProveedor', IEditorReciboProveedor, AEditor); CreateEditor('EditorReciboProveedor', IEditorReciboProveedor, AEditor);
if Assigned(AEditor) then
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
Recibo := ARecibosProveedor; Recibo := ARecibosProveedor;
ShowModal;
Release;
end; end;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then
try
AEditor.ShowModal;
AEditor.Release;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -532,17 +528,15 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorRecibosProveedor', IEditorRecibosProveedor, AEditor); CreateEditor('EditorRecibosProveedor', IEditorRecibosProveedor, AEditor);
with AEditor do
RecibosProveedor := ARecibosProveedor;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowEmbedded; begin
RecibosProveedor := ARecibosProveedor;
ShowEmbedded;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -121,18 +121,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorReferencias', IEditorReferencias, AEditor); CreateEditor('EditorReferencias', IEditorReferencias, AEditor);
with AEditor do
Referencias := AReferencias;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowModal; begin
AEditor.Release; Referencias := AReferencias;
ShowModal;
Release;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

View File

@ -214,18 +214,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorTipoIVA', IEditorTipoIVA, AEditor); CreateEditor('EditorTipoIVA', IEditorTipoIVA, AEditor);
with AEditor do
TipoIVA := ATipoIVA;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowModal; begin
AEditor.Release; TipoIVA := ATipoIVA;
ShowModal;
Release;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;
@ -237,18 +235,16 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
CreateEditor('EditorTiposIVA', IEditorTiposIVA, AEditor); CreateEditor('EditorTiposIVA', IEditorTiposIVA, AEditor);
with AEditor do
TiposIVA := ATiposIVA;
finally
HideHourglassCursor;
end;
if Assigned(AEditor) then if Assigned(AEditor) then
try with AEditor do
AEditor.ShowModal; begin
AEditor.Release; TiposIVA := ATiposIVA;
ShowModal;
Release;
end;
finally finally
AEditor := NIL; AEditor := NIL;
HideHourglassCursor;
end; end;
end; end;

Binary file not shown.

View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "3.0.0.0\0" VALUE "FileVersion", "3.0.0.0\0"
VALUE "ProductVersion", "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
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"