Additional fixes to quick entry feature.

[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 d44e8eac04578de6928b2d56425ea5ec5f81a4bc..19dac59c15779c4d303d53ca7dd3f9ab40d46809 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -8,15 +8,20 @@
 // if $currency is not set, then defaults to no conversion
 
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
-       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="")
+       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="", $rate=0)
 {
        global $use_audit_trail;
 
        $date = date2sql($date_);
        if ($currency != null)
-               $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+       {
+               if ($rate == 0)
+                       $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+               else
+                       $amount_in_home_currency = round2($amount * $rate,  user_price_dec());
+       }               
        else
-               $amount_in_home_currency = $amount;
+               $amount_in_home_currency = round2($amount, user_price_dec());
        if ($dimension == null || $dimension < 0)
                $dimension = 0;
        if ($dimension2 == null || $dimension2 < 0)
@@ -47,7 +52,8 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
        if ($err_msg == "")
                $err_msg = "The GL transaction could not be inserted";
 
-       return db_query($sql, $err_msg);
+       db_query($sql, $err_msg);
+       return $amount_in_home_currency;
 }
 
 //--------------------------------------------------------------------------------
@@ -63,9 +69,20 @@ function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $
                return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
                        $amount, null, $person_type_id, $person_id, $err_msg);
        else
-               return null;
+               return 0;
 }
 
+// Function for even out rounding problems
+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)
+               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
+               return 0;
+}      
+
 //--------------------------------------------------------------------------------
 
 function get_gl_transactions($from_date, $to_date, $trans_no=0,
@@ -183,7 +200,24 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0,
 }
 
 //--------------------------------------------------------------------------------
+//     Stores GL journal/bank transaction on tax account for tax report
+//
+function add_gl_tax_details($gl_code, $trans_type, $trans_id, $amount)
+{
+       $tax_type = is_tax_account($gl_code);
+       if(!$tax_type) return;  // $gl_code is not tax account
+
+       $tax = get_tax_type($tax_type);
+       if ($gl_code == $tax['sales_gl_code'])
+               add_customer_trans_tax_detail_item($trans_type, $trans_id, 
+                       $tax['id'], $tax['rate'], 0, -$amount);
+       else
+               add_supp_invoice_tax_item($trans_type, $trans_id, 
+                       $tax['id'], $tax['rate'], 0, $amount);
+                       
+}
 
+//--------------------------------------------------------------------------------
 function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null)
 {
        begin_transaction();
@@ -206,8 +240,11 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null)
                        0, "", get_company_currency(),
                        "Cannot insert a destination bank transaction");
        }
+               // store tax details if the gl account is a tax account
+               add_gl_tax_details($journal_item->code_id, 
+                       $trans_type, $trans_id, $journal_item->amount);
        }
-
+       
        add_comments($trans_type, $trans_id, $date_, $memo_);
 
        references::save($trans_type, $trans_id, $ref);
@@ -235,6 +272,9 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null)
                                0, "", get_company_currency(),
                                "Cannot insert a destination bank transaction");
                }
+                       // store tax details if the gl account is a tax account
+                       add_gl_tax_details($journal_item->code_id, 
+                               $trans_type, $trans_id, -$journal_item->amount);
        }
 
        add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);
@@ -272,6 +312,18 @@ function void_gl_trans($type, $trans_id, $nested=false)
                commit_transaction();
 }
 
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+
+function void_journal_trans($type, $type_no)
+{
+       begin_transaction();
+
+       void_gl_trans($type, $type_no, true);
+       void_bank_trans($type, $type_no,true);
+       void_customer_trans_tax_details($type, $type_no);
+       void_supp_invoice_tax_items($type, $type_no);
+
+       commit_transaction();
+}
 
 ?>
\ No newline at end of file