X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=f4cf1624d38bb82c9b4053ca3b3eadd217a6a827;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=70f297887a044f7766ff6ec9cdae5b5017221cb8;hpb=b1167086b19280eb898396e3af6470975ff74571;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 70f29788..f4cf1624 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -1,5 +1,14 @@
 <?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");
@@ -51,7 +60,7 @@ if (isset($_GET["stock_id"]))
 
 //--------------------------------------------------------------------------------------
 
-start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only .SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only");
 
 start_table("class='tablestyle_noborder'");
 start_row();
@@ -66,7 +75,7 @@ if ($outstanding_only==0)
 
 stock_manufactured_items_list_cells(_("for item:"), 'SelectedStockItem', null, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'),  'default');
 end_row();
 end_table();
 
@@ -98,7 +107,7 @@ function edit_link($row)
 {
 	return  $row['closed'] ? '<i>'._('Closed').'</i>' :
 		pager_link(_("Edit"),
-			"/manufacturing/work_order_entry.php?trans_no=" . $row["id"]);
+			"/manufacturing/work_order_entry.php?trans_no=" . $row["id"], ICON_EDIT);
 }
 
 function release_link($row)
@@ -121,10 +130,22 @@ function produce_link($row)
 
 function costs_link($row)
 {
+/*
 	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"]);
+}
+
+function view_gl_link($row)
+{
+	if ($row['closed'] == 0)
+		return '';
+	return get_gl_view_str(systypes::work_order(), $row['id']);
 }
 
 function dec_amount($row, $amount)
@@ -195,12 +216,18 @@ $cols = array(
 	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'=> '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();
 
 display_db_pager($table);