From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 19 Apr 2015 09:50:10 +0000 (+0200)
Subject: Cleanup in inventory reports after merge.
X-Git-Tag: v2.4.2~19^2~197
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=99de4e4d469fd3238d2173f4949dc8c8f9f6bfb7

Cleanup in inventory reports after merge.
---

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 72385966..a3a87dae 100644
--- 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 97ce87e3..feb92d78 100644
--- 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);