X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=d8e6d58a269b8fa7e6858aa282a1936ab321b7ad;hb=871bc1f187ad6e5622a80c7dd8aadc48d8ea70fd;hp=30750bbbd4fb4042b1cf0276b402fef7e19a2109;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index 30750bbb..d8e6d58a 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ //-------------------------------------------------------------------------------- // Base function for adding a GL transaction @@ -18,10 +27,10 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension if ($rate == 0) $amount_in_home_currency = to_home_currency($amount, $currency, $date_); else - $amount_in_home_currency = round($amount * $rate, user_price_dec()); + $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) @@ -52,7 +61,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; } //-------------------------------------------------------------------------------- @@ -68,9 +78,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, @@ -188,7 +209,105 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, } //-------------------------------------------------------------------------------- +// Stores journal/bank transaction tax details if applicable +// +function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo) +{ + $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']) + $amount = -$amount; + // we have to restore net amount as we cannot know the base amount + if ($tax['rate'] == 0) { +// display_warning(_("You should not post gl transactions +// to tax account with zero tax rate.")); + $net_amount = 0; + } else { + // calculate net amount + $net_amount = $amount/$tax['rate']*100; + } + + add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], 0, + $amount, $net_amount, $ex_rate, $date, $memo); + +} + +//-------------------------------------------------------------------------------- +// +// Store transaction tax details for fiscal purposes with 'freezed' +// actual tax type rate. +// +function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included, + $amount, $net_amount, $ex_rate, $tran_date, $memo) +{ + + $sql = "INSERT INTO ".TB_PREF."trans_tax_details + (trans_type, trans_no, tran_date, tax_type_id, rate, ex_rate, + included_in_price, net_amount, amount, memo) + VALUES (".db_escape($trans_type)."," . db_escape($trans_no).",'" + .date2sql($tran_date)."',".db_escape($tax_id)."," + .$rate.",".$ex_rate.",".($included ? 1:0)."," + .db_escape($net_amount)."," + .db_escape($amount).",".db_escape($memo).")"; + + db_query($sql, "Cannot save trans tax details"); + +} +//---------------------------------------------------------------------------------------- + +function get_trans_tax_details($trans_type, $trans_no) +{ + $sql = "SELECT ".TB_PREF."trans_tax_details.*, ".TB_PREF."tax_types.name AS tax_type_name + FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types + WHERE trans_type = $trans_type + AND trans_no = $trans_no + AND (net_amount != 0 OR amount != 0) + AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_tax_details.tax_type_id"; + + return db_query($sql, "The transaction tax details could not be retrieved"); +} +//---------------------------------------------------------------------------------------- + +function void_trans_tax_details($type, $type_no) +{ + $sql = "UPDATE ".TB_PREF."trans_tax_details SET amount=0, net_amount=0 + WHERE trans_no=$type_no + AND trans_type=$type"; + + db_query($sql, "The transaction tax details could not be voided"); +} + +function get_tax_summary($from, $to) +{ + $fromdate = date2sql($from); + $todate = date2sql($to); + + $sql = "SELECT + SUM(IF( trans_type=1 || trans_type=11 || trans_type=20,-1,1)* + IF(trans_type=0 || trans_type=2 || trans_type=10 || trans_type=11, net_amount*ex_rate,0)) net_input, + SUM(IF( trans_type=1 || trans_type=11 || trans_type=20,-1,1)* + IF(trans_type=0 || trans_type=2 || trans_type=10 || trans_type=11, amount*ex_rate,0)) payable, + SUM(IF( trans_type=1 || trans_type=11 || trans_type=20,-1,1)* + IF(trans_type=0 || trans_type=2 || trans_type=10 || trans_type=11, 0, net_amount*ex_rate)) net_output, + SUM(IF( trans_type=1 || trans_type=11 || trans_type=20,-1,1)* + IF(trans_type=0 || trans_type=2 || trans_type=10 || trans_type=11, 0, amount*ex_rate)) collectible, + taxrec.rate, + ttype.id, + ttype.name + FROM ".TB_PREF."tax_types ttype, + ".TB_PREF."trans_tax_details taxrec + WHERE taxrec.tax_type_id=ttype.id + AND taxrec.trans_type != 13 + AND taxrec.tran_date >= '$fromdate' + AND taxrec.tran_date <= '$todate' + GROUP BY ttype.id"; +//display_error($sql); + return db_query($sql,"Cannot retrieve tax summary"); +} +//-------------------------------------------------------------------------------- function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) { begin_transaction(); @@ -211,8 +330,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, 1, $date_, $memo_); } - + add_comments($trans_type, $trans_id, $date_, $memo_); references::save($trans_type, $trans_id, $ref); @@ -240,6 +362,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, 1, $date, $memo_); } add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_); @@ -277,6 +402,17 @@ 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_trans_tax_details($type, $type_no); + + commit_transaction(); +} ?> \ No newline at end of file