Merged changes from main branch up to 2.1.3.

[fa-stable.git] / purchasing / inquiry / po_search_completed.php

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index cacc3baee41b5fa5d9bdb64a2474b7f003e0a429..1f9ff81007d6005061af0bf481920427c868ff9c 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 $path_to_root="../..";
@@ -53,7 +53,7 @@ if (get_post('SearchOrders'))
 }
 //---------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 start_table("class='tablestyle_noborder'");
 start_row();
@@ -66,7 +66,7 @@ locations_list_cells(_("into location:"), 'StockLocation', null, true);
 
 stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table();
 end_form();
@@ -92,6 +92,13 @@ function trans_view($trans)
        return get_trans_view_str(systypes::po(), $trans["order_no"]);
 }
 
+function edit_link($row) 
+{
+  return pager_link( _("Edit"),
+       "/purchasing/po_entry_items.php?" . SID 
+       . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+}
+
 function prt_link($row)
 {
        return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
@@ -149,9 +156,10 @@ $cols = array(
                _("Supplier") => array('ord'=>''),
                _("Location"),
                _("Supplier's Reference"), 
-               _("Order Date") => array('type'=>'date', 'ord'=>'desc'),
+               _("Order Date") => array('name'=>'ord_date', 'type'=>'date', 'ord'=>'desc'),
                _("Currency") => array('align'=>'center'), 
                _("Order Total") => 'amount',
+               array('insert'=>true, 'fun'=>'edit_link'),
                array('insert'=>true, 'fun'=>'prt_link'),
 );
 
@@ -166,6 +174,7 @@ if (get_post('SearchOrders')) {
        $table->set_sql($sql);
        $table->set_columns($cols);
 }
+$table->width = "80%";
 start_form();
 
 display_db_pager($table);