X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=447dbd0782cbedf4013bb08fda3e87a99426356c;hb=54d84ff9a67620ab38c676cdbcf87853632724f0;hp=3091a75c4f1afe4b807ff7fc738931c7b190f55e;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 3091a75c..447dbd07 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -1,7 +1,17 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 $path_to_root="..";
+include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -9,17 +19,39 @@ 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);
-} 
-else 
+}
+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) {
+		set_focus('OrderNumber');
+	} else
+		set_focus('StockLocation');
+
+	$Ajax->activate('orders_tbl');
+}
 
 //--------------------------------------------------------------------------------------
 
@@ -32,134 +64,174 @@ start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstandi
 
 start_table("class='tablestyle_noborder'");
 start_row();
-ref_cells(_("Reference:"), 'OrderNumber', null);
+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();
 
 end_form();
 
-$sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description,".TB_PREF."locations.location_name
-	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 ";
+//-----------------------------------------------------------------------------
+function check_overdue($row)
+{
+	return (!$row["closed"] 
+		&& date_diff(Today(), sql2date($row["required_by"]), "d") > 0);
+}
+
+function view_link($dummy, $order_no)
+{
+	return get_trans_view_str(systypes::work_order(), $order_no);
+}
+
+function view_stock($row)
+{
+	return view_stock_status($row["stock_id"], $row["description"], false);
+}
+
+function wo_type_name($dummy, $type)
+{
+	return wo_types::name($type);
+}
+
+function edit_link($row)
+{
+	return  $row['closed'] ? '<i>'._('Closed').'</i>' :
+		pager_link(_("Edit"),
+			"/manufacturing/work_order_entry.php?trans_no=" . $row["id"], ICON_EDIT);
+}
+
+function release_link($row)
+{
+	return $row["closed"] ? '' : 
+		($row["released"]==0 ?
+		pager_link(_('Release'),
+			"/manufacturing/work_order_release.php?trans_no=" . $row["id"])
+		: 
+		pager_link(_('Issue'),
+			"/manufacturing/work_order_issue.php?trans_no=" .$row["id"]));
+}
+
+function produce_link($row)
+{
+	return $row["closed"] || !$row["released"] ? '' :
+		pager_link(_('Produce'),
+			"/manufacturing/work_order_add_finished.php?trans_no=" .$row["id"]);
+}
 
-if (check_value('OpenOnly')) 
+function costs_link($row)
 {
-	$sql .= " AND ".TB_PREF."workorders.closed=0 ";
+/*
+	return $row["closed"] || !$row["released"] ? '' :
+		pager_link(_('Costs'),
+			"/gl/gl_bank.php?NewPayment=1&PayType=" 
+			.payment_person_types::WorkOrder(). "&PayPerson=" .$row["id"]);
+*/			
+	return $row["closed"] || !$row["released"] ? '' :
+		pager_link(_('Costs'),
+			"/manufacturing/work_order_costs.php?trans_no=" .$row["id"]);
 }
 
-if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items) 
+function view_gl_link($row)
 {
-	$sql .= "AND ".TB_PREF."workorders.loc_code='" . $_POST['StockLocation'] . "' ";
+	if ($row['closed'] == 0)
+		return '';
+	return get_gl_view_str(systypes::work_order(), $row['id']);
 }
 
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") 
+function dec_amount($row, $amount)
 {
-	$sql .= "AND ".TB_PREF."workorders.wo_ref LIKE '%". $_POST['OrderNumber'] . "%'";
+	return number_format2($amount, $row['decimals']);
 }
 
-if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items) 
+$sql = "SELECT
+	workorder.id,
+	workorder.wo_ref,
+	workorder.type,
+	location.location_name,
+	item.description,
+	workorder.units_reqd,
+	workorder.units_issued,
+	workorder.date_,
+	workorder.required_by,
+	workorder.released_date,
+	workorder.closed,
+	workorder.released,
+	workorder.stock_id,
+	unit.decimals
+	FROM ".TB_PREF."workorders as 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 
+		AND workorder.loc_code=location.loc_code
+		AND item.units=unit.abbr";
+
+if (check_value('OpenOnly') || $outstanding_only != 0)
 {
-	$sql .= "AND ".TB_PREF."workorders.stock_id='". $_POST['SelectedStockItem'] . "'";
+	$sql .= " AND workorder.closed=0";
 }
 
-if (check_value('OverdueOnly')) 
+if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
+{
+	$sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']);
+}
+
+if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
+{
+	$sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%');
+}
+
+if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
+{
+	$sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']);
+}
+
+if (check_value('OverdueOnly'))
 {
 	$Today = date2sql(Today());
 
-	$sql .= "AND ".TB_PREF."workorders.required_by < '$Today' ";
-}
-$sql .= " ORDER BY ".TB_PREF."workorders.required_by";
-
-$result = db_query($sql,"No orders were returned");
-
-start_table("$table_style width=80%");
-
-$th = array(_("#"), _("Reference"), _("Type"), _("Location"), _("Item"),
-	_("Required"), _("Manufactured"), _("Date"), _("Required By"), _("Closed"), "");
-table_header($th);
-
-$j = 1;
-$k = 0;
-
-while ($myrow = db_fetch($result)) 
-{
-
-
-	// check if it's an overdue work order
-	if (!$myrow["closed"] && date_diff(Today(), sql2date($myrow["required_by"]), "d") > 0) 
-	{
-		start_row("class='overduebg'");
-	}
-	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 = "";
-	}
-
-	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"]));
-	label_cell(wo_types::name($myrow["type"]));
-	label_cell($myrow["location_name"]);
-	view_stock_status_cell($myrow["stock_id"], $myrow["description"]);
-	qty_cell($myrow["units_reqd"]);
-	qty_cell($myrow["units_issued"]);
-	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) 
-	{
-		label_cell("<a href=$release_page>" . _("Release") . "</a>");
-	}
-	if ($myrow["closed"] == 0) 
-	{
-		label_cell("<a href=$modify_page>" . _("Edit") . "</a>");
-	}
-
-	label_cell(get_gl_view_str(systypes::work_order(), $myrow["id"]));
-
-	end_row();
-
-	$j++;
-	If ($j == 12)
-	{
-		$j = 1;
-		table_header($th);
-	}
-	//end of page full new headings if
-}
-//end of while loop
-
-end_table(1);
-
-//---------------------------------------------------------------------------------
+	$sql .= " AND workorder.required_by < '$Today' ";
+}
+
+$cols = array(
+	_("#") => array('fun'=>'view_link'), 
+	_("Reference"), // viewlink 2 ?
+	_("Type") => array('fun'=>'wo_type_name'),
+	_("Location"), 
+	_("Item") => array('fun'=>'view_stock'),
+	_("Required") => array('fun'=>'dec_amount', 'align'=>'right'),
+	_("Manufactured") => array('fun'=>'dec_amount', 'align'=>'right'),
+	_("Date") => 'date', 
+	_("Required By") => array('type'=>'date', 'ord'=>''),
+	array('insert'=>true, 'fun'=> 'edit_link'),
+	array('insert'=>true, 'fun'=> 'release_link'),
+	array('insert'=>true, 'fun'=> 'produce_link'),
+	array('insert'=>true, 'fun'=> 'costs_link'),
+	array('insert'=>true, 'fun'=> 'view_gl_link')
+);
+
+$table =& new_db_pager('orders_tbl', $sql, $cols);
+$table->set_marker('check_overdue', _("Marked orders are overdue."));
+
+if (get_post('SearchOrders')) {
+	$table->set_sql($sql);
+	$table->set_columns($cols);
+}
+$table->width = "90%";
+start_form();
 
-end_page();
+display_db_pager($table);
 
+end_form();
+end_page();
 ?>