Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / gl / gl_journal.php

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 34abbedfabb4175acdf4ee1f7307d4ea2f513f15..99a6145e83bcc14611c9097505cc856f1e89037f 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -129,7 +129,6 @@ function create_cart($type=0, $trans_no=0)
                }
                $cart->memo_ = get_comments_string($type, $trans_no);
                $cart->reference = $header['reference'];
-
                // update net_amounts from tax register
 
                // retrieve tax details
@@ -148,7 +147,7 @@ function create_cart($type=0, $trans_no=0)
                {
                        $net_sum = 0;
                        foreach($cart->gl_items as $gl)
-                               if (!is_tax_account($gl->code_id) && !is_subledger_account($gl->code_id, $gl->person_id))
+                if (!is_tax_account($gl->code_id) && !is_subledger_account($gl->code_id))
                                        $net_sum += $gl->amount;
 
                        $ex_net = abs($net_sum) - array_sum($tax_info['net_amount']);
@@ -328,6 +327,15 @@ if (isset($_POST['Process']))
                $cart->tax_info = false;
        $trans_no = write_journal_entries($cart);
 
+        // retain the reconciled status if desired by user
+        if (isset($_POST['reconciled'])
+            && $_POST['reconciled'] == 1) {
+            $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=".db_escape($_POST['reconciled_date'])
+                ." WHERE type=" . ST_JOURNAL . " AND trans_no=".db_escape($trans_no);
+
+            db_query($sql, "Can't change reconciliation status");
+        }
+
        $cart->clear_items();
        new_doc_date($_POST['date_']);
        unset($_SESSION['journal_items']);