Presentation bug in Sales Order View when reference is 'auto'.

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

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 3dc740de66ea6cce0deaede1937a38588ad3f13a..fbd7c06a2efe4a221253774d20732485f9b3cce4 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -88,10 +88,11 @@ 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_no"]) : '';
+       
+       return $ok ? trans_editor_link( $row["trans_type"], $row["trans_no"]) : '--';
 }
 
 function invoice_supp_reference($row)
@@ -100,7 +101,7 @@ function invoice_supp_reference($row)
 }
 
 $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'),