Cleanup in inventory reports after merge.

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 723859669c45879b87456aa8176af2063ff50020..a3a87daefbdd25d584b11c98c19662c8704fbade 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -33,7 +33,7 @@ function getTransactions($category, $location, $fromcust, $from, $to, $show_serv
 {
        $from = date2sql($from);
        $to = date2sql($to);
-<<<<<<< HEAD
+
        $sql = "SELECT item.category_id,
                        category.description AS cat_description,
                        item.stock_id,

diff --git a/reporting/rep308.php b/reporting/rep308.php
index 97ce87e3efc42a1b799eaa1ea98d34964a0b0024..feb92d78903353caf7b4074fffdea6e4666b32ff 100644 (file)
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -115,9 +115,15 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
 
        $to_date = date2sql($to_date);
 
-       $sql = "SELECT standard_cost, qty FROM ".TB_PREF."stock_moves
-               WHERE stock_id=".db_escape($stock_id)."
-               AND tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND type <> ".ST_LOCTRANSFER;
+       $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id
+               FROM ".TB_PREF."stock_moves move
+                               LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+                               LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+                               LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id
+                               LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type
+                               LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no
+                       WHERE stock_id=".db_escape($stock_id)."
+                       AND move.tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
        if ($location != '')
                $sql .= " AND loc_code = ".db_escape($location);