From 5df0770b1b0c1aa29ce6361c4d3c6d664840596b Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 21 Jul 2010 16:23:44 +0000 Subject: [PATCH] Prueba para que las ventanas modales contengan otro objeto de negocio diferente al del grid, para poder abrir varias ventanas a la vez git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@138 f33bb606-9f5c-448d-9c99-757f00063c96 --- .../AlbaranesCliente_controller.dproj | 8 ++++---- .../Controller/AlbaranesCliente_controller.res | Bin 384 -> 4748 bytes .../Controller/uAlbaranesClienteController.pas | 17 +++++++++++++++++ .../Views/uEditorAlbaranesCliente.dfm | 4 ---- .../Views/uEditorAlbaranesCliente.pas | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj index 0caa9e4..ca65dab 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj +++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj @@ -49,10 +49,10 @@ MainSource - - - - + + + + diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index 46af246..91bba4e 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -588,8 +588,21 @@ end; procedure TAlbaranesClienteController.Ver(AAlbaran: IBizAlbaranCliente); var AEditor : IEditorAlbaranCliente; +// AAlbaran2: IBizAlbaranCliente; +// Esnuevo: Boolean; begin AEditor := NIL; + +// Esnuevo := AAlbaran.ID < 0; + //Es modificación +// if not Esnuevo then +// begin +// AAlbaran2 := Buscar(AAlbaran.ID); +// AAlbaran2.DataTable.Active := True; +// end +// else +// AAlbaran2 := Nuevo; + RecuperarObjetos(AAlbaran); if (AAlbaran.TIPO = CTE_TIPO_ALBARAN) then @@ -614,6 +627,10 @@ begin //MODO CONSULTAR (Se deja la tabla como estaba) if AEditor.ReadOnly then SetDataTableReadOnly(AAlbaran.DataTable, False); + +// if Esnuevo then +// DuplicarRegistro(AAlbaran.DataTable, AAlbaran.DataTable, True, True, True); + finally AEditor.Release; AEditor := NIL; diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm index 0cafdae..dbdd4e9 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm @@ -199,10 +199,6 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente inherited actAnchoAuto: TAction ImageIndex = 22 end - inherited actExportarExcel: TAction - Enabled = False - Visible = False - end object actGenerarFactura: TAction Category = 'Acciones' Caption = 'Generar factura' diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas index 7ae62f5..0022740 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas @@ -483,7 +483,7 @@ begin // end; // 100 : begin // Albaran nuevo vacio if FController.Anadir(Albaranes) then - FController.Ver(Albaranes); + FController.Ver(Albaranes); // end; // end; // end;