View | Details | Raw Unified | Return to bug 7129
Collapse All | Expand All

(-)a/acqui/orderreceive.pl (-2 / +9 lines)
Lines 214-220 $template->param( Link Here
214
    quantityreceived      => $order->{'quantityreceived'},
214
    quantityreceived      => $order->{'quantityreceived'},
215
    rrp                   => sprintf( "%.2f", $rrp ),
215
    rrp                   => sprintf( "%.2f", $rrp ),
216
    ecost                 => sprintf( "%.2f", $ecost ),
216
    ecost                 => sprintf( "%.2f", $ecost ),
217
    unitprice             => sprintf( "%.2f", $unitprice),
218
    memberfirstname       => $member->{firstname} || "",
217
    memberfirstname       => $member->{firstname} || "",
219
    membersurname         => $member->{surname} || "",
218
    membersurname         => $member->{surname} || "",
220
    invoiceid             => $invoice->{invoiceid},
219
    invoiceid             => $invoice->{invoiceid},
Lines 227-232 $template->param( Link Here
227
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
226
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
228
);
227
);
229
228
229
# regardless of the content of $unitprice e.g 0 or '' or any string will return in these cases 0.00
230
# and the 'IF' in the .tt will show 0.00 and not 'ecost' (see BZ 7129)
231
# So if $unitprice == 0 we don't create unitprice
232
if ( $unitprice != 0) {
233
    $template->param(
234
        unitprice             => sprintf( "%.2f", $unitprice),
235
    );
236
}
237
230
my $op = $input->param('op');
238
my $op = $input->param('op');
231
if ($op and $op eq 'edit'){
239
if ($op and $op eq 'edit'){
232
    $template->param(edit   =>   1);
240
    $template->param(edit   =>   1);
233
- 

Return to bug 7129