X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=f316c4122baaa9b23c8beb8d2c6419f63c970c66;hb=ad6bab7618366daa24da8bc4d5caddbb75aefbf6;hp=94ab527597ffec00951249db3dc8488b7c4773bc;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 94ab5275..f316c412 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -18,15 +18,16 @@ 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);
 
 if (isset($_GET['supplier_id'])){
 	$_POST['supplier_id'] = $_GET['supplier_id'];
 }
+
 if (isset($_GET['FromDate'])){
 	$_POST['TransAfterDate'] = $_GET['FromDate'];
 }
@@ -47,7 +48,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 +70,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"));
 
@@ -106,7 +107,6 @@ function systype_name($dummy, $type)
 	global $systypes_array;
 	return $systypes_array[$type];
 }
-div_end();
 
 function trans_view($trans)
 {
@@ -136,17 +136,10 @@ function credit_link($row)
 			: '';
 }
 
-function fmt_debit($row)
+function fmt_amount($row)
 {
 	$value = $row["TotalAmount"];
-	return $value>0 ? price_format($value) : '';
-
-}
-
-function fmt_credit($row)
-{
-	$value = -$row["TotalAmount"];
-	return $value>0 ? price_format($value) : '';
+	return price_format($value);
 }
 
 function prt_link($row)
@@ -163,11 +156,15 @@ function check_overdue($row)
 
 function edit_link($row)
 {
-	return edit_trans_link($row['type'], $row['trans_no']);
+	global $page_nested;
+
+	if ($page_nested)
+		return '';
+	return trans_editor_link($row['type'], $row['trans_no']);
 }
 //------------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_supplier_inquiry($_POST['filterType'], $_POST['TransAfterDate'], $_POST['TransToDate'], $_POST['supplier_id']);
+$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'=>''), 
@@ -178,8 +175,7 @@ $cols = array(
 			_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'), 
 			_("Due Date") => array('type'=>'date', 'fun'=>'due_date'), 
 			_("Currency") => array('align'=>'center'),
-			_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
-			_("Credit") => array('align'=>'right', 'insert'=>true,'fun'=>'fmt_credit'), 
+			_("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), 
 			array('insert'=>true, 'fun'=>'gl_view'),
 			array('insert'=>true, 'fun'=>'credit_link'),
 			array('insert'=>true, 'fun'=>'prt_link'),
@@ -203,4 +199,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>