X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=f316c4122baaa9b23c8beb8d2c6419f63c970c66;hb=ad6bab7618366daa24da8bc4d5caddbb75aefbf6;hp=5c59a8a363a96934a8caf5f0cd14c063626726e9;hpb=41569d63b7f2883ca21668f86c7b1dbbd14276c6;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 5c59a8a3..f316c412 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -11,22 +11,23 @@
 ***********************************************************************/
 $page_security = 'SA_SUPPTRANSVIEW';
 $path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
 
-include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
-include($path_to_root . "/reporting/includes/reporting.inc");
+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'];
 }
@@ -44,12 +45,13 @@ if (!isset($_POST['supplier_id']))
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true);
+if (!$page_nested)
+	supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, true);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'TransToDate');
 
-supp_allocations_list_cell("filterType", null);
+supp_transactions_list_cell("filterType", null, true);
 
 submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
@@ -68,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"));
 
@@ -89,7 +91,7 @@ function display_supplier_summary($supplier_record)
 div_start('totals_tbl');
 if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
 {
-	$supplier_record = get_supplier_details($_POST['supplier_id']);
+	$supplier_record = get_supplier_details($_POST['supplier_id'], $_POST['TransToDate']);
     display_supplier_summary($supplier_record);
 }
 div_end();
@@ -123,6 +125,10 @@ function gl_view($row)
 
 function credit_link($row)
 {
+	global $page_nested;
+
+	if ($page_nested)
+		return '';
 	return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
 		pager_link(_("Credit This"),
 			"/purchasing/supplier_credit.php?New=1&invoice_no=".
@@ -130,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)
@@ -154,9 +153,18 @@ function check_overdue($row)
 	return $row['OverDue'] == 1
 		&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
 }
+
+function edit_link($row)
+{
+	global $page_nested;
+
+	if ($page_nested)
+		return '';
+	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'=>''), 
@@ -167,11 +175,11 @@ $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')
+			array('insert'=>true, 'fun'=>'prt_link'),
+			array('insert'=>true, 'fun'=>'edit_link')
 			);
 
 if ($_POST['supplier_id'] != ALL_TEXT)
@@ -179,8 +187,6 @@ if ($_POST['supplier_id'] != ALL_TEXT)
 	$cols[_("Supplier")] = 'skip';
 	$cols[_("Currency")] = 'skip';
 }
-//------------------------------------------------------------------------------------------------
-
 
 /*show a table of the transactions returned by the sql */
 $table =& new_db_pager('trans_tbl', $sql, $cols);
@@ -193,4 +199,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>