X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Finventory_db.inc;h=225499d4bfc3d0371590abffc4ad136b35278ce5;hb=a721b65478fd2a264b470e1265e69cf829031e7a;hp=c65cacb2c665a93a2072ecf23e98b921f71449c4;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index c65cacb2..225499d4 100644
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -9,46 +9,77 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0)
+function get_qoh_on_date($stock_id, $location=null, $date_=null)
 {
     if ($date_ == null)
-    {
-        $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
-            WHERE stock_id=".db_escape($stock_id);
         $date_ = Today();
-        $date = date2sql($date_);
-    }
-    else
-    {
-        $date = date2sql($date_);
-        $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
+
+    $date = date2sql($date_);
+
+    $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
             WHERE stock_id=".db_escape($stock_id)."
             AND tran_date <= '$date'"; 
-    }
-        
+
     if ($location != null)
         $sql .= " AND loc_code = ".db_escape($location);
 
-    $result = db_query($sql, "QOH calulcation failed");
+    $result = db_query($sql, "QOH calculation failed");
 
     $myrow = db_fetch_row($result);
-    if ($exclude > 0)
-    {
-        $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
-            WHERE stock_id=".db_escape($stock_id)
-            ." AND type=".db_escape($exclude)
-            ." AND tran_date = '$date'";
-
-        $result = db_query($sql, "QOH calulcation failed");
-        $myrow2 = db_fetch_row($result);
-        if ($myrow2 !== false)
-            $myrow[0] -= $myrow2[0];
-    }
 
     $qoh =  $myrow[0];
 		return $qoh ? $qoh : 0;
 }
 
+/**
+*	Check whether change in stock on date would not cause negative qoh in stock history.
+*	Returns null on success or max. available quantity with respective date otherwise.
+*   Running balance is checked on daily basis only, as we do not control time of transaction.
+*
+*	$delta_qty - tested change in stock qty at $date.
+*	$date - check date; when set to null checks all the stock history.
+**/
+
+function check_negative_stock($stock_id, $delta_qty, $location=null, $date=null)
+{
+
+	if ($delta_qty >= 0)
+		 return null;	// qty increese is always safe
+
+	if (!isset($date))
+		$date = Today();
+
+	$date = date2sql($date);
+
+	// check stock status on date
+    $sql = "SELECT SUM(qty) qty, '$date' tran_date FROM ".TB_PREF."stock_moves
+            WHERE stock_id=".db_escape($stock_id)."
+            AND tran_date <= '$date'"; 
+
+    if ($location)
+        $sql .= " AND loc_code = ".db_escape($location);
+
+    $result = db_query($sql, "QOH calculation failed");
+    $qos = db_fetch_assoc($result);
+
+	// check also all stock changes after the date to avoid negative stock in future
+	$sql = TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id) . " AND tran_date > '$date'";
+
+	if ($location)
+		$sql .= " AND loc_code=".db_escape($location);
+
+	$rt = running_total_sql($sql, 'qty', 'tran_date');
+
+	$sql = "SELECT  {$qos['qty']}+total qty, tran_date FROM ($rt) stock_status ORDER by total, tran_date";
+	$history = db_query($sql, 'cannot check stock history');
+	$min_qos = db_fetch($history);
+
+	if ($min_qos && ($min_qos['qty'] < $qos['qty']))
+		$qos = $min_qos;
+
+	return  -$delta_qty > $qos['qty'] ? $qos : null;
+}
+
 //--------------------------------------------------------------------------------------
 
 function get_item_edit_info($stock_id)
@@ -286,9 +317,9 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 
 		$id = get_next_trans_no(ST_JOURNAL);
 		$ref = $Refs->get_next(ST_JOURNAL);
-		$diff = get_standard_cost($stock_id) - $standard_cost;
-		
-		if ($diff !=0)
+		$diff = round($qoh*get_standard_cost($stock_id) + $quantity*$standard_cost, user_price_dec());
+
+		if ($diff != 0)
 		{
 			$stock_gl_code = get_stock_gl_code($stock_id);
 			$memo = _("Zero/negative inventory handling");
@@ -296,13 +327,13 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 			add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
 				$stock_gl_code["inventory_account"],
 				$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, 
-				-$qoh * $diff);
+				-$diff);
 			//GL Posting to inventory adjustment account
 			add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
 				$stock_gl_code["adjustment_account"],
 				$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
-				$qoh * $diff);
-				
+				$diff);
+
 			add_audit_trail(ST_JOURNAL, $id, $date_);
 			add_comments(ST_JOURNAL, $id, $date_, $memo);
 			$Refs->save(ST_JOURNAL, $id, $ref);	
@@ -350,16 +381,6 @@ function update_stock_move($type, $trans_no, $stock_id, $cost)
 	db_query($sql, "The stock movement standard_cost cannot be updated");
 }
 
-function update_stock_move_pid($type, $type_no, $stock_id, $pid, $cost)
-{
-	$sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost)
-		." WHERE type=".db_escape($type)
-		."	AND trans_no=".db_escape($type_no)
-		."	AND stock_id=".db_escape($stock_id)
-		."  AND person_id = ".db_escape($pid);
-	db_query($sql, "The stock movement standard_cost cannot be updated");
-}
-
 //--------------------------------------------------------------------------------------------------
 
 function get_stock_moves($type, $type_no, $visible=false)