[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 3fd59521e59157fdd96c81777b983490a29ce4e6..8f0db537cc5109962772a8264d7c6d8d7a1d05e1 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -19,9 +19,9 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 page(_($help_context = "Journal Inquiry"), false, false, "", $js);
@@ -48,12 +48,14 @@ journal_types_list_cells(_("Type:"), "filterType");
 date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
 date_cells(_("To:"), 'ToDate');
 
-check_cells( _("Show closed:"), 'AlsoClosed', null);
-
-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);
+check_cells( _("Show closed:"), 'AlsoClosed', null);
+submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
@@ -71,27 +73,42 @@ function systype_name($dummy, $type)
 
 function view_link($row) 
 {
-       return get_trans_view_str($row["type"], $row["type_no"]);
+       return get_trans_view_str($row["trans_type"], $row["trans_no"]);
 }
 
 function gl_link($row) 
 {
-       return get_gl_view_str($row["type"], $row["type_no"]);
+       return get_gl_view_str($row["trans_type"], $row["trans_no"]);
 }
 
 function edit_link($row)
 {
-       return edit_trans_link($row["type"], $row["type_no"]);
+
+       $ok = true;
+       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)
+                       $ok = false;
+       }
+       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' => check_value('AlsoClosed') ? 'asc' : 'desc'),
+       _("Date") =>array('name'=>'tran_date','type'=>'date','ord'=>'desc'),
        _("Type") => array('fun'=>'systype_name'), 
        _("Trans #") => array('fun'=>'view_link'), 
+       _("Counterparty") => array('ord' => ''),
+       _("Supplier's Reference") => 'skip',
        _("Reference"), 
        _("Amount") => array('type'=>'amount'),
        _("Memo"),
@@ -104,6 +121,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%";
@@ -113,4 +135,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>