From ec96d4a689f443e4398d17b98d3753a7250bccfd Mon Sep 17 00:00:00 2001 From: Christophe Croullebois Date: Mon, 18 Mar 2013 18:46:03 +0100 Subject: [PATCH] Bug 9923 - correction of a bug due to bz 7129 See comments in the patch Signed-off-by: Mathieu Saby Signed-off-by: Paul Poulain --- acqui/orderreceive.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index 17c2d5e..2dcf9b4 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -214,7 +214,6 @@ if ( $count == 1 ) { quantityreceived => $order->{'quantityreceived'}, rrp => sprintf( "%.2f", $rrp ), ecost => sprintf( "%.2f", $ecost ), - unitprice => sprintf( "%.2f", $unitprice), memberfirstname => $member->{firstname} || "", membersurname => $member->{surname} || "", invoiceid => $invoice->{invoiceid}, @@ -226,6 +225,15 @@ if ( $count == 1 ) { surnamesuggestedby => $suggestion->{surnamesuggestedby}, firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, ); + + # 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' (see BZ 7129) + # So if $unitprice == 0 we don't create unitprice + if ( $unitprice != 0) { + $template->param( + unitprice => sprintf( "%.2f", $unitprice), + ); + } } else { my @loop; -- 1.7.10.4