Merged changes up to 2.3.16 into unstable

[fa-stable.git] / gl / includes / db / gl_db_trans.inc

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 5b6939976fed524ba2e8fa9d104701c8daf1254d..f9e270d9304653f069769cdbcea5c26d87e6686d 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -42,6 +42,9 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
                else
                        $memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
        }
+       if (!is_subledger_account($account) && $account==get_company_pref('deffered_income_act') || $account==get_company_pref('grn_clearing_act'))
+               $person_id = $person_type_id = null;
+
        $sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
                account, dimension_id, dimension2_id, memo_, amount";
 
@@ -87,12 +90,15 @@ function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $
 function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, $person_id=null)
 {
        $amount = round2($amount, user_price_dec());
-       if ($amount != 0)
+
+       if (floatcmp($amount, 0))
+       {
+               error_log(sprintf( _("Rounding error %s encountered for trans_type:%s,trans_no:%s"), $amount, $type, $trans_id));
                return add_gl_trans($type, $trans_id, $date_, get_company_pref('exchange_diff_act'), 0, 0, "",
                        $amount, null, $person_type_id, $person_id, "The balanced GL transaction could not be inserted");
-       else
+       } else
                return 0;
-}      
+}
 
 //--------------------------------------------------------------------------------
 
@@ -154,6 +160,7 @@ function get_gl_trans($type, $trans_id)
                LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
                ." WHERE gl.type= ".db_escape($type) 
                ." AND gl.type_no = ".db_escape($trans_id)
+               ." AND gl.amount <> 0"
                ." ORDER BY counter";
        return db_query($sql, "The gl transactions could not be retrieved");
 }
@@ -445,12 +452,12 @@ function get_tax_summary($from, $to)
                                        ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
                                        ." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
 
-                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
                                IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
                                        ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
                                        ." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
 
-                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
                                IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
                                        ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
                                        ." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
@@ -497,9 +504,12 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
                // post to first found bank account using given gl acount code.
                $is_bank_to = is_bank_account($journal_item->code_id);
 
-               add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
-                       $journal_item->dimension_id, $journal_item->dimension2_id,
-                       $journal_item->reference, $journal_item->amount);
+               add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
+                       $journal_item->dimension_id, $journal_item->dimension2_id,
+                       $journal_item->reference, $journal_item->amount, null, 
+                       $journal_item->person_type_id, 
+                       $journal_item->person_id);
+
        if ($is_bank_to)
        {
                add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref,
@@ -534,7 +544,9 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
 
                add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
                        $journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
-                       $journal_item->reference, -$journal_item->amount);
+                       $journal_item->reference, -$journal_item->amount, 
+                       null, $journal_item->person_type_id, $journal_item->person_id);
+
                if ($is_bank_to)
                {
                        add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref,
@@ -586,7 +598,7 @@ function void_gl_trans($type, $trans_id, $nested=false)
                commit_transaction();
 }
 
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 
 function clear_gl_trans($type, $trans_id, $nested=false)
 {
@@ -655,8 +667,7 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
        else
                $sql .= " AND NOT ISNULL(a.gl_seq)";
 
-       $sql .= " GROUP BY tran_date, gl_seq, gl.type, gl.type_no";
-
+       $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
        return $sql;
 }
 ?>
\ No newline at end of file