X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=38623220f10118995272f9859b99c9470e33d6f9;hb=7ad222595e84451daea8aaa06c83d817cc3c774c;hp=264b551819974f904f8934ef6ffbe1ed4e41687b;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 264b5518..38623220 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -11,21 +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_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"), false, false, "", $js);
+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'];
 }
@@ -35,33 +37,8 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-start_form();
-
-if (!isset($_POST['supplier_id']))
-	$_POST['supplier_id'] = get_global_supplier();
-
-start_table("class='tablestyle_noborder'");
-start_row();
-
-supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
-date_cells(_("To:"), 'TransToDate');
-
-supp_allocations_list_cell("filterType", null);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-
-end_row();
-end_table();
-set_global_supplier($_POST['supplier_id']);
-
-//------------------------------------------------------------------------------------------------
-
 function display_supplier_summary($supplier_record)
 {
-	global $table_style;
-
 	$past1 = get_company_pref('past_due_days');
 	$past2 = 2 * $past1;
 	$nowdue = "1-" . $past1 . " " . _('Days');
@@ -69,37 +46,25 @@ function display_supplier_summary($supplier_record)
 	$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 	
 
-    start_table("width=80% $table_style");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
     	$pastdue1, $pastdue2, _("Total Balance"));
 
 	table_header($th);
-    start_row();
-	label_cell($supplier_record["curr_code"]);
-    label_cell($supplier_record["terms"]);
-    amount_cell($supplier_record["Balance"] - $supplier_record["Due"]);
-    amount_cell($supplier_record["Due"] - $supplier_record["Overdue1"]);
-    amount_cell($supplier_record["Overdue1"] - $supplier_record["Overdue2"]);
-    amount_cell($supplier_record["Overdue2"]);
-    amount_cell($supplier_record["Balance"]);
-    end_row();
+	if ($supplier_record != false)
+	{
+	    start_row();
+		label_cell($supplier_record["curr_code"]);
+	    label_cell($supplier_record["terms"]);
+	    amount_cell($supplier_record["Balance"] - $supplier_record["Due"]);
+	    amount_cell($supplier_record["Due"] - $supplier_record["Overdue1"]);
+	    amount_cell($supplier_record["Overdue1"] - $supplier_record["Overdue2"]);
+	    amount_cell($supplier_record["Overdue2"]);
+	    amount_cell($supplier_record["Balance"]);
+	    end_row();
+	}
     end_table(1);
 }
-//------------------------------------------------------------------------------------------------
-
-div_start('totals_tbl');
-if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
-{
-	$supplier_record = get_supplier_details($_POST['supplier_id']);
-    display_supplier_summary($supplier_record);
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
-	$Ajax->activate('totals_tbl');
-}
-
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
@@ -119,11 +84,17 @@ function due_date($row)
 
 function gl_view($row)
 {
+	if ($row['type'] == ST_SUPPRECEIVE && get_voided_entry(ST_SUPPRECEIVE, $row['trans_no']))
+		return set_icon(ICON_REMOVE, _("Voided."));
 	return get_gl_view_str($row["type"], $row["trans_no"]);
 }
 
 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=".
@@ -131,22 +102,16 @@ 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)
 {
- 		return print_document_link($row['trans_no'], _("Print"), true, $row['type']);
+  	if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT || $row['type'] == ST_SUPPCREDIT) 
+ 		return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT);
 }
 
 function check_overdue($row)
@@ -154,70 +119,77 @@ 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']);
+}
 //------------------------------------------------------------------------------------------------
 
-    $date_after = date2sql($_POST['TransAfterDate']);
-    $date_to = date2sql($_POST['TransToDate']);
-
-    // Sherifoz 22.06.03 Also get the description
-    $sql = "SELECT trans.type, 
-		trans.trans_no,
-		trans.reference, 
-		supplier.supp_name, 
-		trans.supp_reference,
-    	trans.tran_date, 
-		trans.due_date,
-		supplier.curr_code, 
-    	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
-		trans.alloc AS Allocated,
-		((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
-    	(ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount - trans.alloc) <= 0.005) AS Settled
-    	FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
-    	WHERE supplier.supplier_id = trans.supplier_id
-     	AND trans.tran_date >= '$date_after'
-    	AND trans.tran_date <= '$date_to'
-		AND trans.ov_amount != 0";	// exclude voided transactions
-   	if ($_POST['supplier_id'] != ALL_TEXT)
-   		$sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-   	{
-   		if (($_POST['filterType'] == '1')) 
-   		{
-   			$sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
-   		} 
-   		elseif (($_POST['filterType'] == '2')) 
-   		{
-   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-   		} 
-   		elseif ($_POST['filterType'] == '3') 
-   		{
-			$sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
-   		} 
-   		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) 
-   		{
-			$sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
-   		}
-
-   		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) 
-   		{
-   			$today =  date2sql(Today());
-			$sql .= " AND trans.due_date < '$today' ";
-   		}
-   	}
+start_form();
+
+if (!isset($_POST['supplier_id']))
+	$_POST['supplier_id'] = get_global_supplier();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+
+if (!$page_nested)
+	supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, true, false, true);
+
+supp_transactions_list_cell("filterType", null, true);
+
+if ($_POST['filterType'] != '2')
+{
+	date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+	date_cells(_("To:"), 'TransToDate');
+}
+
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+
+end_row();
+end_table();
+set_global_supplier($_POST['supplier_id']);
+
+//------------------------------------------------------------------------------------------------
+
+div_start('totals_tbl');
+
+if ($_POST['supplier_id'] != "" && $_POST['supplier_id'] != ALL_TEXT)
+{
+	$supplier_record = get_supplier_details(get_post('supplier_id'), get_post('TransToDate'), true);
+    display_supplier_summary($supplier_record);
+}
+div_end();
+
+if (get_post('RefreshInquiry') || list_updated('filterType'))
+{
+	$Ajax->activate('_page_body');
+}
+
+//------------------------------------------------------------------------------------------------
+
+$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'=>''), 
-			_("#") => array('fun'=>'trans_view', 'ord'=>''), 
+			_("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'), 
 			_("Reference"), 
 			_("Supplier"),
 			_("Supplier's Reference"), 
 			_("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'), 
+			_("Balance") => array('align'=>'right', 'type'=>'amount'),
 			array('insert'=>true, 'fun'=>'gl_view'),
-			array('insert'=>true, 'fun'=>'credit_link')
+			array('insert'=>true, 'fun'=>'edit_link'),
+			array('insert'=>true, 'fun'=>'credit_link'),
+			array('insert'=>true, 'fun'=>'prt_link')
 			);
 
 if ($_POST['supplier_id'] != ALL_TEXT)
@@ -225,8 +197,8 @@ if ($_POST['supplier_id'] != ALL_TEXT)
 	$cols[_("Supplier")] = 'skip';
 	$cols[_("Currency")] = 'skip';
 }
-//------------------------------------------------------------------------------------------------
-
+if ($_POST['filterType'] != '2')
+	$cols[_("Balance")] = 'skip';
 
 /*show a table of the transactions returned by the sql */
 $table =& new_db_pager('trans_tbl', $sql, $cols);
@@ -239,4 +211,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>