rerun of bug 5232 fix.

[fa-stable.git] / gl / inquiry / journal_inquiry.php

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index ad77e8bf919e9aa7d17bda257d72f023a9c849f8..b525374b76345dac05d3f74794b3fbc57c2f3865 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -45,18 +45,17 @@ start_row();
 ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
 
 journal_types_list_cells(_("Type:"), "filterType");
-date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
+date_cells(_("From:"), 'FromDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'ToDate');
 
-submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 start_row();
 ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
 users_list_cells(_("User:"), 'userid', null, false);
 if (get_company_pref('use_dimension') && isset($_POST['dimension'])) // display dimension only, when started in dimension mode
        dimensions_list_cells(_('Dimension:'), 'dimension', null, true, null, true);
-users_list_cells(_("User:"), 'userid', null, false);
 check_cells( _("Show closed:"), 'AlsoClosed', null);
+submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
@@ -72,6 +71,11 @@ function systype_name($dummy, $type)
        return $systypes_array[$type];
 }
 
+function person_link($row) 
+{
+    return payment_person_name($row["person_type_id"],$row["person_id"]);
+}
+
 function view_link($row) 
 {
        return get_trans_view_str($row["trans_type"], $row["trans_no"]);
@@ -89,21 +93,28 @@ function edit_link($row)
        if ($row['trans_type'] == ST_SALESINVOICE)
        {
                $myrow = get_customer_trans($row["trans_no"], $row["trans_type"]);
-               if ($myrow['alloc'] != 0 || get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) !== false)
+               if ($myrow['alloc'] != $myrow['Total'] || get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) !== false)
                        $ok = false;
        }
-       return $ok ? trans_editor_link($row["trans_type"], $row["trans_type"]) : '';
+       
+       return $ok ? trans_editor_link( $row["trans_type"], $row["trans_no"]) : '--';
+}
+
+function invoice_supp_reference($row)
+{
+       return $row['supp_reference'];
 }
 
 $sql = get_sql_for_journal_inquiry(get_post('filterType', -1), get_post('FromDate'),
-       get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed'));
+       get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed'), get_post('userid'));
 
 $cols = array(
        _("#") => array('fun'=>'journal_pos', 'align'=>'center'), 
        _("Date") =>array('name'=>'tran_date','type'=>'date','ord'=>'desc'),
        _("Type") => array('fun'=>'systype_name'), 
        _("Trans #") => array('fun'=>'view_link'), 
-       _("Counterparty") => array('ord' => ''),
+       _("Counterparty") => array('fun' => 'person_link'),
+       _("Supplier's Reference") => 'skip',
        _("Reference"), 
        _("Amount") => array('type'=>'amount'),
        _("Memo"),
@@ -116,6 +127,11 @@ if (!check_value('AlsoClosed')) {
        $cols[_("#")] = 'skip';
 }
 
+if($_POST['filterType'] == ST_SUPPINVOICE) //add the payment column if shown supplier invoices only
+{
+       $cols[_("Supplier's Reference")] = array('fun'=>'invoice_supp_reference', 'align'=>'center');
+}
+
 $table =& new_db_pager('journal_tbl', $sql, $cols);
 
 $table->width = "80%";