X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=e1b0329edf34e1629ff8692b1a524c1c9ed8a12b;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=11c9204fdf37f5c9ca45cd0bba2eeff82b6d66f6;hpb=fc449c48a8d4ba23bfb18318dff08746340a440c;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 11c9204f..e1b0329e 100644
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -52,11 +52,10 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 	 	$stockitem = get_item($stock_id);
 		release_work_order($woid, $date_, '');
 		if ($costs != 0)
-			add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $stockitem["assembly_account"],
-				$date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]);
+			add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]);
+
 		if ($labour != 0)
-			add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $stockitem["assembly_account"],
-				$date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]);
+			add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]);
 
 		if ($type == WO_UNASSEMBLY)
 			$units_reqd = -$units_reqd;
@@ -122,7 +121,7 @@ function delete_work_order($woid, $stock_id, $qty, $date)
 function get_work_order($woid, $allow_null=false)
 {
     $sql = "SELECT wo.*,st.description As StockItemName,l.location_name,
-    		l.delivery_address,l.email, l.contact, st.inventory_account, st.assembly_account
+    		l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_account
 		FROM ".TB_PREF."workorders wo, "
 			.TB_PREF."stock_master st, "
 			.TB_PREF."locations l
@@ -221,7 +220,7 @@ function work_order_is_closed($woid)
 	Update finished items quantity in work order, and close order either if all the order is produced,
 	or on user demand. Returns calculated unit cost on close, or null otherwise.
 */
-function work_order_update_finished_quantity($woid, $quantity, $date, $force_close=0)
+function work_order_update_finished_quantity($woid, $quantity, $force_close=0)
 {
 
 	$sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + ".db_escape($quantity)."
@@ -237,88 +236,61 @@ function work_order_update_finished_quantity($woid, $quantity, $date, $force_clo
 	return db_num_affected_rows();	// returns 1 if WO has been closed
 }
 
-//--------------------------------------------------------------------------------------
+function reopen_work_order($woid)
+{
+		// FIXME: update_material_cost
+//		update_material_cost($work_order['stock_id'], -$work_order['units_issued'], ... );
+
+		void_gl_trans(ST_WORKORDER, $woid);
+
+		void_stock_move(ST_WORKORDER, $woid);
 
+		$sql = "UPDATE ".TB_PREF."workorders SET closed=0 WHERE id = "
+			.db_escape($woid);
+
+		db_query($sql, "The work order couldn't be reopened");
+}
+
+//--------------------------------------------------------------------------------------
+/*
+	Void all work order related operations
+*/
 function void_work_order($woid)
 {
 	begin_transaction();
 	hook_db_prevoid(ST_WORKORDER, $woid);
 
 	$work_order = get_work_order($woid);
-	if (!($work_order["type"] == WO_ADVANCED))
-	{
-		// restore average product costs 
-		$date = sql2date($work_order['date_']);
-		$qty = $work_order['units_reqd'];
-
-		// FIXME: update_material_cost
-
-		// close workorder
-		$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
-			.db_escape($woid);
-		db_query($sql, "The work order couldn't be voided");
-
-		// void all related stock moves
-		void_stock_move(ST_WORKORDER, $woid);
 
-		// void any related costing records
-		void_wo_costing($woid);
+	if ($work_order['closed'])
+		reopen_work_order($woid);
 
-		// clear the requirements units received
-		void_wo_requirements($woid);
-	}
-	else
+	if ($work_order['units_issued'])
 	{
-		// void everything inside the work order : issues, productions, payments
-		$date = sql2date($work_order['date_']);
+		$prods = get_work_order_productions($woid);
+		while ($prod = db_fetch($prods))
+			void_work_order_produce($prod['id']);
+	}
 
-		// FIXME: update_material_cost
+	// void addtional material issues
+	$issues = get_work_order_issues($woid);
+	while($issue = db_fetch($issues))
+		void_work_order_issue($issue['issue_no']);
 
-		$result = get_work_order_productions($woid); // check the produced quantity
-		$qty = 0;
-		while ($row = db_fetch($result))
-		{
-			$qty += $row['quantity'];
-			// clear the production record
-			$sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$row['id'];
-			db_query($sql, "Cannot void a wo production");
-
-			void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; 
-		}
-		$result = get_additional_issues($woid); // check the issued quantities
-		$cost = 0;
-		$issue_no = 0;
-		while ($row = db_fetch($result))
-		{
-			$unit_cost = get_unit_cost($row['stock_id']);
-			$icost = $unit_cost * $row['qty_issued'];
-			$cost += $icost;
-			if ($issue_no == 0)
-				$issue_no = $row['issue_no'];
-			// void the actual issue items and their quantities
-			$sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0 WHERE issue_id="
-				.db_escape($row['id']);
-			db_query($sql,"A work order issue item could not be voided");
-		}	
-		if ($issue_no != 0)
-			void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves 
-
-		if ($cost != 0)
-			add_issue_cost($work_order['stock_id'], -$qty, $date, $cost);
-
-		$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
-			.db_escape($woid);
-		db_query($sql, "The work order couldn't be voided");
+	// void all related stock moves
+	void_stock_move(ST_WORKORDER, $woid);
 
-		// void all related stock moves
-		void_stock_move(ST_WORKORDER, $woid);
+	// void any related costing records
+	void_wo_costing($woid);
 
-		// void any related bank/gl trans
-		void_wo_costing($woid);
+	// clear the requirements units received
+	void_wo_requirements($woid);
 
-		// clear the requirements units received
-		void_wo_requirements($woid);
-	}
+	// close workorder
+	// FIXME: due to bug in 2.4 db scheme (conflicting wo_ref unique key) we have to fix wo_ref here:
+	$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0, wo_ref=CONCAT(wo_ref, ' ', '".uniqid()."') WHERE id = "
+		.db_escape($woid);
+	db_query($sql, "The work order couldn't be voided");
 
 	commit_transaction();
 }