Bug 5697: In Supplier Transaction Inquiry, Aging balances are Incorrect. Fixed.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c3f54557c665373effdf0278b8e7372f70aa5db6..02e6b665b0c7b75215ff6db551dfff584b63a5d1 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -27,6 +27,7 @@ page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false,
 if (isset($_GET['supplier_id'])){
        $_POST['supplier_id'] = $_GET['supplier_id'];
 }
+
 if (isset($_GET['FromDate'])){
        $_POST['TransAfterDate'] = $_GET['FromDate'];
 }
@@ -36,30 +37,6 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-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, false, false, true);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
-date_cells(_("To:"), 'TransToDate');
-
-supp_transactions_list_cell("filterType", null, true);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-
-end_row();
-end_table();
-set_global_supplier($_POST['supplier_id']);
-
-//------------------------------------------------------------------------------------------------
-
 function display_supplier_summary($supplier_record)
 {
        $past1 = get_company_pref('past_due_days');
@@ -85,28 +62,12 @@ function display_supplier_summary($supplier_record)
     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'], $_POST['TransToDate']);
-    display_supplier_summary($supplier_record);
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
-       $Ajax->activate('totals_tbl');
-}
-
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
        global $systypes_array;
        return $systypes_array[$type];
 }
-div_end();
 
 function trans_view($trans)
 {
@@ -120,6 +81,8 @@ 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"]);
 }
 
@@ -136,17 +99,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,27 +119,74 @@ function check_overdue($row)
 
 function edit_link($row)
 {
+       global $page_nested;
+
+       if ($page_nested)
+               return '';
        return trans_editor_link($row['type'], $row['trans_no']);
 }
 //------------------------------------------------------------------------------------------------
 
+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'=>'edit_link'),
                        array('insert'=>true, 'fun'=>'credit_link'),
-                       array('insert'=>true, 'fun'=>'prt_link'),
-                       array('insert'=>true, 'fun'=>'edit_link')
+                       array('insert'=>true, 'fun'=>'prt_link')
                        );
 
 if ($_POST['supplier_id'] != ALL_TEXT)
@@ -191,6 +194,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);