Code cleanup after db_pager optimization.

[fa-stable.git] / purchasing / allocations / supplier_allocation_main.php

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index b7cfb1a5453cb6f02e0c44be83694dfd24744da2..4796399d97770ef515a47560b6165b411abb9e6f 100644 (file)
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -1,7 +1,16 @@
 <?php
-
-$path_to_root="../..";
-$page_security = 3;
+/**********************************************************************
+    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 = 'SA_SUPPLIERALLOC';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
@@ -16,15 +25,6 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 page(_("Supplier Allocations"), false, false, "", $js);
 
-//--------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-       if(isset($ret['supplier_id']))
-               $_POST['supplier_id'] = $ret['supplier_id'];
-}
-if (isset($_POST['_supplier_id_editor'])) {
-       context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'] );
-}
-
 //--------------------------------------------------------------------------------
 
 start_form();
@@ -44,11 +44,10 @@ start_form();
     echo "<br>";
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
        echo "</center><br><br>";
-
-end_form();
+       end_form();
        set_global_supplier($_POST['supplier_id']);
 
-       if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == reserved_words::get_all())) 
+       if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT)) 
        {
                unset($_POST['supplier_id']);
        }
@@ -63,7 +62,9 @@ end_form();
 //--------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
-       return systypes::name($type);
+       global $systypes_array;
+
+       return $systypes_array[$type];
 }
 
 function trans_view($trans)
@@ -75,17 +76,17 @@ function alloc_link($row)
 {
        return pager_link(_("Allocate"),
                "/purchasing/allocations/supplier_allocate.php?trans_no="
-                       .$row["trans_no"] . "&trans_type=" . $row["type"] );
+                       .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
 }
 
 function amount_left($row)
 {
-       return -$row["Total"]-$row["alloc"];
+       return price_format(-$row["Total"]-$row["alloc"]);
 }
 
 function amount_total($row)
 {
-       return -$row["Total"];
+       return price_format(-$row["Total"]);
 }
 
 function check_settled($row)
@@ -100,10 +101,10 @@ $cols = array(
        _("Transaction Type") => array('fun'=>'systype_name'),
        _("#") => array('fun'=>'trans_view'),
        _("Reference"), 
-       _("Date") => array('type'=>'date', 'ord'=>'asc'),
+       _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
        _("Supplier") => array('ord'=>''),
        _("Currency") => array('align'=>'center'),
-       _("Total") => 'amount', 
+       _("Total") => array('align'=>'right', 'fun'=>'amount_total'), 
        _("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'), 
        array('insert'=>true, 'fun'=>'alloc_link')
        );
@@ -116,16 +117,11 @@ if (isset($_POST['customer_id'])) {
 $table =& new_db_pager('alloc_tbl', $sql, $cols);
 $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
 
-if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) {
-       $table->set_sql($sql);
-       $table->set_columns($cols);
-       $Ajax->activate('alloc_tbl');
-}
-
-       start_form();
-       display_db_pager($table);
-       end_form();
-end_page();
+$table->width = "80%";
+start_form();
 
+display_db_pager($table);
 
+end_form();
+end_page();
 ?>
\ No newline at end of file