X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=b077e5d58268ad6b22b710048404283689c3c164;hb=d13f7277c62f8231041d086da9c66f7ed22d6659;hp=ae7ac39791b29308fed838d586d5b1519447c9e1;hpb=4e436722cb991b7273c08bdc1dc53b5390772972;p=fa-stable.git diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index ae7ac397..b077e5d5 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ //-------------------------------------------------------------------------------- @@ -211,7 +211,7 @@ 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, $date, $memo) +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 @@ -228,8 +228,9 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $date, $m // 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, $date, $memo); + $amount, $net_amount, $ex_rate, $date, $memo); } @@ -239,14 +240,16 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $date, $m // actual tax type rate. // function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included, - $amount, $net_amount, $tran_date, $memo) + $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, + (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.",".($included ? 1:0).",".db_escape($net_amount)."," + .$rate.",".$ex_rate.",".($included ? 1:0)."," + .db_escape($net_amount)."," .db_escape($amount).",".db_escape($memo).")"; db_query($sql, "Cannot save trans tax details"); @@ -260,7 +263,7 @@ function get_trans_tax_details($trans_type, $trans_no) FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types WHERE trans_type = $trans_type AND trans_no = $trans_no - AND amount != 0 + 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"); @@ -277,15 +280,56 @@ function void_trans_tax_details($type, $type_no) 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_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, 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_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, 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) +// Write/update journal entries. +// +function write_journal_entries(&$cart) { - begin_transaction(); + $date_ = $cart->tran_date; + $ref = $cart->reference; + $memo_ = $cart->memo_; + $new = $cart->order_id == 0; + $trans_type = $cart->trans_type; + $trans_id = $new ? get_next_trans_no($trans_type) : $cart->order_id; - $trans_type = systypes::journal_entry(); - $trans_id = get_next_trans_no($trans_type); + begin_transaction(); + + if($new) { + $cart->order_id = $trans_id; + } else { + void_journal_trans($trans_type, $trans_id, true); + delete_comments($trans_type, $trans_id); + } - foreach ($items as $journal_item) + foreach ($cart->gl_items as $journal_item) { // post to first found bank account using given gl acount code. $is_bank_to = is_bank_account($journal_item->code_id); @@ -296,51 +340,21 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) if ($is_bank_to) { add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref, - $date_, $journal_item->amount, - 0, "", get_company_currency(), + $date_, $journal_item->amount, 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, $date_, $memo_); + $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); + if ($new) { + add_comments($trans_type, $trans_id, $date_, $memo_); + references::save($trans_type, $trans_id, $ref); + } else + update_comments($trans_type, $trans_id, null, $memo_); - if ($reverse) - { - - //$reversingDate = date(user_date_display(), - // Mktime(0,0,0,get_month($date_)+1,1,get_year($date_))); - $reversingDate = begin_month(add_months($date_, 1)); - - $trans_id_reverse = get_next_trans_no($trans_type); - - foreach ($items as $journal_item) - { - $is_bank_to = is_bank_account($journal_item->code_id); - - 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); - if ($is_bank_to) - { - add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref, - $reversingDate, $journal_item->amount, - 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, $date, $memo_); - } - - add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_); - - references::save($trans_type, $trans_id_reverse, $ref); - } + add_audit_trail($trans_type, $trans_id, $date_); commit_transaction(); @@ -378,9 +392,9 @@ 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); + void_bank_trans($type, $type_no, true); +// void_gl_trans($type, $type_no, true); // this is done above +// void_trans_tax_details($type, $type_no); // ditto commit_transaction(); }