X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Finventory_db.inc;h=7b672fae8a3609d517ab1d659e9988b4e3e0bb6d;hb=a3616fe8abf36ba9a2ba9ba63689475b1c8978b8;hp=5e4cee82fd1aa114bcfe7da2a4c3ea5018c5c26b;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/inventory/includes/inventory_db.inc b/inventory/includes/inventory_db.inc
index 5e4cee82..7b672fae 100644
--- a/inventory/includes/inventory_db.inc
+++ b/inventory/includes/inventory_db.inc
@@ -34,37 +34,40 @@ function get_stock_movements($stock_id, $StockLocation,	$BeforeDate, $AfterDate)
 {
 	$before_date = date2sql($BeforeDate);
 	$after_date = date2sql($AfterDate);
-  $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.name, supplier.supp_name) name";
+	// PO Delivery and Customer Credit Notes references should be saved in stock moves reference in 2.5
+  	$sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.name, supplier.supp_name) name,
+		IF(move.type=".ST_SUPPRECEIVE.", grn.reference, IF(move.type=".ST_CUSTCREDIT.", cust_trans.reference, move.reference)) reference";
 
 	if(!$StockLocation) {
 		 $sql .= ", move.loc_code";
 	}
-  $sql.=    " FROM ".TB_PREF."stock_moves move
+  	$sql.=    " 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."grn_batch grn ON grn.id=move.trans_no AND move.type=".ST_SUPPRECEIVE."
 				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";
 
-  if ($StockLocation) {
-    $sql.= " move.loc_code=".db_escape($StockLocation)." AND";
+  	if ($StockLocation) {
+    	$sql.= " move.loc_code=".db_escape($StockLocation)." AND";
 	}
 
 	$sql.= " move.tran_date >= '". $after_date . "'
-	AND move.tran_date <= '" . $before_date . "'
-	AND move.stock_id = ".db_escape($stock_id) . " ORDER BY move.tran_date, move.trans_id";
+		AND move.tran_date <= '" . $before_date . "'
+		AND move.stock_id = ".db_escape($stock_id) . " ORDER BY move.tran_date, move.trans_id";
 
-  return db_query($sql, "could not query stock moves");
+  	return db_query($sql, "could not query stock moves");
 }
 
 function calculate_reorder_level($location, $line, &$st_ids, &$st_names, &$st_num, &$st_reorder)
 {
-	$sql = "SELECT ".TB_PREF."loc_stock.*, ".TB_PREF."locations.location_name, ".TB_PREF."locations.email
-		FROM ".TB_PREF."loc_stock, ".TB_PREF."locations
-		WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code
-		AND ".TB_PREF."loc_stock.stock_id = '" . $line->stock_id . "'
-		AND ".TB_PREF."loc_stock.loc_code = '" . $location . "'";
+	$sql = "SELECT stock.*, loc.location_name, loc.email
+		FROM ".TB_PREF."loc_stock stock,"
+			.TB_PREF."locations loc
+		WHERE stock.loc_code=loc.loc_code
+		AND stock.stock_id = '" . $line->stock_id . "'
+		AND stock.loc_code = '" . $location . "'";
 	$res = db_query($sql,"a location could not be retreived");
 	$loc = db_fetch($res);
 	if ($loc['email'] != "")
@@ -87,11 +90,10 @@ function calculate_reorder_level($location, $line, &$st_ids, &$st_names, &$st_nu
 function send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder)
 {
 	global $path_to_root;
-	
+
 	require_once($path_to_root . "/reporting/includes/class.mail.inc");
 	$company = get_company_prefs();
 	$mail = new email($company['coy_name'], $company['email']);
-	$from = $company['coy_name'] . " <" . $company['email'] . ">";
 	$to = $loc['location_name'] . " <" . $loc['email'] . ">";
 	$subject = _("Stocks below Re-Order Level at " . $loc['location_name']);
 	$msg = "\n";