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

(-)a/acqui/orderreceive.pl (-2 / +10 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),
217
#    unitprice             => sprintf( "%.2f", $unitprice),
218
# 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
219
# and the 'IF' in the .tt will show 0.00 and not 'ecost'
218
    memberfirstname       => $member->{firstname} || "",
220
    memberfirstname       => $member->{firstname} || "",
219
    membersurname         => $member->{surname} || "",
221
    membersurname         => $member->{surname} || "",
220
    invoiceid             => $invoice->{invoiceid},
222
    invoiceid             => $invoice->{invoiceid},
Lines 227-232 $template->param( Link Here
227
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
229
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
228
);
230
);
229
231
232
# see the comments up. If $unitprice == 0 we don't create unitprice
233
if ( $unitprice != 0) {
234
    $template->param(
235
        unitprice             => sprintf( "%.2f", $unitprice),
236
    );
237
}
238
230
my $op = $input->param('op');
239
my $op = $input->param('op');
231
if ($op and $op eq 'edit'){
240
if ($op and $op eq 'edit'){
232
    $template->param(edit   =>   1);
241
    $template->param(edit   =>   1);
233
- 

Return to bug 7129