X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=5dfc8635a923b0a2758f0590e79e9e21d060d81b;hb=467fca01c62dd47bcd97ec957a49b0209732c9d0;hp=455f918e0b43b68e4a5cf597ce5ff55694f15faf;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;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 455f918e..5dfc8635 100644
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -33,8 +33,9 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 		
 	$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, $costs, '$date', '$date', '$date', 1, 1)";
+    	VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", ".db_escape($units_reqd)
+    	.", ".db_escape($units_reqd).", ".db_escape($stock_id).",
+		".db_escape($type).", ".db_escape($costs).", '$date', '$date', '$date', 1, 1)";
 	db_query($sql, "could not add work order");
 
 	$woid = db_insert_id();
@@ -72,7 +73,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 
 	// -------------------------------------------------------------------------
 
-	work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, false, $costs, $cr_acc, $labour, $cr_lab_acc);
+	work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, 0, $costs, $cr_acc, $labour, $cr_lab_acc);
 
 	// -------------------------------------------------------------------------
 
@@ -86,7 +87,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 
 //--------------------------------------------------------------------------------------
 
-function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=false, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="")
+function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=0, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="")
 {
 	global $wo_cost_types;
 	$result = get_bom($stock_id);
@@ -102,12 +103,13 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 
 		if ($advanced)
 		{
+			update_wo_requirement_issued($woid, $bom_item['component'], $bom_item["quantity"] * $units_reqd); 			
 			// insert a -ve stock move for each item
-			add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
+			add_stock_move(ST_MANURECEIVE, $bom_item["component"], $advanced,
 				$bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0);
 		}
 		$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0,
-			null, -$bom_cost);
+			$bom_item["quantity"] ." * ".$bom_item["description"], -$bom_cost);
 
 	}
 	if ($advanced)
@@ -121,21 +123,16 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 			$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']);
-			$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
-				null, -$issue_cost);
+            $stockitem = get_item($item['stock_id']);
+            $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
+                _("Issue of")." ".$stockitem["description"], -$issue_cost);			
 			$issue_total += $issue_cost;
 		}
 		if ($issue_total != 0)
 			add_issue_cost($stock_id, $units_reqd, $date_, $issue_total);
-		$result = get_gl_wo_cost_trans($woid, WO_LABOUR);
-		$lcost = 0;
-		while ($row = db_fetch($result))
-			$lcost += -$row['amount'];
+		$lcost = get_gl_wo_cost($woid, WO_LABOUR);
 		add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']);
-		$result = get_gl_wo_cost_trans($woid, WO_OVERHEAD);
-		$ocost = 0;
-		while ($row = db_fetch($result))
-			$ocost += -$row['amount'];
+		$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
@@ -173,8 +170,9 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced
 			PT_WORKORDER, WO_LABOUR);
 	}
 	// debit total components $total_cost
-	add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
-		0, 0, null, -$total_cost);
+ 	$stockitem = get_item($stock_id);
+    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"],
+        0, 0, _("Produced")." ".$units_reqd. " * ".$stockitem["description"], -$total_cost);	
 }
 
 //--------------------------------------------------------------------------------------