X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=11ebd0c7ca65a988e6ab7e6954b4874a5d76f661;hb=c89567ef64ba87a8387fa09ae8d55a4667d74f00;hp=666206129add29c08edc6592e604c662a769682f;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 66620612..11ebd0c7 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -9,8 +9,9 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if (isset($_GET['outstanding_only']))
+if (isset($_GET['outstanding_only']) && ($_GET['outstanding_only'] == true))
 {
+// curently outstanding simply means not closed
 	$outstanding_only = 1;
 	page(_("Search Outstanding Work Orders"), false, false, "", $js);
 }
@@ -19,7 +20,30 @@ else
 	$outstanding_only = 0;
 	page(_("Search Work Orders"), false, false, "", $js);
 }
+//-----------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('SearchOrders')) 
+{
+	$Ajax->activate('orders_tbl');
+} elseif (get_post('_OrderNumber_changed')) 
+{
+	$disable = get_post('OrderNumber') !== '';
+
+	$Ajax->addDisable(true, 'StockLocation', $disable);
+	$Ajax->addDisable(true, 'OverdueOnly', $disable);
+	$Ajax->addDisable(true, 'OpenOnly', $disable);
+	$Ajax->addDisable(true, 'SelectedStockItem', $disable);
 
+	if ($disable) {
+//		$Ajax->addFocus(true, 'OrderNumber');
+		set_focus('OrderNumber');
+	} else
+//		$Ajax->addFocus(true, 'StockLocation');
+		set_focus('StockLocation');
+
+	$Ajax->activate('orders_tbl');
+}
 
 //--------------------------------------------------------------------------------------
 
@@ -32,17 +56,18 @@ start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstandi
 
 start_table("class='tablestyle_noborder'");
 start_row();
-ref_cells(_("Reference:"), 'OrderNumber');
+ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true);
 
 locations_list_cells(_("at Location:"), 'StockLocation', null, true);
 
 check_cells( _("Only Overdue:"), 'OverdueOnly', null);
 
-check_cells( _("Only Open:"), 'OpenOnly', null);
+if ($outstanding_only==0)
+	check_cells( _("Only Open:"), 'OpenOnly', null);
 
 stock_manufactured_items_list_cells(_("for item:"), 'SelectedStockItem', null, true);
 
-submit_cells('SearchOrders', _("Search"));
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
 end_row();
 end_table();
 
@@ -53,7 +78,7 @@ $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description,".TB
 	WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id AND
 	".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code ";
 
-if (check_value('OpenOnly'))
+if (check_value('OpenOnly') || $outstanding_only != 0)
 {
 	$sql .= " AND ".TB_PREF."workorders.closed=0 ";
 }
@@ -83,10 +108,12 @@ $sql .= " ORDER BY ".TB_PREF."workorders.required_by";
 
 $result = db_query($sql,"No orders were returned");
 
+div_start('orders_tbl');
 start_table("$table_style width=80%");
 
 $th = array(_("#"), _("Reference"), _("Type"), _("Location"), _("Item"),
-	_("Required"), _("Manufactured"), _("Date"), _("Required By"), _("Closed"), "");
+	_("Required"), _("Manufactured"), _("Date"), _("Required By"),
+	'', '', '', '', '');
 table_header($th);
 
 $j = 1;
@@ -104,22 +131,6 @@ while ($myrow = db_fetch($result))
 	else
 		alt_table_row_color($k);
 
-	$modify_page = $path_to_root . "/manufacturing/work_order_entry.php?" . SID . "trans_no=" . $myrow["id"];
-	$release_page = $path_to_root . "/manufacturing/work_order_release.php?" . SID . "trans_no=" . $myrow["id"];
-	if ($myrow["closed"] == 0)
-	{
-		$issue = $path_to_root . "/manufacturing/work_order_issue.php?" . SID . "trans_no=" .$myrow["id"];
-		$add_finished = $path_to_root . "/manufacturing/work_order_add_finished.php?" . SID . "trans_no=" .$myrow["id"];
-		$costs = $path_to_root . "/gl/gl_payment.php?NewPayment=1&PayType=" . payment_person_types::WorkOrder(). "&PayPerson=" .$myrow["id"];
-		$can_issue = $myrow["released"];
-		$issue_link = $can_issue?("<a href=$issue>" . _("Issue") . "</a></td>
-			<td><a href=$add_finished>" . _("Produce") . "</a></td>
-			<td><a href=$costs>" . _("Costs") . "</a>"): _("Not Released");
-	}
-	else
-	{
-		$issue_link = "";
-	}
 	$dec = get_qty_dec($myrow["stock_id"]);
 	label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"]));
 	label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"], $myrow["wo_ref"]));
@@ -130,18 +141,35 @@ while ($myrow = db_fetch($result))
 	qty_cell($myrow["units_issued"], false, $dec);
 	label_cell(sql2date($myrow["date_"]));
 	label_cell(sql2date($myrow["required_by"]));
-	label_cell(($myrow["closed"]? _("Yes"):_("No")));
-	if ($issue_link != "")
-		label_cell($issue_link);
-	if ($myrow["released"] == 0)
+
+	$l1 = $l2 = $l3 = $l4 = '';
+	if ($myrow["closed"] == 0)
 	{
-		label_cell("<a href=$release_page>" . _("Release") . "</a>");
+		$modify_page = $path_to_root . "/manufacturing/work_order_entry.php?" . SID . "trans_no=" . $myrow["id"];
+		$l1 = "<a href=$modify_page>"._('Edit').'</a>';
+	 	if ($myrow["released"] == 0) 
+	 	{
+			$release_page = $path_to_root . "/manufacturing/work_order_release.php?" . SID . "trans_no=" . $myrow["id"];
+	 		$l2 = "<a href=$release_page>"._('Release').'</a>';
+	 	} 
+	 	else 
+	 	{
+			$issue = $path_to_root . "/manufacturing/work_order_issue.php?" . SID . "trans_no=" .$myrow["id"];
+			$add_finished = $path_to_root . "/manufacturing/work_order_add_finished.php?" . SID . "trans_no=" .$myrow["id"];
+			$costs = $path_to_root . "/gl/gl_bank.php?NewPayment=1&PayType=" . payment_person_types::WorkOrder(). "&PayPerson=" .$myrow["id"];
+	 		$l2 = "<a href=$issue>" . _("Issue") . "</a>";
+	 		$l3 = "<a href=$add_finished>" . _("Produce") . "</a>";
+	 		$l4 = "<a href=$costs>" . _("Costs") . "</a>";
+		}
 	}
-	if ($myrow["closed"] == 0)
+	else
 	{
-		label_cell("<a href=$modify_page>" . _("Edit") . "</a>");
+		$l1 = "<i>"._('Closed')."</i>";
 	}
-
+	label_cell($l1);
+	label_cell($l2);
+	label_cell($l3);
+	label_cell($l4);
 	label_cell(get_gl_view_str(systypes::work_order(), $myrow["id"]));
 
 	end_row();
@@ -157,7 +185,7 @@ while ($myrow = db_fetch($result))
 //end of while loop
 
 end_table(1);
-
+div_end();
 //---------------------------------------------------------------------------------
 
 end_page();