Fixed handling extended journal entries in various places.

[fa-stable.git] / includes / db / audit_trail_db.inc

diff --git a/includes/db/audit_trail_db.inc b/includes/db/audit_trail_db.inc
index c341a2f0d283c6ee171e4b177c414c9a647d07ff..6aa91d9833689c0fdfd4db3a70f2f653f747ab08 100644 (file)
--- a/includes/db/audit_trail_db.inc
+++ b/includes/db/audit_trail_db.inc
@@ -107,25 +107,33 @@ function close_transactions($todate) {
        return $errors;
 }
 
-/*
-       Closed transactions have gl_seq number assigned.
-*/
-function is_closed_trans($type, $trans_no) {
+function get_journal_number($type, $trans_no) {
 
        $cdate = get_company_pref('gl_closing_date');
        if (!$cdate)
                return false;
 
 // FIXME: gl_date can be badly entered for some transactions due to bug in previous FA versions 
-       $sql = "SELECT  gl_seq  FROM ".TB_PREF."audit_trail"
+       $sql = "SELECT  MAX(gl_seq) as gl_seq  FROM ".TB_PREF."audit_trail"
                . " WHERE type=".db_escape($type)
                ." AND trans_no=".db_escape($trans_no)
                ." AND gl_date<='$cdate'"; // date is stored in sql format
 //             ." AND (gl_date<='$cdate'" // some transaction can be not sequenced due to 0 amount, however after edition this could change
 //             ." OR gl_seq>0)";
-
        $res = db_query($sql, "Cannot check transaction");
+       if (db_num_rows($res))
+       {
+               $myrow =db_fetch($res);
+               return $myrow['gl_seq'] ? $myrow['gl_seq'] : _('None');
+       }
+       return "-";
+}
+
+/*
+       Closed transactions have gl_seq number assigned.
+*/
+function is_closed_trans($type, $trans_no) {
 
-       return db_num_rows($res);
+       return get_journal_number($type, $trans_no) > 0;
 }