X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=845253fe0fb7fb2626186937097281030218e220;hb=3bd9d76da0a8c8f014f83fc5203b9954b66737ab;hp=1271f611428277a046f8b70d5c52e1a231d9ec32;hpb=279d7962a249da9cbc3074360e3a68a23a31145e;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 1271f611..845253fe 100644
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -9,117 +9,27 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-//--------------------------------------------------------------------------------------
-
-function add_material_cost($stock_id, $qty, $date_)
-{
-	$m_cost = 0;
-    $result = get_bom($stock_id);
-	while ($bom_item = db_fetch($result))
-	{
-		$standard_cost = get_standard_cost($bom_item['component']);
-		$m_cost += ($bom_item['quantity'] * $standard_cost);
-	}
-	$dec = user_price_dec();
-	price_decimal_format($m_cost, $dec);
-	$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
-		.db_escape($stock_id);
-	$result = db_query($sql);
-	$myrow = db_fetch($result);
-	$material_cost =  $myrow['material_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
-	if ($qoh < 0)
-		$qoh = 0;
-	if ($qoh + $qty != 0)	
-		$material_cost = ($qoh * $material_cost + $qty * $m_cost) /	($qoh + $qty);
-	$material_cost = round2($material_cost, $dec);	
-	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
-		WHERE stock_id=".db_escape($stock_id);
-	db_query($sql,"The cost details for the inventory item could not be updated");
-}
-
-function add_overhead_cost($stock_id, $qty, $date_, $costs)
-{
-	$dec = user_price_dec();
-	price_decimal_format($costs, $dec); 
-	if ($qty != 0)
-		$costs /= $qty;
-	$sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
-		.db_escape($stock_id);
-	$result = db_query($sql);
-	$myrow = db_fetch($result);
-	$overhead_cost =  $myrow['overhead_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
-	if ($qoh < 0)
-		$qoh = 0;
-	if ($qoh + $qty != 0)	
-		$overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /	($qoh + $qty);
-	$overhead_cost = round2($overhead_cost, $dec);	
-	$sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
-		WHERE stock_id=".db_escape($stock_id);
-	db_query($sql,"The cost details for the inventory item could not be updated");
-}
-
-function add_labour_cost($stock_id, $qty, $date_, $costs)
-{
-	$dec = user_price_dec();
-	price_decimal_format($costs, $dec); 
-	if ($qty != 0)
-		$costs /= $qty;
-	$sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
-		.db_escape($stock_id);
-	$result = db_query($sql);
-	$myrow = db_fetch($result);
-	$labour_cost =  $myrow['labour_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
-	if ($qoh < 0)
-		$qoh = 0;
-	if ($qoh + $qty != 0)	
-		$labour_cost = ($qoh * $labour_cost + $qty * $costs) /	($qoh + $qty);
-	$labour_cost = round2($labour_cost, $dec);	
-	$sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
-		WHERE stock_id=".db_escape($stock_id);
-	db_query($sql,"The cost details for the inventory item could not be updated");
-}
-
-function add_issue_cost($stock_id, $qty, $date_, $costs)
-{
-	if ($qty != 0)
-		$costs /= $qty;
-	$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
-		.db_escape($stock_id);
-	$result = db_query($sql);
-	$myrow = db_fetch($result);
-	$material_cost =  $myrow['material_cost'];
-	$dec = user_price_dec();
-	price_decimal_format($material_cost, $dec); 
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
-	if ($qoh < 0)
-		$qoh = 0;
-	if ($qoh + $qty != 0)	
-		$material_cost = ($qty * $costs) /	($qoh + $qty);
-	$material_cost = round2($material_cost, $dec);	
-	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
-		.db_escape($material_cost)
-		." WHERE stock_id=".db_escape($stock_id);
-	db_query($sql,"The cost details for the inventory item could not be updated");
-}
-
+/*
+	Common entry procedure for all work order types
+*/
 function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 	$type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc)
 {
 	global $Refs;
 
-	if (!($type == WO_ADVANCED))
-		return add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc);
-
 	begin_transaction();
+	$args = func_get_args();
+	$args = (object)array_combine(array('wo_ref', 'loc_code', 'units_reqd', 'stock_id',
+		'type', 'date_', 'required_by', 'memo_', 'costs', 'cr_acc', 'labour', 'cr_lab_acc'), $args);
+
+	$args->woid = 0;
+	hook_db_prewrite($args, ST_WORKORDER);
 
-	add_material_cost($stock_id, $units_reqd, $date_);
+	if ($type != WO_ADVANCED)
+		$required_by = $date_;
 
 	$date = date2sql($date_);
 	$required = date2sql($required_by);
-
 	$sql = "INSERT INTO ".TB_PREF."workorders (wo_ref, loc_code, units_reqd, stock_id,
 		type, date_, required_by)
     	VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", "
@@ -134,6 +44,26 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 	$Refs->save(ST_WORKORDER, $woid, $wo_ref);
 	add_audit_trail(ST_WORKORDER, $woid, $date_);
 
+	$args->woid = $woid;
+	hook_db_postwrite($args, ST_WORKORDER);
+
+	if ($type != WO_ADVANCED)
+	{
+	 	$stockitem = get_item($stock_id);
+		release_work_order($woid, $date_, '');
+		if ($costs != 0)
+			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, $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]);
+
+		if ($type == WO_UNASSEMBLY)
+			$units_reqd = -$units_reqd;
+
+		$ref = $Refs->get_next(ST_MANURECEIVE, null, $date_);
+		work_order_produce($woid, $ref, $units_reqd, $date_, '', true);
+	}
+
 	commit_transaction();
 
 	return $woid;
@@ -145,9 +75,10 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 					$date_, $required_by, $memo_)
 {
 	begin_transaction();
-
-	add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_);
-	add_material_cost($stock_id, $units_reqd, $date_);
+	$args = func_get_args();
+	$args = (object)array_combine(array('woid', 'loc_code', 'units_reqd', 'stock_id',
+		'date_', 'required_by', 'memo_'), $args);
+	hook_db_prewrite($args, ST_WORKORDER);
 
 	$date = date2sql($date_);
 	$required = date2sql($required_by);
@@ -163,14 +94,14 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 	update_comments(ST_WORKORDER, $woid, null, $memo_);
 	add_audit_trail(ST_WORKORDER, $woid, $date_, _("Updated."));
 
+	hook_db_postwrite($args, ST_WORKORDER);
 	commit_transaction();
 }
 
-function delete_work_order($woid)
+function delete_work_order($woid, $stock_id, $qty, $date)
 {
 	begin_transaction();
-
-	add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']);
+	hook_db_prevoid(ST_WORKORDER, $woid);
 
 	// delete the work order requirements
 	delete_wo_requirements($woid);
@@ -180,7 +111,7 @@ function delete_work_order($woid)
 	db_query($sql,"The work order could not be deleted");
 
 	delete_comments(ST_WORKORDER, $woid);
-	add_audit_trail(ST_WORKORDER, $woid, $_POST['date_'], _("Canceled."));
+	add_audit_trail(ST_WORKORDER, $woid, $date, _("Canceled."));
 
 	commit_transaction();
 }
@@ -189,18 +120,25 @@ function delete_work_order($woid)
 
 function get_work_order($woid, $allow_null=false)
 {
-    $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description As StockItemName,
-		".TB_PREF."locations.location_name, ".TB_PREF."locations.delivery_address 
-		FROM ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id
-		AND	".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code
-		AND ".TB_PREF."workorders.id=".db_escape($woid)."
-		GROUP BY ".TB_PREF."workorders.id";
-
-	$result = db_query($sql, "The work order issues could not be retrieved");
+    $sql = "SELECT wo.*,st.description As StockItemName,l.location_name,
+    		l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_account
+			FROM ".TB_PREF."workorders wo
+			LEFT JOIN ".TB_PREF."voided v ON v.id=wo.id and v.type=".ST_WORKORDER.","
+			.TB_PREF."stock_master st, "
+			.TB_PREF."locations l
+		WHERE ISNULL(v.id)
+		AND st.stock_id=wo.stock_id
+		AND	l.loc_code=wo.loc_code
+		AND wo.id=".db_escape($woid)."
+		GROUP BY wo.id";
+
+	$result = db_query($sql, "The work order could not be retrieved");
 
 	if (!$allow_null && db_num_rows($result) == 0)
-		display_db_error("Could not find work order $woid", $sql);
+	{
+		display_db_error("Could not find work order ".(int)$woid, $sql);
+		return false;
+	}
 
 	return db_fetch($result);
 }
@@ -252,11 +190,11 @@ function release_work_order($woid, $releaseDate, $memo_)
 		released=1 WHERE id = ".db_escape($woid);
 	db_query($sql, "could not release work order");
 
-	// create Work Order Requirements based on the bom
+	// create wo_requirements records according to current BOM
 	create_wo_requirements($woid, $stock_id);
 
 	add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_);
-	add_audit_trail(ST_WORKORDER, $woid, $releaseDate,_("Released."));
+	add_audit_trail(ST_WORKORDER, $woid, sql2date($myrow['date_']), _("Released."));
 
 	commit_transaction();
 }
@@ -280,108 +218,86 @@ 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, $force_close=0)
 {
-	$sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + ".db_escape($quantity).",
-		closed = ((units_issued >= units_reqd) OR ".db_escape($force_close).")
-		WHERE id = ".db_escape($woid);
+
+	$sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + ".db_escape($quantity)."
+		WHERE id = ".db_escape($woid). " AND !closed";
 
 	db_query($sql, "The work order issued quantity couldn't be updated");
+
+	$sql = "UPDATE ".TB_PREF."workorders SET closed = ((units_issued >= units_reqd) OR ".db_escape($force_close).")
+		WHERE id = ".db_escape($woid);
+
+	db_query($sql, "The work order couldn't be closed");
+
+	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))
+
+	if ($work_order['closed'])
+		reopen_work_order($woid);
+
+	if ($work_order['units_issued'])
 	{
-		$date = sql2date($work_order['date_']);
-		$qty = $work_order['units_reqd'];
-		add_material_cost($work_order['stock_id'], -$qty, $date); // remove avg. cost for qty
-		$cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost
-		if ($cost != 0)
-			add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);
-		$cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost
-		if ($cost != 0)
-			add_overhead_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");
+		$prods = get_work_order_productions($woid);
+		while ($prod = db_fetch($prods))
+			void_work_order_produce($prod['id']);
+	}
 
-		// void all related stock moves
-		void_stock_move(ST_WORKORDER, $woid);
+	// void addtional material issues
+	$issues = get_work_order_issues($woid);
+	while($issue = db_fetch($issues))
+		void_work_order_issue($issue['issue_no']);
 
-		// void any related gl trans
-		void_gl_trans(ST_WORKORDER, $woid, true);
+	// void all related stock moves
+	void_stock_move(ST_WORKORDER, $woid);
 
-		// clear the requirements units received
-		void_wo_requirements($woid);
-	}
-	else
-	{
-		// void everything inside the work order : issues, productions, payments
-		$date = sql2date($work_order['date_']);
-		add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty
-		$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))
-		{
-			$std_cost = get_standard_cost($row['stock_id']);
-			$icost = $std_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);
-
-		$cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost
-		if ($cost != 0)
-			add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);
-		$cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost
-		if ($cost != 0)
-			add_overhead_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 any related costing records
+	void_wo_costing($woid);
 
-		// void all related stock moves
-		void_stock_move(ST_WORKORDER, $woid);
+	// clear the requirements units received
+	void_wo_requirements($woid);
 
-		// void any related gl trans
-		void_gl_trans(ST_WORKORDER, $woid, true);
+	// 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");
 
-		// clear the requirements units received
-		void_wo_requirements($woid);
-	}
 	commit_transaction();
 }
 
-function get_sql_for_work_orders($outstanding_only, $all_items)
+function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $order_no='', $order_ref = '', $overdue = false)
 {
 	$sql = "SELECT
 		workorder.id,
@@ -398,11 +314,13 @@ function get_sql_for_work_orders($outstanding_only, $all_items)
 		workorder.released,
 		workorder.stock_id,
 		unit.decimals
-		FROM ".TB_PREF."workorders as workorder,"
+		FROM ".TB_PREF."workorders as workorder
+			LEFT JOIN ".TB_PREF."voided v ON v.id=workorder.id and v.type=".ST_WORKORDER.","
 			.TB_PREF."stock_master as item,"
 			.TB_PREF."item_units as unit,"
 			.TB_PREF."locations as location
-		WHERE workorder.stock_id=item.stock_id 
+		WHERE ISNULL(v.id)
+			AND workorder.stock_id=item.stock_id 
 			AND workorder.loc_code=location.loc_code
 			AND item.units=unit.abbr";
 
@@ -411,31 +329,37 @@ function get_sql_for_work_orders($outstanding_only, $all_items)
 		$sql .= " AND workorder.closed=0";
 	}
 
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
+	if ($location != ALL_TEXT)
 	{
-		$sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']);
+		$sql .= " AND workorder.loc_code=".db_escape($location);
 	}
 
-	if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
+	if ($order_no != '')
 	{
-		$sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%');
+		$sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%');
 	}
 
-	if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
+	if ($order_ref != '')
 	{
-		$sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']);
+		$sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%');
 	}
 
-	if (check_value('OverdueOnly'))
+	if ($stock_id != ALL_TEXT)
+	{
+		$sql .= " AND workorder.stock_id=".db_escape($stock_id);
+	}
+
+	if ($overdue)
 	{
 		$Today = date2sql(Today());
 
 		$sql .= " AND workorder.required_by < '$Today' ";
 	}
+	$sql .= " ORDER BY workorder.id DESC";
 	return $sql;
 }
 
-function get_sql_for_where_used()
+function get_sql_for_where_used($stock_id)
 {
 	$sql = "SELECT 
 			bom.parent,
@@ -450,8 +374,8 @@ function get_sql_for_where_used()
 			WHERE bom.parent = parent.stock_id 
 				AND bom.workcentre_added = workcentre.id
 				AND bom.loc_code = location.loc_code
-				AND bom.component=".db_escape($_POST['stock_id']);
-	return $sql;			
+				AND bom.component=".db_escape($stock_id);
+	return $sql;
 }
 //--------------------------------------------------------------------------------------
 function get_gl_wo_cost($woid, $cost_type)
@@ -460,7 +384,6 @@ function get_gl_wo_cost($woid, $cost_type)
 	$result = get_gl_wo_cost_trans($woid, $cost_type);
 	while ($row = db_fetch($result))
 		$cost += -$row['amount'];
-	return $cost;	
+	return $cost;
 }
 
-?>
\ No newline at end of file