Merged changes from stable branch up to 2.3.23.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index d1e2ee82f4ebc3fc4f070f7e3242d047952ee809..c3f54557c665373effdf0278b8e7372f70aa5db6 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -18,9 +18,9 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js);
 
@@ -47,7 +47,7 @@ start_row();
 if (!$page_nested)
        supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, true);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'TransToDate');
 
 supp_transactions_list_cell("filterType", null, true);
@@ -69,7 +69,7 @@ function display_supplier_summary($supplier_record)
        $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
        
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
        $pastdue1, $pastdue2, _("Total Balance"));
 
@@ -163,11 +163,11 @@ function check_overdue($row)
 
 function edit_link($row)
 {
-       return edit_trans_link($row['type'], $row['trans_no']);
+       return trans_editor_link($row['type'], $row['trans_no']);
 }
 //------------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_supplier_inquiry();
+$sql = get_sql_for_supplier_inquiry(get_post('filterType'), get_post('TransAfterDate'), get_post('TransToDate'), get_post('supplier_id'));
 
 $cols = array(
                        _("Type") => array('fun'=>'systype_name', 'ord'=>''), 
@@ -203,4 +203,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>