From f89433806df1c8f2543c1c6dcf0f9d890982dab0 Mon Sep 17 00:00:00 2001 From: Christophe Croullebois Date: Thu, 14 Feb 2013 16:39:14 +0100 Subject: [PATCH 1/1] (MT #11060) correction of a bug due to bz 7129 See comments in the patch --- acqui/orderreceive.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index f25b5a9..55378b0 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -214,7 +214,9 @@ $template->param( quantityreceived => $order->{'quantityreceived'}, rrp => sprintf( "%.2f", $rrp ), ecost => sprintf( "%.2f", $ecost ), - unitprice => sprintf( "%.2f", $unitprice), +# unitprice => sprintf( "%.2f", $unitprice), +# this line due to bz 7129 regardless of the content of $unitprice e.g 0 or '' or any string will return in these cases 0.00 +# and the 'IF' in the .tt will show 0.00 and not 'ecost' memberfirstname => $member->{firstname} || "", membersurname => $member->{surname} || "", invoiceid => $invoice->{invoiceid}, @@ -227,6 +229,13 @@ $template->param( firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, ); +# see the comments up. If $unitprice == 0 we don't create unitprice +if ( $unitprice != 0) { + $template->param( + unitprice => sprintf( "%.2f", $unitprice), + ); +} + my $op = $input->param('op'); if ($op and $op eq 'edit'){ $template->param(edit => 1); -- 1.7.9.5