X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=ca2f4a86883b5d213f556cc460a5c738b3b41275;hb=e0544eddcab799b9088e0a774f63443e3f634bb6;hp=2bdffa266b61306c8d0afd7e614ad71a65c0bd1e;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc
index 2bdffa26..ca2f4a86 100644
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -17,6 +17,11 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 	global $Refs;
 
 	begin_transaction();
+	$args = func_get_args();
+	$args = (object)array_combine(array('woid', 'ref', 'to_work_order', 'items', 'location', 
+		'workcentre', 'date_', 'memo_'), $args);
+	$args->trans_no = 0;
+	hook_db_prewrite($args, ST_MANUISSUE);
 
 	$details = get_work_order($woid);
 
@@ -42,21 +47,47 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 	$number = db_insert_id();
 
+	$issue_total = $total_cost = 0;
+
 	foreach ($items as $item)
 	{
 
 		if ($to_work_order)
 			$item->quantity = -$item->quantity;
 
+		//Chaitanya: Stamp the standard_cost
+		$standard_cost = get_standard_cost($item->stock_id);
 		// insert a -ve stock move for each item
 		add_stock_move(ST_MANUISSUE, $item->stock_id, $number,
-			$location, $date_, $memo_, -$item->quantity, 0);
+			$location, $date_, $memo_, -$item->quantity, $standard_cost);
 
 		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued)
 			VALUES (".db_escape($number).", ".db_escape($item->stock_id).", "
 			.db_escape($item->quantity).")";
 		db_query($sql,"A work order issue item could not be added");
-	}
+
+		$standard_cost = get_standard_cost($item->stock_id);
+		$issue_cost = $standard_cost * $item->quantity;
+		$issue = get_stock_gl_code($item->stock_id);
+        $stockitem = get_item($item->stock_id);
+		
+		//Chaitanya : Compatibility for Service Items
+		if (!is_service($issue["mb_flag"]))
+			$ivaccount = $issue["inventory_account"];
+		else
+			$ivaccount = $issue["cogs_account"];		
+		
+        $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
+                $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);			
+		$issue_total += $issue_cost;
+	}	
+	if ($issue_total != 0)
+		//Chaitanya : Apply cost to QOH as adjustment only
+		add_issue_cost($details['stock_id'], $details['units_reqd'], $date_, $issue_total, true);
+	$issue = get_stock_gl_code($details['stock_id']);
+    $stockitem = get_item($details['stock_id']);
+    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"],
+        0, 0, $date_.": "._("Issue to")." ".$stockitem["description"], -$total_cost);	
 
 	if ($memo_)
 		add_comments(ST_MANUISSUE, $number, $date_, $memo_);
@@ -64,6 +95,8 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 	$Refs->save(ST_MANUISSUE, $number, $ref);
 	add_audit_trail(ST_MANUISSUE, $number, $date_);
 
+	$args->trans_no = $number;
+	hook_db_postwrite($args, ST_MANUISSUE);
 	commit_transaction();
 }
 
@@ -132,18 +165,64 @@ function exists_work_order_issue($issue_no)
 function void_work_order_issue($type_no)
 {
 	begin_transaction();
+	hook_db_prevoid(ST_MANUISSUE, $type_no);
+	
+	//Chaitanya : Skip processing already voided entry i.e. explicitly voided
+	$void_entry = get_voided_entry(ST_MANUISSUE, $type_no);
+	if ($void_entry)
+		return;
 
 	// void the actual issue items and their quantities
 	$sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id="
 		.db_escape($type_no);
 	db_query($sql,"A work order issue item could not be voided");
 
-	// void all related stock moves
-	void_stock_move(ST_MANUISSUE, $type_no);
-
 	// void any related gl trans
-	void_gl_trans(ST_MANUISSUE, $type_no, true);
-
+	//Chaitanya : Nothing happens due to next statement as all gl postings are done against WO
+	//void_gl_trans(ST_MANUISSUE, $type_no, true);
+	
+	//Chaitanya : Reverse the gl posting
+	$issue = get_work_order_issue($type_no);
+	$manf_stock_id = $issue["stock_id"];
+	$date_ = sql2date($issue["issue_date"]);
+	$woid = $issue["workorder_id"];
+		
+	$result = get_stock_moves(ST_MANUISSUE, $type_no);
+	$total_cost = 0;
+	$issue_total = 0;
+	while ($myrow = db_fetch($result))
+	{
+		$issue_cost = $myrow["qty"]*$myrow["standard_cost"];
+		$issue = get_stock_gl_code($myrow["stock_id"]);
+        $stockitem = get_item($myrow["stock_id"]);
+		
+		//Chaitanya : Compatibility for Service Items
+		if (!is_service($issue["mb_flag"]))
+			$ivaccount = $issue["inventory_account"];
+		else
+			$ivaccount = $issue["cogs_account"];		
+		
+		if ($issue_cost != 0)
+		{
+			$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
+				$date_.": "._("Reversed the issue of")." ".$stockitem["description"],
+				-$issue_cost);			
+			$issue_total += $issue_cost;
+		}
+	}
+	if ($issue_total != 0)
+		//Chaitanya : Revese cost effect on manfactured stock item as adjustment only
+		add_issue_cost($manf_stock_id, 0, $date_, $issue_total, true);
+	$issue = get_stock_gl_code($manf_stock_id);
+    $stockitem = get_item($manf_stock_id);
+	if ($total_cost != 0)
+		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"],
+			0, 0, $date_.": "._("Reversed the issue to")." ".$stockitem["description"], 
+			-$total_cost);	
+	
+	//Chaitanya : Shifted below void all related stock moves
+	void_stock_move(ST_MANUISSUE, $type_no);
+	
 	commit_transaction();
 }