From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 6 Apr 2015 07:26:22 +0000 (+0200)
Subject: Removed stock_move.person_id references from inventory reports.
X-Git-Tag: v2.4.2~19^2~215
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=cecd9b0ba95a2b593939479f3cb30e7adcbf70ec;p=fa-stable.git

Removed stock_move.person_id references from inventory reports.
---

diff --git a/reporting/rep301.php b/reporting/rep301.php
index fe8b58e7..e2e568c8 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -66,7 +66,7 @@ function getAverageCost($stock_id, $to_date)
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT standard_cost, price, tran_date, type, trans_no, qty, person_id FROM ".TB_PREF."stock_moves
+	$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;
 
diff --git a/reporting/rep306.php b/reporting/rep306.php
index 7e5c56c2..728bd7a6 100644
--- a/reporting/rep306.php
+++ b/reporting/rep306.php
@@ -43,13 +43,14 @@ function getTransactions($category, $location, $fromsupp, $item, $from, $to)
 			move.tran_date,
 			move.qty AS qty,
 			move.price
-		FROM ".TB_PREF."stock_master item,
-			".TB_PREF."stock_category category,
-			".TB_PREF."suppliers supplier,
-			".TB_PREF."stock_moves move
+		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,
+			".TB_PREF."stock_master item,
+			".TB_PREF."stock_category category
 		WHERE item.stock_id=move.stock_id
 		AND item.category_id=category.category_id
-		AND move.person_id=supplier.supplier_id
 		AND move.tran_date>='$from'
 		AND move.tran_date<='$to'
 		AND (move.type=".ST_SUPPRECEIVE." OR move.type=".ST_SUPPCREDIT.")
@@ -88,9 +89,8 @@ function get_supp_inv_reference($supplier_id, $stock_id, $date)
     	return $row[0];
     else
     	return '';
-}    
-    
-	
+}
+
 //----------------------------------------------------------------------------------------------------
 
 function print_inventory_purchase()
diff --git a/reporting/rep308.php b/reporting/rep308.php
index 79a80b4a..97ce87e3 100644
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -115,7 +115,7 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT standard_cost, price, tran_date, type, trans_no, qty, person_id  FROM ".TB_PREF."stock_moves
+	$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;
 
@@ -157,7 +157,7 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT standard_cost, price, tran_date, type, trans_no, qty, person_id FROM ".TB_PREF."stock_moves
+	$sql = "SELECT standard_cost, tran_date, 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;