X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=1ce76932a61ee06994b454edd6ae8dcdc9117460;hb=7561718ee5113232ce917f63085d272884b0929c;hp=1534e277a076920f6305684f63b1af0f9f8bab1e;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc
index 1534e277..1ce76932 100644
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -66,10 +66,25 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
         db_query($sql, "The work order requirements could not be added");
 
 		// insert a -ve stock move for each item
+		$UnitCost = get_standard_cost($bom_item["component"]);
 		add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
-			$bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0);
+			$bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, 0, 1, $UnitCost);
 	}
+	
+	// -------------------------------------------------------------------------
+	//Negative Stock Handling
+	$qoh = get_qoh_on_date($stock_id);
+	$cost_adjust = false;
+	if ($qoh < 0)
+	{
+		if ($qoh + $units_reqd >= 0)
+			$cost_adjust = true;
+	}
+
 
+	//Negative Stock Handling First; Prior to add_stock_move
+	if ($cost_adjust)
+		adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_);
 
 	// -------------------------------------------------------------------------
 
@@ -123,6 +138,7 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 			$memo, -$bom_cost);
 
 	}
+	$item_accounts = get_stock_gl_code($stock_id);
 	if ($advanced)
 	{
 		$wo = get_work_order($woid);
@@ -148,40 +164,20 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 		add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']);
 		$ocost = get_gl_wo_cost($woid, WO_OVERHEAD);
 		add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']);
-	}
-	// credit additional costs
-	$item_accounts = get_stock_gl_code($stock_id);
-	if ($costs != 0.0)
-	{
-		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_acc,
-			0, 0, $wo_cost_types[WO_OVERHEAD], -$costs, PT_WORKORDER, WO_OVERHEAD);
-		$is_bank_to = is_bank_account($cr_acc);
-    	if ($is_bank_to)
-    	{
-    		add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "",
-    			$date_, -$costs, PT_WORKORDER, WO_OVERHEAD, get_company_currency(),
-    			"Cannot insert a destination bank transaction");
-    	}
-			
-		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"],
-			$item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_OVERHEAD], $costs, 
-			PT_WORKORDER, WO_OVERHEAD);
-	}
-	if ($labour != 0.0)
-	{
-		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_lab_acc,
-			0, 0, $wo_cost_types[WO_LABOUR], -$labour, PT_WORKORDER, WO_LABOUR);
-		$is_bank_to = is_bank_account($cr_lab_acc);
-    	if ($is_bank_to)
-    	{
-    		add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "",
-    			$date_, -$labour, PT_WORKORDER, WO_LABOUR, get_company_currency(),
-    			"Cannot insert a destination bank transaction");
-    	}
-			
-		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"],
-			$item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_LABOUR], $labour, 
-			PT_WORKORDER, WO_LABOUR);
+
+	} else { // only for quick
+		// credit additional costs
+
+		if ($costs != 0.0)
+		{
+			add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $item_accounts["assembly_account"],
+				$date_, $item_accounts["dimension_id"], $item_accounts["dimension2_id"]);
+		}
+		if ($labour != 0.0) // only for quick
+		{
+			add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $item_accounts["assembly_account"],
+				$date_, $item_accounts["dimension_id"], $item_accounts["dimension2_id"]);
+		}
 	}
 	// debit total components $total_cost
  	$stockitem = get_item($stock_id);
@@ -189,9 +185,8 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
  	if ($advanced)
  		$memo = $date_.": ".$memo;
     add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
-        0, 0, $memo, -$total_cost);	
+        0, 0, $memo, -$total_cost);
 }
 
 //--------------------------------------------------------------------------------------
 
-?>
\ No newline at end of file