X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=a2b3c1240a1b8fb759b7619f2d2eeb54278f4a68;hb=ab2c3a8ffecec2997c29b5a907d5b632c1b64af2;hp=b3eca142acd233fe7598ea6b295ce988a8d11ad4;hpb=da8311619dd73feae101d246a1957b972e00cbd2;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 b3eca142..a2b3c124 100644
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -1,107 +1,133 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //--------------------------------------------------------------------------------------
 
-function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $additional_costs, $memo_) 
+function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $additional_costs, $memo_)
 {
 	begin_transaction();
-	
+
 	// if unassembling, reverse the stock movements
 	if ($type == wo_types::unassemble())
 		$units_reqd = -$units_reqd;
-	
+
+	add_material_cost($stock_id, $units_reqd, $date_);
+
 	$date = date2sql($date_);
 	if (!isset($additional_costs) || ($additional_costs == ""))
 		$additional_costs = 0;
-	
-	$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 ('$wo_ref', '$loc_code', $units_reqd, $units_reqd, '$stock_id', 
+
+	$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).", $units_reqd, $units_reqd, '$stock_id',
 		$type, $additional_costs, '$date', '$date', '$date', 1, 1)";
 	db_query($sql, "could not add work order");
-	
+
 	$woid = db_insert_id();
-	
+
 	//--------------------------------------------------------------------------
 
 	// create Work Order Requirements based on the bom
-	$result = get_bom($stock_id);	
-	
-	while ($bom_item = db_fetch($result)) 
+	$result = get_bom($stock_id);
+
+	while ($bom_item = db_fetch($result))
 	{
-		
+
 		$unit_quantity = $bom_item["quantity"];
 		$item_quantity = $bom_item["quantity"] * $units_reqd;
-		
-		
+
+
 		$sql = "INSERT INTO ".TB_PREF."wo_requirements (workorder_id, stock_id, workcentre, units_req, units_issued, loc_code)
-			VALUES ($woid, " . "'" . $bom_item["component"] . "'" . ", 
-			". $bom_item["workcentre_added"] . ", 
+			VALUES ($woid, " . "'" . $bom_item["component"] . "'" . ",
+			'". $bom_item["workcentre_added"] . "',
 			$unit_quantity,	$item_quantity, '" . $bom_item["loc_code"] . "')";
-			
+
         db_query($sql, "The work order requirements could not be added");
-        
+
 		// insert a -ve stock move for each item
-		add_stock_move(systypes::work_order(), $bom_item["component"], $woid, 
-			$bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0);        
+		add_stock_move(systypes::work_order(), $bom_item["component"], $woid,
+			$bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0);
 	}
 
 
 	// -------------------------------------------------------------------------
 
 	// insert a +ve stock move for the item being manufactured
-	add_stock_move(systypes::work_order(), $stock_id, $woid,	$loc_code, $date_, 
-		$wo_ref, $units_reqd, 0);		
+	add_stock_move(systypes::work_order(), $stock_id, $woid,	$loc_code, $date_,
+		$wo_ref, $units_reqd, 0);
 
 	// -------------------------------------------------------------------------
 
 	work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs);
-	
+
 	// -------------------------------------------------------------------------
 
-	add_comments(systypes::work_order(), $woid, $date_, $memo_);	
-	
-	add_forms_for_sys_type(systypes::work_order(), $woid, $type);	
-	
+	add_comments(systypes::work_order(), $woid, $date_, $memo_);
+
 	references::save_last($wo_ref, systypes::work_order());
-	
-	commit_transaction();	
+
+	commit_transaction();
 	return $woid;
 }
 
 //--------------------------------------------------------------------------------------
 
-function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs)
+function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs, $advanced=false)
 {
 	$result = get_bom($stock_id);
-	
+
 	// credit all the components
 	$total_cost = 0;
-	while ($bom_item = db_fetch($result)) 
+	while ($bom_item = db_fetch($result))
 	{
-		
+
 		$bom_accounts = get_stock_gl_code($bom_item["component"]);
-		
-		$bom_cost = $bom_item["standard_cost"] * $bom_item["quantity"] * $units_reqd;		
-		
+
+		$bom_cost = $bom_item["standard_cost"] * $bom_item["quantity"] * $units_reqd;
+
+		if ($advanced)
+		{
+			// insert a -ve stock move for each item
+			add_stock_move(systypes::work_order(), $bom_item["component"], $woid,
+				$bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0);
+		}
 		add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $bom_accounts["inventory_account"], 0, 0,
 			null, -$bom_cost);
-		alert("bokade bom- cost ".-$bom_cost);
-		
+
 		$total_cost += $bom_cost;
-	}	
+	}
+	if ($advanced)
+	{
+		// also take the additional issues
+		$res = get_additional_issues($woid);
+		while ($item = db_fetch($res))
+		{
+			$standard_cost = get_standard_cost($item['stock_id']);
+			$issue_cost = $standard_cost * $item['qty_issued'];
+			$issue = get_stock_gl_code($item['stock_id']);
+			add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $issue["inventory_account"], 0, 0,
+				null, -$issue_cost);
+			$total_cost += $issue_cost;
+		}
+	}
 	// credit additional costs
 	$item_accounts = get_stock_gl_code($stock_id);
-	add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"], 
+	add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"],
 		$item_accounts["dimension_id"], $item_accounts["dimension2_id"], null, -$additional_costs);
-	alert("bokade additional cost ".-$additional_costs.", acc = ".$item_accounts["assembly_account"]);
-	
+
 	// debit total components + additional
-	$total_cost += $additional_costs;	
-	add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["inventory_account"], 
+	$total_cost += $additional_costs;
+	add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["inventory_account"],
 		0, 0, null, $total_cost);
-	alert("bokade total- cost ".$total_cost);
-} 
+}
 
 //--------------------------------------------------------------------------------------