Fixed Inventory Purchasing Report with physical rate from line.
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 20 Jun 2019 07:11:13 +0000 (09:11 +0200)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 20 Jun 2019 07:11:13 +0000 (09:11 +0200)
reporting/rep306.php

index 728bd7a64e5c1aefb371f403f78c5cf7e6f16811..5aa110418b524a7fa52910f58c8e8a68cfea47c8 100644 (file)
@@ -38,6 +38,7 @@ function getTransactions($category, $location, $fromsupp, $item, $from, $to)
                        item.stock_id,
                        item.description, item.inactive,
                        move.loc_code,
+                       supplier.supplier_id , IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate,
                        supplier.supplier_id,
                        supplier.supp_name AS supplier_name,
                        move.tran_date,
@@ -224,7 +225,8 @@ function print_inventory_purchase()
                }
                
                $curr = get_supplier_currency($trans['supplier_id']);
-               $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
+               //$rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
+               $rate = $trans['ex_rate'];
                $trans['price'] *= $rate;
                $rep->NewLine();
                $trans['supp_reference'] = get_supp_inv_reference($trans['supplier_id'], $trans['stock_id'], $trans['tran_date']);