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

(-)a/acqui/addorderiso2709.pl (-9 / +2 lines)
Lines 276-285 if ($op eq ""){ Link Here
276
                        $orderinfo{tax_rate} = $bookseller->tax_rate;
276
                        $orderinfo{tax_rate} = $bookseller->tax_rate;
277
                        my $c = $c_discount ? $c_discount : $bookseller->discount;
277
                        my $c = $c_discount ? $c_discount : $bookseller->discount;
278
                        $orderinfo{discount} = $c;
278
                        $orderinfo{discount} = $c;
279
                        if ( $c_discount ) {
279
                        if ( $c ) {
280
                            $orderinfo{ecost} = $price;
281
                            $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c / 100 );
282
                        } else {
283
                            $orderinfo{ecost} = $price * ( 1 - $c / 100 );
280
                            $orderinfo{ecost} = $price * ( 1 - $c / 100 );
284
                            $orderinfo{rrp}   = $price;
281
                            $orderinfo{rrp}   = $price;
285
                        }
282
                        }
Lines 337-346 if ($op eq ""){ Link Here
337
                $orderinfo{tax_rate} = $bookseller->tax_rate;
334
                $orderinfo{tax_rate} = $bookseller->tax_rate;
338
                my $c = $c_discount ? $c_discount : $bookseller->discount;
335
                my $c = $c_discount ? $c_discount : $bookseller->discount;
339
                $orderinfo{discount} = $c;
336
                $orderinfo{discount} = $c;
340
                if ( $c_discount ) {
337
                if ( $c ) {
341
                    $orderinfo{ecost} = $c_price;
342
                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c / 100 );
343
                } else {
344
                    $orderinfo{ecost} = $c_price * ( 1 - $c / 100 );
338
                    $orderinfo{ecost} = $c_price * ( 1 - $c / 100 );
345
                    $orderinfo{rrp}   = $c_price;
339
                    $orderinfo{rrp}   = $c_price;
346
                }
340
                }
347
- 

Return to bug 14680