From cefd9c6568020e18771ec1f3609186530cfb8fd8 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 23 Sep 2009 10:17:04 +0000 Subject: [PATCH] Quitar ceros de importes y cantidades en presupuestos y albaranes de cliente. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@972 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.dproj | 102 +++++++++--------- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Informes/1/InfAlbaranCliente.fr3 | 2 +- Source/Informes/2/InfAlbaranCliente.fr3 | 2 +- .../Reports/uRptWordAlbaranCliente.pas | 16 +-- .../Reports/uRptWordPresupuestoCliente.pas | 14 ++- Source/Servidor/FactuGES_Server.RES | Bin 23212 -> 23216 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 8 files changed, 73 insertions(+), 65 deletions(-) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c93edcee..f4910a29 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm 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/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index 5bbe84f1..34427208 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index ee6e09c0..0af47dfc 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas index 23fabbb0..106cf3d9 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas @@ -188,12 +188,16 @@ begin Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA').AsString; Cell(iRowCount, 2).Range.Text := FieldByName('CONCEPTO').AsString; - ACantidad := FloatToStr(FieldByName('CANTIDAD').AsFloat); - AIndice := Pos(',', ACantidad); - if AIndice > 0 then - AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) - else - AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + ACantidad := FloatToStr(FieldByName('CANTIDAD').AsFloat); + if ACantidad = '0' then + AText := '' + else begin + AIndice := Pos(',', ACantidad); + if AIndice > 0 then + AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) + else + AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + end; Cell(iRowCount, 3).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas index eca9e9b1..7ed8a87b 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas @@ -165,11 +165,15 @@ begin Cell(iContador, 1).Range.Text := FieldByName('CONCEPTO').AsString; ACantidad := FloatToStr(FieldByName('CANTIDAD').AsFloat); - AIndice := Pos(',', ACantidad); - if AIndice > 0 then - AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) - else - AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + if ACantidad = '0' then + AText := '' + else begin + AIndice := Pos(',', ACantidad); + if AIndice > 0 then + AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) + else + AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + end; Cell(iContador, 2).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 5c7d02ac4f2e3fbb195bafecaa84f110ecc39c20..182a83e9f42b0e2a1fc597dbd66877b784475199 100644 GIT binary patch delta 77 zcmZ3pm2m?Q-HBk_GWl+VJdpew5zQzvIWkh2@x$cW$ZF;i2Cd1zBjv?28D26JF(fnO fGvqL&G88lDFeoq>F&IzQjxuF7WH6bW8s!cEffpGn delta 73 zcmdn6m2u5h#tnBO7&lD58zB!Q|3*YJ@=cD6RAziNxi+$zIgdeo^6yA_!9<24h7yKU chGGUC1_cHq2BXP_QKqa043-QGlQW~-0R`3