From d76477a8180410acdf1192d1044194ac69060dbc Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 11 Mar 2013 16:10:38 +0000 Subject: [PATCH] =?UTF-8?q?Versi=C3=B3n=201.9.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1074 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/ApplicationBase/ApplicationBase.res | Bin 4748 -> 384 bytes Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Cliente/FactuGES.dproj | 2 +- Source/Cliente/FactuGES.res | Bin 171984 -> 172156 bytes Source/GUIBase/GUIBase.res | Bin 4748 -> 384 bytes Source/Informes/1/InfAlbaranCliente.fr3 | 8 +- Source/Informes/2/InfAlbaranCliente.fr3 | 10 +- Source/Informes/3/InfAlbaranCliente.fr3 | 10 +- Source/Informes/3/InfPresupuestoCliente.fr3 | 8 +- Source/Informes/3/InformeIVAClientes.fr3 | 8 +- .../3/InformeIVAClientesDesglosado.fr3 | 8 +- Source/Informes/3/InformeIVAComparativo.fr3 | 8 +- Source/Informes/3/InformeIVAProveedores.fr3 | 8 +- .../3/InformeIVAProveedoresDesglosado.fr3 | 8 +- .../3/InformeListadoBeneficiosGrafComp.fr3 | 10 +- .../3/InformeListadoFacturasCliente.fr3 | 8 +- ...nformeListadoFacturasClienteDesglosado.fr3 | 8 +- .../InformeListadoFacturasClienteGrafComp.fr3 | 14 +- ...nformeListadoFacturasClientePendientes.fr3 | 6 +- ...adoFacturasClientePendientesDesglosado.fr3 | 6 +- .../3/InformeListadoFacturasProveedor.fr3 | 8 +- ...ormeListadoFacturasProveedorDesglosado.fr3 | 8 +- ...nformeListadoFacturasProveedorGrafComp.fr3 | 10 +- ...ormeListadoFacturasProveedorPendientes.fr3 | 6 +- ...oFacturasProveedorPendientesDesglosado.fr3 | 6 +- ...ormeListadoPresupuestosClienteGrafComp.fr3 | 16 +- .../3/InformeListadoRecibosCliPendientes.fr3 | 4 +- ...eListadoRecibosCliPendientesDesglosado.fr3 | 4 +- .../3/InformeListadoRecibosCliente.fr3 | 4 +- ...InformeListadoRecibosClienteDesglosado.fr3 | 4 +- .../3/InformeListadoRecibosProvPendientes.fr3 | 4 +- ...ListadoRecibosProvPendientesDesglosado.fr3 | 4 +- .../3/InformeListadoRecibosProveedor.fr3 | 4 +- ...formeListadoRecibosProveedorDesglosado.fr3 | 4 +- Source/Informes/3/Presupuesto.rdx | Bin 43520 -> 43520 bytes .../View/uIEditorAlbaranesClientePreview.pas | 7 + .../uAlbaranesClienteController.pas | 22 +- .../uAlbaranesClienteReportController.pas | 48 +- .../Data/uDataModuleAlbaranesCliente.dfm | 8 +- .../Data/uDataModuleAlbaranesCliente.pas | 32 +- .../uIDataModuleAlbaranesClienteReport.pas | 9 +- .../Reports/uRptAlbaranesCliente_Server.dfm | 1 + .../Reports/uRptAlbaranesCliente_Server.pas | 36 +- .../Reports/uRptWordAlbaranCliente.pas | 26 +- .../Servidor/srvAlbaranesCliente_Impl.pas | 25 +- .../Views/AlbaranesCliente_view.dpk | 7 +- .../Views/AlbaranesCliente_view.dproj | 22 +- .../Views/AlbaranesCliente_view.res | Bin 384 -> 4748 bytes ...ialogOpcionesImpresionAlbaranesCliente.dfm | 87 +++ ...ialogOpcionesImpresionAlbaranesCliente.pas | 59 ++ .../Views/uEditorAlbaranCliente.dfm | 40 +- .../Views/uEditorAlbaranCliente.pas | 26 +- .../Views/uEditorAlbaranesCliente.pas | 15 +- .../Views/uEditorAlbaranesClienteReport.dfm | 2 - .../Views/uEditorAlbaranesClienteReport.pas | 36 +- .../Views/uEditorAlbaranProveedor.pas | 2 +- .../Views/uEditorAlbaranesProveedor.pas | 1 - .../Modulos/Contactos/Data/Contactos_data.res | Bin 4748 -> 384 bytes .../Contactos/Model/Contactos_model.res | Bin 4748 -> 384 bytes .../Contactos/Model/uBizContactosServer.pas | 18 +- .../Contactos/Servidor/srvContactos_Impl.dfm | 83 +-- Source/Servicios/FactuGES.RODL | 12 + Source/Servicios/FactuGES_Intf.pas | 24 +- Source/Servicios/FactuGES_Invk.pas | 24 +- Source/Servicios/RODLFILE.res | Bin 47899 -> 48364 bytes Source/Servidor/FactuGES_Server.RES | Bin 23212 -> 23484 bytes Source/Servidor/FactuGES_Server.dproj | 665 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 68 files changed, 938 insertions(+), 617 deletions(-) create mode 100644 Source/Modulos/Albaranes de cliente/Views/uDialogOpcionesImpresionAlbaranesCliente.dfm create mode 100644 Source/Modulos/Albaranes de cliente/Views/uDialogOpcionesImpresionAlbaranesCliente.pas diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 diff --git a/Source/Base/Base.res b/Source/Base/Base.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/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index b2821c2d..e1ef74dc 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1970FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.7.0FactuGESFactuGES1.9.7.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1980FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.8.0FactuGESFactuGES1.9.8.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index a4f754e65b4bee4a7d0d2ebe91467d398e6f16f9..b7d06c71ca64a631783c3ec668c3c733d307fc66 100644 GIT binary patch delta 488 zcmY+9y-EW?6otPTlek%fY?*Q)_}`?k5JU_r5>T*7pDZd#&}fJ@R!O0d2N1SNHf**1k%5JT`Si1p!uPE9fK85R>J+6q+}R4N(KXZ--Ol*^X&E8tSA zSvG!#C3?NY>6k@fpphI*r=A=oFDNqqp@9y+hkAR>kzS)Z?8hFnu4(#@Nw^p3g8B-B zNLM#DMOPftkS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d< z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX` zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go zlZiSz&|Hu#JA*w~4am7HU=b)6Oa)B0oyVlis53or9#j1EH}jY@7|o}P&S$coeqlaS L0+4OEfXN#G4BIM@ diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index aeeb95fb..fd65952f 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -32,10 +32,10 @@ - - + + - + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index d47ec94f..6241bd6b 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + @@ -35,10 +35,10 @@ - - + + - + diff --git a/Source/Informes/3/InfAlbaranCliente.fr3 b/Source/Informes/3/InfAlbaranCliente.fr3 index 78ea8e59..b79e74ca 100644 --- a/Source/Informes/3/InfAlbaranCliente.fr3 +++ b/Source/Informes/3/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -27,11 +27,11 @@ - - - + + + - + diff --git a/Source/Informes/3/InfPresupuestoCliente.fr3 b/Source/Informes/3/InfPresupuestoCliente.fr3 index 33fc06d7..0b7058a4 100644 --- a/Source/Informes/3/InfPresupuestoCliente.fr3 +++ b/Source/Informes/3/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/Source/Informes/3/InformeIVAClientes.fr3 b/Source/Informes/3/InformeIVAClientes.fr3 index 7adfd664..f1ff5379 100644 --- a/Source/Informes/3/InformeIVAClientes.fr3 +++ b/Source/Informes/3/InformeIVAClientes.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/Source/Informes/3/InformeIVAClientesDesglosado.fr3 b/Source/Informes/3/InformeIVAClientesDesglosado.fr3 index 2dd628db..fd6d0b51 100644 --- a/Source/Informes/3/InformeIVAClientesDesglosado.fr3 +++ b/Source/Informes/3/InformeIVAClientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/Source/Informes/3/InformeIVAComparativo.fr3 b/Source/Informes/3/InformeIVAComparativo.fr3 index edaa3cc6..6642798c 100644 --- a/Source/Informes/3/InformeIVAComparativo.fr3 +++ b/Source/Informes/3/InformeIVAComparativo.fr3 @@ -1,5 +1,5 @@ - + @@ -7,12 +7,12 @@ - + - + @@ -31,7 +31,7 @@ - + diff --git a/Source/Informes/3/InformeIVAProveedores.fr3 b/Source/Informes/3/InformeIVAProveedores.fr3 index 136b27f7..031fa530 100644 --- a/Source/Informes/3/InformeIVAProveedores.fr3 +++ b/Source/Informes/3/InformeIVAProveedores.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/Source/Informes/3/InformeIVAProveedoresDesglosado.fr3 b/Source/Informes/3/InformeIVAProveedoresDesglosado.fr3 index c5b67024..b747e585 100644 --- a/Source/Informes/3/InformeIVAProveedoresDesglosado.fr3 +++ b/Source/Informes/3/InformeIVAProveedoresDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/Source/Informes/3/InformeListadoBeneficiosGrafComp.fr3 b/Source/Informes/3/InformeListadoBeneficiosGrafComp.fr3 index 67feda20..1ead1d90 100644 --- a/Source/Informes/3/InformeListadoBeneficiosGrafComp.fr3 +++ b/Source/Informes/3/InformeListadoBeneficiosGrafComp.fr3 @@ -1,8 +1,8 @@ - + - + @@ -19,15 +19,15 @@ - - + + - + diff --git a/Source/Informes/3/InformeListadoFacturasCliente.fr3 b/Source/Informes/3/InformeListadoFacturasCliente.fr3 index 1a6a9b0b..0f4e4d09 100644 --- a/Source/Informes/3/InformeListadoFacturasCliente.fr3 +++ b/Source/Informes/3/InformeListadoFacturasCliente.fr3 @@ -1,10 +1,10 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasClienteDesglosado.fr3 b/Source/Informes/3/InformeListadoFacturasClienteDesglosado.fr3 index 4a174296..eba9f527 100644 --- a/Source/Informes/3/InformeListadoFacturasClienteDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoFacturasClienteDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3 index 9b3fa4a2..d134a120 100644 --- a/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3 +++ b/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3 @@ -1,23 +1,23 @@ - + - + - - + + - + @@ -35,13 +35,13 @@ - + - + diff --git a/Source/Informes/3/InformeListadoFacturasClientePendientes.fr3 b/Source/Informes/3/InformeListadoFacturasClientePendientes.fr3 index 4977b37e..58bb0c6f 100644 --- a/Source/Informes/3/InformeListadoFacturasClientePendientes.fr3 +++ b/Source/Informes/3/InformeListadoFacturasClientePendientes.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasClientePendientesDesglosado.fr3 b/Source/Informes/3/InformeListadoFacturasClientePendientesDesglosado.fr3 index cfda6156..33f60434 100644 --- a/Source/Informes/3/InformeListadoFacturasClientePendientesDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoFacturasClientePendientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasProveedor.fr3 b/Source/Informes/3/InformeListadoFacturasProveedor.fr3 index e6e126bf..a6ebac36 100644 --- a/Source/Informes/3/InformeListadoFacturasProveedor.fr3 +++ b/Source/Informes/3/InformeListadoFacturasProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasProveedorDesglosado.fr3 b/Source/Informes/3/InformeListadoFacturasProveedorDesglosado.fr3 index dd88cfa1..38463573 100644 --- a/Source/Informes/3/InformeListadoFacturasProveedorDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoFacturasProveedorDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3 b/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3 index e814e88a..19e22353 100644 --- a/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3 +++ b/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3 @@ -1,23 +1,23 @@ - + - + - - + + - + diff --git a/Source/Informes/3/InformeListadoFacturasProveedorPendientes.fr3 b/Source/Informes/3/InformeListadoFacturasProveedorPendientes.fr3 index 846dc596..c17943cb 100644 --- a/Source/Informes/3/InformeListadoFacturasProveedorPendientes.fr3 +++ b/Source/Informes/3/InformeListadoFacturasProveedorPendientes.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/Source/Informes/3/InformeListadoFacturasProveedorPendientesDesglosado.fr3 b/Source/Informes/3/InformeListadoFacturasProveedorPendientesDesglosado.fr3 index 8dfd3698..4e896d0e 100644 --- a/Source/Informes/3/InformeListadoFacturasProveedorPendientesDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoFacturasProveedorPendientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/Source/Informes/3/InformeListadoPresupuestosClienteGrafComp.fr3 b/Source/Informes/3/InformeListadoPresupuestosClienteGrafComp.fr3 index 32c3d2e1..b5a75752 100644 --- a/Source/Informes/3/InformeListadoPresupuestosClienteGrafComp.fr3 +++ b/Source/Informes/3/InformeListadoPresupuestosClienteGrafComp.fr3 @@ -1,8 +1,8 @@ - + - + @@ -14,15 +14,15 @@ - - + + - + @@ -50,13 +50,13 @@ - + - + @@ -86,7 +86,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosCliPendientes.fr3 b/Source/Informes/3/InformeListadoRecibosCliPendientes.fr3 index cff7c47c..423c76c5 100644 --- a/Source/Informes/3/InformeListadoRecibosCliPendientes.fr3 +++ b/Source/Informes/3/InformeListadoRecibosCliPendientes.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosCliPendientesDesglosado.fr3 b/Source/Informes/3/InformeListadoRecibosCliPendientesDesglosado.fr3 index d355e231..9276cd60 100644 --- a/Source/Informes/3/InformeListadoRecibosCliPendientesDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoRecibosCliPendientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosCliente.fr3 b/Source/Informes/3/InformeListadoRecibosCliente.fr3 index f144bbcb..88851b3a 100644 --- a/Source/Informes/3/InformeListadoRecibosCliente.fr3 +++ b/Source/Informes/3/InformeListadoRecibosCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosClienteDesglosado.fr3 b/Source/Informes/3/InformeListadoRecibosClienteDesglosado.fr3 index d7ead362..5e85470f 100644 --- a/Source/Informes/3/InformeListadoRecibosClienteDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoRecibosClienteDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosProvPendientes.fr3 b/Source/Informes/3/InformeListadoRecibosProvPendientes.fr3 index 8f4733dc..1220006a 100644 --- a/Source/Informes/3/InformeListadoRecibosProvPendientes.fr3 +++ b/Source/Informes/3/InformeListadoRecibosProvPendientes.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosProvPendientesDesglosado.fr3 b/Source/Informes/3/InformeListadoRecibosProvPendientesDesglosado.fr3 index 3f36334e..6c47d2fa 100644 --- a/Source/Informes/3/InformeListadoRecibosProvPendientesDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoRecibosProvPendientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosProveedor.fr3 b/Source/Informes/3/InformeListadoRecibosProveedor.fr3 index d19fff26..26b5eecb 100644 --- a/Source/Informes/3/InformeListadoRecibosProveedor.fr3 +++ b/Source/Informes/3/InformeListadoRecibosProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/InformeListadoRecibosProveedorDesglosado.fr3 b/Source/Informes/3/InformeListadoRecibosProveedorDesglosado.fr3 index 65bb7d04..0098748a 100644 --- a/Source/Informes/3/InformeListadoRecibosProveedorDesglosado.fr3 +++ b/Source/Informes/3/InformeListadoRecibosProveedorDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/Source/Informes/3/Presupuesto.rdx b/Source/Informes/3/Presupuesto.rdx index d409e57409fad987c8bd117eadab5bceacf09e14..b3b93e43108b7a32ccddbd0f3947b1113ee187a5 100644 GIT binary patch delta 1437 zcma*nUrbY190%}o?!7Ix(n76(x&pUAP?5FZznS?bk^v2wR*{Ojkw_=nf@p0qE)bEb zFB->`{dh5&s2KENTjF+nftdI&`lLo9uZzz3V)nLVdsw3G`}6h+;bGZnJ~{XN`Tg#> zzqU6!rDdnI8v#uws8kEf6m8ZX$T#HIBb$?DLTEyW9`xM)PhW+71*Q-t0>c$T#4!FI z@kKOZ_-Rt#=;9H#DCtIc;Z=-^c~tUYa=NE4jqp4^!ORvdA?aAXbgamlw3j*fm}5GL z9rB3&Ft!Xm3RvS4g;w8*J|CBLx5J+eFM1*i^Mp7wM~G~JwLZq@L9^qmku|<3g_yvh z>M;2xcQ||BNjxq$j{gaLZtVV;D5~x|B6``UW~8Yt*77`RwnSr1k!=l|%*H0Ot!Z0( z%NH$MXqoG8xm;DaU+C(c$7#$@;dr}nybjn0Z_!lR{YvVFA=F!cxX^O|TMhzmJw)|Y zm8%AE^&O1D1sI2Ga2+OK5?(?+5_-T3#cHJLv6MH}?&_bV>tjyxELrU4JXSn4R0n8l zwMV6vjL4eV`QFdU8ARR+2+g6^ngDgyc$n&}xh&TgW4;7Rp$y8wgy|UkgfMP^7;J}j z;36c{`r7-_7s4fPv6ps`BeX&_hHgpU9!z(^Ua%s3b$Y!cVF)4VcD#r}@grKopxSsq z-HR`mGNJzZCQrr>=%^*6APtA%TNr>r7=>$a9VTEBUc!6GM{*B%AqW)^f-r1{cGy9! zU2A1ho$vbEK~K94>7ZY_E9pk}JlfdfRqJ{#N(WaaLBH)^>*Mk&hy7p_fS;|!uIo@2p z;O=66k8onV9t8Is$NdyugY^4gK;1dM#{0v$JF;KhJ@=!}X%4K!yGLcloKl`t{a5#E PUTf-!%q{&n?lt}eG7JCD delta 1406 zcma*nU1$_n6bJBo<|8qS+3aLZex5UT z&hAX=p_Y26T@Gqw^L(w29A2;8p=<2dBkMaq7D5w3>_V%q4{e{62vLf_|H_2el8Gzg zal_BQ=*@ZAEUl~?b%9~z{s?-vwtw z()`Tm7)=M=@wYy=?M6Er-QQEM@7)R9Ctt1*@mWHo3f%Qcbsk*VICtcZPmvJc;ZXIM zyp}m!c3*6PyHmwapqm+c-X?05x6O!N7H(M+ZI5n=w#71;z^@G>bP?2f4dCUyvkk84 z3CdeN4MetlxjUCWi|eQ)IPf(bfJ1N?Qg9qDz!Y4E8}Jk~BrX6SSWp2AAp{NlMQ>w% zA9{PC9|q;g-kqj-u~`U{uMCv)<$*$Ow!LzdeTqy~7n>gsHd?B>>Jin`*pSQfC(5~f z-&`7yd-mnwrIkZpeXq?M!wF8$IL%shAA|os6XqR>n!wLkJ`aBYVaW?y)fPUJh%Bzf zYzVqwH+%_0pvsUfg(}B4{M;#Cq>7P*AK*t&1^5egB3~zTsl0~ZO->1SJF_|N7+gO* zmybCst@mbJlFc|HgUA);OmgY)x}37y2vW>3IN@0>-yGI8PI>CDrou$aIdUXiGLf889}4Ud zc>jfJRjg_s;XB7xGAPqWKJorEmZlN;>)1srC*AlDJ}%Ok%pr=&gJ%aduRC?0GD|Pc Hd5!-8bUy~E diff --git a/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorAlbaranesClientePreview.pas b/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorAlbaranesClientePreview.pas index 310583f5..f2994e47 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorAlbaranesClientePreview.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorAlbaranesClientePreview.pas @@ -8,6 +8,13 @@ uses type IEditorAlbaranesClientePreview = interface(IEditorPreview) ['{F58BF987-28EB-485A-B953-55BDEEBE2C91}'] + procedure SetVerPrecios(const Value: Boolean); + function GetVerPrecios: Boolean; + property VerPrecios : Boolean read GetVerPrecios write SetVerPrecios; + + function GetVerRef: Boolean; + procedure SetVerRef(const Value: Boolean); + property VerRef : Boolean read GetVerRef write SetVerRef; end; diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index 42c957f9..316c8d14 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -47,8 +47,10 @@ type function ExtraerSeleccionados(AAlbaran: IBizAlbaranCliente) : IBizAlbaranCliente; function ElegirAlbaranes(AAlbaran: IBizAlbaranCliente; AMensaje: String; AMultiSelect: Boolean): IBizAlbaranCliente; - procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false); - procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false); + procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); + procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); procedure EtiquetasPreview(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean); procedure EtiquetasPrint(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean); @@ -147,8 +149,10 @@ type AFechaRecibido : TDateTime = 0; DoPost: Boolean = True) : Boolean; - procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false); - procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false); + procedure Preview(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); + procedure Print(AAlbaran : IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); procedure EtiquetasPreview(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean); procedure EtiquetasPrint(AAlbaran : IBizAlbaranCliente; Const withRefCliente: Boolean); @@ -1054,7 +1058,8 @@ begin end; end; -procedure TAlbaranesClienteController.Preview(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false); +procedure TAlbaranesClienteController.Preview(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); var AReportController : IAlbaranesClienteReportController; ID_Albaranes: TIntegerList; @@ -1082,7 +1087,7 @@ begin else ID_Albaranes.Add(AAlbaran.ID); - AReportController.Preview(ID_Albaranes); + AReportController.Preview(ID_Albaranes, VerPrecios, VerRef); finally AReportController := NIL; @@ -1090,7 +1095,8 @@ begin end; end; -procedure TAlbaranesClienteController.Print(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false); +procedure TAlbaranesClienteController.Print(AAlbaran: IBizAlbaranCliente; AllItems: Boolean = false; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); var AReportController : IAlbaranesClienteReportController; ID_Albaranes: TIntegerList; @@ -1116,7 +1122,7 @@ begin else ID_Albaranes.Add(AAlbaran.ID); - AReportController.Print(ID_Albaranes); + AReportController.Print(ID_Albaranes, VerPrecios, VerRef); finally AReportController := NIL; diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas index 89c75a4a..3646092f 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas @@ -10,12 +10,16 @@ uses type IAlbaranesClienteReportController = interface(IControllerBase) ['{4BCC7A93-3322-494C-A3FA-118F4B62CB15}'] - procedure Preview(const AListaID : TIntegerList); - procedure Print(const AListaID : TIntegerList); + procedure Preview(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); + procedure Print(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); procedure EtiquetasPreview(const AID : integer; Const withRefCliente: Boolean); procedure EtiquetasPrint(const AID : integer; Const withRefCliente: Boolean); - function ExportToWord(const AID: Integer; const AFileName : String = ''): Boolean; - function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean; + function ExportToWord(const AID: Integer; const AFileName : String = ''; + const VerPrecios: Boolean = True; const VerRef: Boolean = True): Boolean; + function ExportToPDF(const AID: Integer; const AFileName : String = ''; + const VerPrecios: Boolean = True; const VerRef: Boolean = True): Boolean; end; TAlbaranesClienteReportController = class(TControllerBase, IAlbaranesClienteReportController) @@ -27,10 +31,14 @@ type constructor Create; override; destructor Destroy; override; - procedure Preview(const AListaID : TIntegerList); - procedure Print(const AListaID : TIntegerList); - function ExportToWord(const AID: Integer; const AFileName : String = ''): Boolean; - function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean; + procedure Preview(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); + procedure Print(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); + function ExportToWord(const AID: Integer; const AFileName : String = ''; + const VerPrecios: Boolean = True; const VerRef: Boolean = True): Boolean; + function ExportToPDF(const AID: Integer; const AFileName : String = ''; + const VerPrecios: Boolean = True; const VerRef: Boolean = True): Boolean; procedure EtiquetasPreview(const AID : integer; const withRefCliente: Boolean); procedure EtiquetasPrint(const AID : integer; const withRefCliente: Boolean); end; @@ -120,10 +128,12 @@ begin end; end; + function TAlbaranesClienteReportController.ExportToPDF(const AID: Integer; - const AFileName: String): Boolean; + const AFileName: String; const VerPrecios, VerRef: Boolean): Boolean; var AStream: Binary; + begin Result := False; if EsCadenaVacia(AFileName) then @@ -131,7 +141,7 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptPDFAlbaran(AID); + AStream := FDataModule.GetRptPDFAlbaran(AID, VerPrecios, VerRef); try AStream.SaveToFile(AFileName); Result := True; @@ -144,7 +154,7 @@ begin end; function TAlbaranesClienteReportController.ExportToWord(const AID: Integer; - const AFileName: String): Boolean; + const AFileName: String; const VerPrecios, VerRef: Boolean): Boolean; var AStream: Binary; AFile : String; @@ -156,7 +166,7 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptWordAlbaran(AID); + AStream := FDataModule.GetRptWordAlbaran(AID, VerPrecios, VerRef); try AStream.SaveToFile(AFile); Result := True; @@ -168,7 +178,8 @@ begin end; end; -procedure TAlbaranesClienteReportController.Preview(const AListaID : TIntegerList); +procedure TAlbaranesClienteReportController.Preview(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); var AStream: Binary; AEditor : IEditorAlbaranesClientePreview; @@ -177,13 +188,15 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptAlbaranes(AListaID); + AStream := FDataModule.GetRptAlbaranes(AListaID, VerPrecios, VerRef); try CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); if Assigned(AEditor) then begin try AEditor.Controller := Self; + AEditor.VerPrecios := VerPrecios; + AEditor.VerRef := VerRef; AEditor.ListaID := AListaID; AEditor.Title := 'Albarn - ' + AppFactuGES.EmpresaActiva.NOMBRE; AEditor.LoadFromStream(AStream); @@ -201,7 +214,8 @@ begin end; end; -procedure TAlbaranesClienteReportController.Print(const AListaID : TIntegerList); +procedure TAlbaranesClienteReportController.Print(const AListaID : TIntegerList; + const VerPrecios: Boolean = True; const VerRef: Boolean = True); var AStream: Binary; AEditor : IEditorAlbaranesClientePreview; @@ -210,13 +224,15 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptAlbaranes(AListaID); + AStream := FDataModule.GetRptAlbaranes(AListaID, VerPrecios, VerRef); try CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); if Assigned(AEditor) then begin try AEditor.Controller := Self; + AEditor.VerPrecios := VerPrecios; + AEditor.VerRef := VerRef; AEditor.ListaID := AListaID; AEditor.Title := 'Albarn - ' + AppFactuGES.EmpresaActiva.NOMBRE; AEditor.LoadFromStream(AStream); diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm index 7d15a501..b41c23dc 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm @@ -10,12 +10,12 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente Top = 16 end object rda_AlbaranesCliente: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 43 Top = 151 end @@ -289,8 +289,6 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_AlbaranesCliente - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'AlbaranesCliente' IndexDefs = <> Left = 232 @@ -408,8 +406,6 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente MasterSource = ds_AlbaranesCliente MasterFields = 'ID' DetailFields = 'ID_ALBARAN' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'AlbaranesCliente_Detalles' IndexDefs = <> Left = 384 @@ -432,8 +428,6 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_AlbaranesCliente - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosAlbaranes' IndexDefs = <> Left = 232 diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas index 02f9e310..79d19b8a 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas @@ -36,11 +36,13 @@ type function NewItem : IBizAlbaranCliente; // Report - function GetRptAlbaranes(const ListaID: TIntegerList): Binary; - function GetRptWordAlbaran(const AID: Integer): Binary; - function GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary; - function GetRptPDFAlbaran(const AID: Integer): Binary; - + function GetRptAlbaranes(const AListaID: TIntegerList; const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; + function GetRptWordAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; + function GetRptPDFAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; + function GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary; function GetAnosItems : TStringList; end; @@ -65,36 +67,38 @@ begin RORemoteService.Message := dmConexion.Message; end; -function TDataModuleAlbaranesCliente.GetRptAlbaranes(const ListaID: TIntegerList): Binary; +function TDataModuleAlbaranesCliente.GetRptAlbaranes( + const AListaID: TIntegerList; const ImprimirPrecio, + ImprimirRef: Boolean): Binary; var AParam : TIntegerArray; begin - AParam := ListaID.ToIntegerArray; + AParam := AListaID.ToIntegerArray; try - Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam); + Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam, ImprimirPrecio, ImprimirRef); finally FreeAndNil(AParam); end; end; -function TDataModuleAlbaranesCliente.GetRptPDFAlbaran( - const AID: Integer): Binary; +function TDataModuleAlbaranesCliente.GetRptPDFAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; var AParam : TIntegerArray; begin AParam := TIntegerArray.Create; try AParam.Add(AID); - Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam); + Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam, ImprimirPrecio, ImprimirRef); finally FreeAndNil(AParam); end; end; -function TDataModuleAlbaranesCliente.GetRptWordAlbaran( - const AID: Integer): Binary; +function TDataModuleAlbaranesCliente.GetRptWordAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; begin - Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInformeEnWord(AID) + Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInformeEnWord(AID, ImprimirPrecio, ImprimirRef) end; function TDataModuleAlbaranesCliente.NewItem: IBizAlbaranCliente; diff --git a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas index 5e95c8c4..d5cf0e74 100644 --- a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas +++ b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas @@ -8,9 +8,12 @@ uses type IDataModuleAlbaranesClienteReport = interface ['{42C55204-5AB9-403E-8385-1A62B02D8234}'] - function GetRptAlbaranes(const AListaID: TIntegerList): Binary; - function GetRptWordAlbaran(const AID: Integer): Binary; - function GetRptPDFAlbaran(const AID: Integer): Binary; + function GetRptAlbaranes(const AListaID: TIntegerList; const ImprimirPrecio: Boolean; + const ImprimirRef: Boolean): Binary; + function GetRptWordAlbaran(const AID: Integer; const ImprimirPrecio: Boolean; + const ImprimirRef: Boolean): Binary; + function GetRptPDFAlbaran(const AID: Integer; const ImprimirPrecio: Boolean; + const ImprimirRef: Boolean): Binary; function GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary; end; diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm index 227cc64f..1106acfd 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm @@ -556,6 +556,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente 'end.') ShowProgress = False StoreInDFM = False + OnGetValue = frxReportGetValue OnStartReport = 'frxReportOnStartReport' Left = 145 Top = 16 diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas index 4d1a9d9f..1e962b8b 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas @@ -63,14 +63,22 @@ type DABin2DataStreamer1: TDABin2DataStreamer; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); + procedure frxReportGetValue(const VarName: string; var Value: Variant); private FConnection: IDAConnection; + FImprimirPrecio : Boolean; + FImprimirRef : Boolean; + //Genera cada uno de los albaranes a imprimir procedure _GenerarAlbaran(const AID: Integer); public - function GenerarAlbaran(const AListaID : TIntegerArray): Binary; + function GenerarAlbaran(const AListaID : TIntegerArray; + const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; function GenerarEtiquetas(const AID : Integer; withRefCliente: Boolean): Binary; - function GenerarAlbaranEnPDF(const ListaID : TIntegerArray): Binary; + function GenerarAlbaranEnPDF(const ListaID : TIntegerArray; + const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; end; implementation @@ -112,11 +120,25 @@ begin tbl_Detalles.Active := False; end; -function TRptAlbaranesCliente.GenerarAlbaran(const AListaID : TIntegerArray): Binary; +procedure TRptAlbaranesCliente.frxReportGetValue(const VarName: string; + var Value: Variant); +begin + if VarName = 'ImprimirPrecio' then + Value := FImprimirPrecio; + if VarName = 'ImprimirRef' then + Value := FImprimirRef; +end; + +function TRptAlbaranesCliente.GenerarAlbaran(const AListaID : TIntegerArray; + const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; var i: Integer; begin Result := Binary.Create; + FImprimirPrecio := ImprimirPrecio; + FImprimirRef := ImprimirRef; + try //Vamos generando todos y cada uno de los albaranes recibidos for i := 0 to AListaID.Count - 1 do @@ -126,12 +148,16 @@ begin end; end; -function TRptAlbaranesCliente.GenerarAlbaranEnPDF( - const ListaID: TIntegerArray): Binary; +function TRptAlbaranesCliente.GenerarAlbaranEnPDF(const ListaID: TIntegerArray; + const ImprimirPrecio: Boolean = True; + const ImprimirRef: Boolean = True): Binary; var i: Integer; begin Result := Binary.Create; + FImprimirPrecio := ImprimirPrecio; + FImprimirRef := ImprimirRef; + try //Vamos generando todos y cada uno de los presupuestos recibidos for i := 0 to ListaID.Count - 1 do diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas index 236c6c22..9cc08070 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas @@ -30,6 +30,8 @@ type function Generar: Boolean; procedure _GenerarAlbaran(const AID: String); public + ImprimirPrecio : Boolean; + ImprimirRef : Boolean; function Exportar(Codigo, Fichero : String): Boolean; constructor Create (AOwner : TComponent); override; destructor Destroy; override; @@ -51,6 +53,8 @@ const constructor TRptWordAlbaranCliente.Create(AOwner: TComponent); begin inherited; + ImprimirPrecio := False; + ImprimirRef := False; FDocumento := NIL; end; @@ -189,7 +193,11 @@ begin while not EOF do begin Rows.Item (iRowCount).Cells.Split (numRows, numCols, mergesplit); - Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA').AsString; + if ImprimirRef then + Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA').AsString + else + Cell(iRowCount, 1).Range.Text := ''; + Cell(iRowCount, 2).Range.Text := FieldByName('CONCEPTO').AsString; ACantidad := FloatToStr(FieldByName('CANTIDAD').AsFloat); @@ -205,16 +213,18 @@ begin Cell(iRowCount, 3).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; - - if (FieldByName('IMPORTE_UNIDAD').AsFloat = 0) then - Cell(iRowCount, 4).Range.Text := '' + if ImprimirPrecio + and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then + Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat) else - Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat); + Cell(iRowCount, 4).Range.Text := ''; - if (FieldByName('IMPORTE_TOTAL').AsFloat = 0) then - Cell(iRowCount, 5).Range.Text := '' + if ImprimirPrecio + and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat) else - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat); + Cell(iRowCount, 5).Range.Text := ''; + Next; Inc (iRowCount); end; diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas index 56044c18..cf021533 100644 --- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas +++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas @@ -32,10 +32,13 @@ type procedure DARemoteServiceCreate(Sender: TObject); protected { IsrvAlbaranesCliente methods } - function GenerarInforme(const ListaID: TIntegerArray): Binary; + function GenerarInforme(const ListaID: TIntegerArray; + const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; function GenerarInformeEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary; - function GenerarInformeEnWord(const ID: Integer): Binary; - function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; + function GenerarInformeEnWord(const ID: Integer; + const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; + function GenerarInformeEnPDF(const ListaID: TIntegerArray; + const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; end; implementation @@ -78,14 +81,14 @@ begin ConnectionName := dmServer.ConnectionName; end; -function TsrvAlbaranesCliente.GenerarInformeEnPDF( - const ListaID: TIntegerArray): Binary; +function TsrvAlbaranesCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray; +const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; var AReportGenerator : TRptAlbaranesCliente; begin AReportGenerator := TRptAlbaranesCliente.Create(nil); try - Result := AReportGenerator.GenerarAlbaranEnPDF(ListaID); + Result := AReportGenerator.GenerarAlbaranEnPDF(ListaID, ImprimirPrecio, ImprimirRef); finally FreeAndNIL(AReportGenerator); end; @@ -106,19 +109,21 @@ begin } end; -function TsrvAlbaranesCliente.GenerarInforme(const ListaID: TIntegerArray): Binary; +function TsrvAlbaranesCliente.GenerarInforme(const ListaID: TIntegerArray; +const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; var AReportGenerator : TRptAlbaranesCliente; begin AReportGenerator := TRptAlbaranesCliente.Create(nil); try - Result := AReportGenerator.GenerarAlbaran(ListaID); + Result := AReportGenerator.GenerarAlbaran(ListaID, ImprimirPrecio, ImprimirRef); finally FreeAndNIL(AReportGenerator); end; end; -function TsrvAlbaranesCliente.GenerarInformeEnWord(const ID: Integer): Binary; +function TsrvAlbaranesCliente.GenerarInformeEnWord(const ID: Integer; +const ImprimirPrecio: Boolean; const ImprimirRef: Boolean): Binary; var AReportGenerator : TRptWordAlbaranCliente; AFicheroTMP : TFileName; @@ -127,6 +132,8 @@ begin AFicheroTMP := DarFicheroTemporal; AReportGenerator := TRptWordAlbaranCliente.Create(nil); try + AReportGenerator.ImprimirPrecio := ImprimirPrecio; + AReportGenerator.ImprimirRef := ImprimirRef; if AReportGenerator.Exportar(IntToStr(ID), AFicheroTMP) then begin Result := Binary.Create; diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk index 780c6ac5..31dc58f2 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk @@ -32,7 +32,9 @@ requires AlbaranesCliente_controller, Articulos_view, Almacenes_controller, - AlbCli_FacCli_relation; + AlbCli_FacCli_relation, + rtl, + vcl; contains uAlbaranesClienteViewRegister in 'uAlbaranesClienteViewRegister.pas', @@ -50,6 +52,7 @@ contains uViewAlbaranesDevCliente in 'uViewAlbaranesDevCliente.pas' {frViewAlbaranesDevCliente: TCustomView}, uEditorAlbaranDevCliente in 'uEditorAlbaranDevCliente.pas' {fEditorAlbaranDevCliente: TCustomEditor}, uViewAlbaranDevCliente in 'uViewAlbaranDevCliente.pas' {frViewAlbaranDevCliente: TCustomView}, - uViewDatosYSeleccionClienteAlbaran in 'uViewDatosYSeleccionClienteAlbaran.pas' {frViewDatosYSeleccionClienteAlbaran: TCustomView}; + uViewDatosYSeleccionClienteAlbaran in 'uViewDatosYSeleccionClienteAlbaran.pas' {frViewDatosYSeleccionClienteAlbaran: TCustomView}, + uDialogOpcionesImpresionAlbaranesCliente in 'uDialogOpcionesImpresionAlbaranesCliente.pas' {frDialogOpcionesImpresionAlbaranesCliente: TCustomEditor}; end. diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj index 04632836..270180bf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj @@ -54,15 +54,20 @@ MainSource - - - - - - - - + + + + + + + + + + +
frViewDatosYSeleccionClienteAlbaran
+ TCustomView +
fEditorAlbaranCliente
TfEditorAlbaranCliente @@ -123,6 +128,7 @@
frViewElegirArticulosAlbaranesCliente
TFrame +