gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_9923' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-29 21:28:10 -04:00
parent d8f2e43ef5 392ae1245f
commit 9e9cf86997
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
acqui/orderreceive.pl
View File

@ -215,7 +215,6 @@ $template->param(
quantityreceived => $order->{'quantityreceived'},
rrp => sprintf( "%.2f", $rrp ),
ecost => sprintf( "%.2f", $ecost ),
unitprice => sprintf( "%.2f", $unitprice),
memberfirstname => $member->{firstname} || "",
membersurname => $member->{surname} || "",
invoiceid => $invoice->{invoiceid},
@ -228,6 +227,15 @@ $template->param(
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),
);
}
my $op = $input->param('op');
if ($op and $op eq 'edit'){
$template->param(edit => 1);