X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fwork_order_issue_ui.inc;h=066f80d63a52050feea101fe96a8f7b81c04411f;hb=9f832e8ab3c679ab67e5d086a99774dac58e004a;hp=d5e8eb806ddae899dd65ca18757f0b634c8ae23c;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc
index d5e8eb80..066f80d6 100644
--- a/manufacturing/includes/work_order_issue_ui.inc
+++ b/manufacturing/includes/work_order_issue_ui.inc
@@ -44,8 +44,6 @@ function display_issue_items($title, &$order)
 	foreach ($order->line_items as $line_no=>$stock_item)
 	{
 
-//		$total += ($stock_item->standard_cost * $stock_item->quantity);
-
 		if ($id != $line_no)
 		{
 			if (in_array($stock_item->stock_id, $low_stock))
@@ -75,8 +73,6 @@ function display_issue_items($title, &$order)
 	if ($id == -1)
 		issue_edit_item_controls($order);
 
-//	label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
-
     end_table();
 	if (@$low_stock)
 		display_note(_("Marked items have insufficient quantities in stock as on day of issue."), 0, 1, "class='stockmankofg'");
@@ -96,7 +92,6 @@ function issue_edit_item_controls(&$order, $line_no=-1)
 		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
 		$_POST['qty'] = qty_format($order->line_items[$id]->quantity, 
 			$order->line_items[$id]->stock_id, $dec);
-		//$_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
 		$std_cost = $order->line_items[$id]->standard_cost;
 		$_POST['units'] = $order->line_items[$id]->units;
 
@@ -121,8 +116,7 @@ function issue_edit_item_controls(&$order, $line_no=-1)
 
    		$dec = $item_info["decimals"];
    		$_POST['qty'] =	number_format2(0, $dec);
-		//$_POST['std_cost'] = price_format($item_info["standard_cost"]);
-		$std_cost = $item_info["standard_cost"];
+		$std_cost = $item_info["material_cost"];
 		$_POST['units'] = $item_info["units"];
 	}
 
@@ -160,7 +154,11 @@ function issue_options_controls()
 
 	echo "<br>";
 	start_table();
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(28));
+ 	date_row(_("Issue Date:"), 'date_');
+ 	locations_list_row(_("From Location:"), 'Location');
+ 	workcenter_list_row(_("To Work Centre:"), 'WorkCentre');
+
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_MANUISSUE, null, array('date'=> get_post('date_'), 'location' => get_post('Location'))));
  
  	if (!isset($_POST['IssueType']))
  		$_POST['IssueType'] = 0;
@@ -168,11 +166,6 @@ function issue_options_controls()
  	yesno_list_row(_("Type:"), 'IssueType', $_POST['IssueType'],
  		_("Return Items to Location"), _("Issue Items to Work order"));
  
- 	locations_list_row(_("From Location:"), 'Location');
- 	workcenter_list_row(_("To Work Centre:"), 'WorkCentre');
- 
- 	date_row(_("Issue Date:"), 'date_');
-
 	textarea_row(_("Memo"), 'memo_', null, 50, 3);
 
 	end_table(1);