From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 16 Jun 2009 00:07:48 +0000 (+0000)
Subject: Added Item Code Entry in Work Order Entry and quantity decimals now follows the item
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=888c2d09b843887c8c75a3357857aa9fef07cf78;p=textcart.git

Added Item Code Entry in Work Order Entry and quantity decimals now follows the item
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f5ab184..4bc0d13 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+15-Jun-2009 Joe Hunt
+! Added Item Code Entry in Work Order Entry and quantity decimals now follows the item
+$ /includes/ui/ui_lists.inc
+  /manufacturing/work_order_entry.php
+  
 14-Jun-2009 Joe Hunt
 ! Much better presentation of new Balance Sheet, P&L Statement and Monthly Breakdown.
 $ /gl/includes/db/gl_db_account_types.inc
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index f136c38..d7e2c96 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -818,8 +818,15 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 		$all_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	$str = stock_manufactured_items_list_cells($label, $name, $selected_id,
-			$all_option, $submit_on_change);
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("mb_flag = 'M'"), 
+			'edit_submit' => true));
+	//$str = stock_manufactured_items_list_cells($label, $name, $selected_id,
+	//		$all_option, $submit_on_change);
+	echo "</td>\n";
 	echo "</tr>\n";
 	return $str;
 }
diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 7977a59..659e9be 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -391,13 +391,18 @@ if (get_post('released'))
 }
 else
 {
-	stock_manufactured_items_list_row(_("Item:"), 'stock_id', null);
+	stock_manufactured_items_list_row(_("Item:"), 'stock_id', null, false, true);
+	if (list_updated('stock_id'))
+		$Ajax->activate('quantity');
 
 	locations_list_row(_("Destination Location:"), 'StockLocation', null);
 }
 
 if (!isset($_POST['quantity']))
 	$_POST['quantity'] = qty_format(1, $_POST['stock_id'], $dec);
+else
+	$_POST['quantity'] = qty_format($_POST['quantity'], $_POST['stock_id'], $dec);
+	
 
 if (get_post('type') == wo_types::advanced())
 {