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

(-)a/acqui/addorderiso2709.pl (-31 / +10 lines)
Lines 267-288 if ($op eq ""){ Link Here
267
                        $orderinfo{tax_rate} = $bookseller->tax_rate;
267
                        $orderinfo{tax_rate} = $bookseller->tax_rate;
268
                        my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
268
                        my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
269
                        $orderinfo{discount} = $c;
269
                        $orderinfo{discount} = $c;
270
                        if ( $bookseller->listincgst ) {
270
                        if ( $c_discount ) {
271
                            if ( $c_discount ) {
271
                            $orderinfo{ecost} = $price;
272
                                $orderinfo{ecost} = $price;
272
                            $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
273
                                $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
274
                            } else {
275
                                $orderinfo{ecost} = $price * ( 1 - $c );
276
                                $orderinfo{rrp}   = $price;
277
                            }
278
                        } else {
273
                        } else {
279
                            if ( $c_discount ) {
274
                            $orderinfo{ecost} = $price * ( 1 - $c );
280
                                $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} );
275
                            $orderinfo{rrp}   = $price;
281
                                $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
282
                            } else {
283
                                $orderinfo{rrp}   = $price / ( 1 + $orderinfo{tax_rate} );
284
                                $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
285
                            }
286
                        }
276
                        }
287
                        $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
277
                        $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
288
                        $orderinfo{unitprice} = $orderinfo{ecost};
278
                        $orderinfo{unitprice} = $orderinfo{ecost};
Lines 337-358 if ($op eq ""){ Link Here
337
                $orderinfo{tax_rate} = $bookseller->tax_rate;
327
                $orderinfo{tax_rate} = $bookseller->tax_rate;
338
                my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
328
                my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
339
                $orderinfo{discount} = $c;
329
                $orderinfo{discount} = $c;
340
                if ( $bookseller->listincgst ) {
330
                if ( $c_discount ) {
341
                    if ( $c_discount ) {
331
                    $orderinfo{ecost} = $price;
342
                        $orderinfo{ecost} = $price;
332
                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
343
                        $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
344
                    } else {
345
                        $orderinfo{ecost} = $price * ( 1 - $c );
346
                        $orderinfo{rrp}   = $price;
347
                    }
348
                } else {
333
                } else {
349
                    if ( $c_discount ) {
334
                    $orderinfo{ecost} = $price * ( 1 - $c );
350
                        $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} );
335
                    $orderinfo{rrp}   = $price;
351
                        $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
352
                    } else {
353
                        $orderinfo{rrp}   = $price / ( 1 + $orderinfo{tax_rate} );
354
                        $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
355
                    }
356
                }
336
                }
357
                $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
337
                $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
358
                $orderinfo{unitprice} = $orderinfo{ecost};
338
                $orderinfo{unitprice} = $orderinfo{ecost};
359
- 

Return to bug 19296