X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=e07ec8f35ad82ce3d61391547c4a64cd5d2efe68;hb=43ad91751a494b2572eb64441248aa3a87f0141e;hp=33350aeb11c2197ff3ae5c2269e23854db729e56;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;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 33350aeb..e07ec8f3 100644
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -36,7 +36,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 	if (!isset($labour) || ($labour == ""))
 		$labour = 0;
 	add_labour_cost($stock_id, $units_reqd, $date_, $labour);
-		
+
 	$sql = "INSERT INTO ".TB_PREF."workorders (wo_ref, loc_code, units_reqd, units_issued, stock_id,
 		type, additional_costs, date_, released_date, required_by, released, closed)
     	VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", ".db_escape($units_reqd)
@@ -66,10 +66,11 @@ 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, $UnitCost, 0, 1, $UnitCost);
 	}
-	
+
 	// -------------------------------------------------------------------------
 	//Negative Stock Handling
 	$qoh = get_qoh_on_date($stock_id);
@@ -80,6 +81,9 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 			$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_);
 
 	// -------------------------------------------------------------------------
 
@@ -113,66 +117,73 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 
 	// credit all the components
 	$total_cost = 0;
+	$total_material_cost = 0;
 	while ($bom_item = db_fetch($result))
 	{
 
 		$bom_accounts = get_stock_gl_code($bom_item["component"]);
 
 		$bom_cost = $bom_item["ComponentCost"] * $units_reqd;
-		
+
 		$memo = $bom_item["quantity"] ." * ".$bom_item["description"];
 		if ($advanced)
 		{
 			$memo = $date_.": ".$memo; 
 			update_wo_requirement_issued($woid, $bom_item['component'], $bom_item["quantity"] * $units_reqd); 			
 			// insert a -ve stock move for each item
+			$UnitCost = get_standard_cost($bom_item["component"]);			
 			add_stock_move(ST_MANURECEIVE, $bom_item["component"], $advanced,
-				$bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0);
+				$bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, $UnitCost, 0, 1, $UnitCost);
 		}
-		$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0,
+		//Compatibility for Service Items
+		if (!is_service($bom_accounts["mb_flag"]))
+			$ivaccount = $bom_accounts["inventory_account"];
+		else
+			$ivaccount = $bom_accounts["assembly_account"]; // changed 2015.10.14 by Petros .		
+		$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
 			$memo, -$bom_cost);
-
+		$total_material_cost += $bom_cost;
 	}
-	$item_accounts = get_stock_gl_code($stock_id);
 	if ($advanced)
 	{
-		$wo = get_work_order($woid);
+		//Material cost added at time of production as per BOM at the time and in adjustment mode.
+		add_material_cost($stock_id, $units_reqd, $date_, true, $woid);	
+ 		// $wo = get_work_order($woid);
 		// also take the additional issues
 		// moved to work_order_issues_db.inc
-		/*
-		$res = get_additional_issues($woid);
-		$issue_total = 0;
-		while ($item = db_fetch($res))
-		{
-			$standard_cost = get_standard_cost($item['stock_id']);
-			$issue_cost = $standard_cost * $item['qty_issued'] * $units_reqd / $wo['units_reqd'];
-			$issue = get_stock_gl_code($item['stock_id']);
-            $stockitem = get_item($item['stock_id']);
-            $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
-                $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);			
-			$issue_total += $issue_cost;
-		}
-		if ($issue_total != 0)
-			add_issue_cost($stock_id, $units_reqd, $date_, $issue_total);
-		*/	
-		$lcost = get_gl_wo_cost($woid, WO_LABOUR);
-		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']);
-
-	} 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"]);
-		}
+	} 	// 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) // only for quick
+	{
+		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);
 	}
 	// debit total components $total_cost
  	$stockitem = get_item($stock_id);
@@ -181,8 +192,10 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
  		$memo = $date_.": ".$memo;
     add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
         0, 0, $memo, -$total_cost);
+	if (!$advanced)
+	{
+		$UnitWOCost = ($total_material_cost + $costs + $labour)/$units_reqd;
+		update_stock_move(ST_WORKORDER, $woid, $stock_id, $UnitWOCost);	
+	}	
 }
 
-//--------------------------------------------------------------------------------------
-
-?>
\ No newline at end of file