X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=078d3446dd779b04bd818660c62d7970537fb7ac;hb=50606312fee0bb0dbe984e2c08af53b7dab229bd;hp=7677fa3ec328042f5ed988f47db09d8acab7c552;hpb=4e4ce8577f8582967995919860c66aa94d633afd;p=fa-stable.git diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index 7677fa3e..078d3446 100644 --- 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)) + $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"; @@ -100,6 +103,8 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0, $account=null, $dimension=0, $dimension2=0, $filter_type=null, $amount_min=null, $amount_max=null) { + global $show_voided_gl_trans; + $from = date2sql($from_date); $to = date2sql($to_date); @@ -113,6 +118,8 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0, AND ISNULL(v.date_) AND tran_date >= '$from' AND tran_date <= '$to'"; + if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 0) + $sql .= " AND ".TB_PREF."gl_trans.amount <> 0"; if ($trans_no > 0) $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no); @@ -156,17 +163,20 @@ function get_gl_trans($type, $trans_id) //-------------------------------------------------------------------------------- -function get_gl_wo_cost_trans($trans_id, $person_id=-1) +function get_gl_wo_cost_trans($trans_id, $cost_type=-1) { - $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM " - .TB_PREF."gl_trans, ".TB_PREF."chart_master - WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account - AND ".TB_PREF."gl_trans.type=".ST_WORKORDER - ." AND ".TB_PREF."gl_trans.type_no=".db_escape($trans_id)." - AND ".TB_PREF."gl_trans.person_type_id=".PT_WORKORDER; - if ($person_id != -1) - $sql .= " AND ".TB_PREF."gl_trans.person_id=".db_escape($person_id); - $sql .= " AND amount < 0"; + $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM " + .TB_PREF."wo_costing costing, " + .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type AND gl.type_no=com.id," + .TB_PREF."chart_master chart + WHERE + costing.workorder_id=".db_escape($trans_id) + ." AND chart.account_code=gl.account + AND gl.type=costing.trans_type + AND gl.type_no=costing.trans_no"; + if ($cost_type != -1) + $sql .= " AND costing.cost_type=".db_escape($cost_type); + $sql .= " AND amount < 0"; return db_query($sql, "The gl transactions could not be retrieved"); } @@ -335,7 +345,7 @@ function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimensio //-------------------------------------------------------------------------------- // Stores journal/bank transaction tax details if applicable // -function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0) +function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null) { $tax_type = is_tax_account($gl_code); if(!$tax_type) return; // $gl_code is not tax account @@ -345,18 +355,19 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT) $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; + if ($net_amount===null) { + 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'], $included, $amount, $net_amount, $ex_rate, $date, $memo); - + } //-------------------------------------------------------------------------------- @@ -385,7 +396,9 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included 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 + .TB_PREF."tax_types.name AS tax_type_name, " + .TB_PREF."trans_tax_details.rate AS effective_rate, " + .TB_PREF."tax_types.rate AS rate FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types WHERE trans_type = ".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no)." @@ -487,9 +500,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, @@ -524,7 +540,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, @@ -642,7 +660,11 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al if (!$alsoclosed) { $sql .= " AND gl_seq=0"; } - $sql .= " GROUP BY gl.type, gl.type_no"; + else + $sql .= " AND NOT ISNULL(a.gl_seq)"; + + $sql .= " GROUP BY tran_date, gl_seq, gl.type, gl.type_no"; + return $sql; } ?> \ No newline at end of file