Cost handling in purchasing module fixed.

[fa-stable.git] / reporting / rep305.php

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 4cd9229d2384d90adab65d2c88cea52dd2a1d29c..89b417e1fd834be024d6a191017140df75756db9 100644 (file)
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -53,6 +53,7 @@ function getTransactions($from, $to)
         AND grn_line.qty_recd>0
         AND grn.delivery_date>='$from'
         AND grn.delivery_date<='$to'
+        AND item.mb_flag <>'F'
         ORDER BY item.stock_id, grn.delivery_date";
 
     return db_query($sql,"No transactions were returned");
@@ -170,8 +171,8 @@ function print_grn_valuation()
                        $trans['unit_price'] *= $rate;
                        $rep->TextCol(4, 5, "--");
                        $rep->AmountCol(5, 6, $trans['qty_recd'] - $trans['quantity_inv'], $qdec);
-                       $rep->AmountCol(7, 8, $trans['unit_price'], $dec);
-                       $amt = round2(($trans['qty_recd'] - $trans['quantity_inv']) * $trans['unit_price'], $dec);
+                       $rep->AmountCol(7, 8, $trans['std_cost_unit'], $dec);
+                       $amt = round2(($trans['qty_recd'] - $trans['quantity_inv']) * $trans['std_cost_unit'], $dec);
                        $rep->AmountCol(8, 9, $amt, $dec);
                        $total += $amt;
                        $qtotal += $trans['qty_recd'] - $trans['quantity_inv'];