X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=af06cedf7a4122aaad4554584c79bfb65f635c74;hb=df444f84379276fbc46eddca894ed3529120b2bb;hp=76d293e0985032937fa4dc287522a55235e55532;hpb=b7abcfdf70f6e1d61e977ac555603c591cf0006f;p=fa-stable.git diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index 76d293e0..af06cedf 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -50,11 +50,13 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension $sql .= ") "; - $sql .= "VALUES ($type, $trans_id, '$date', - '$account', $dimension, $dimension2, ".db_escape($memo_).", $amount_in_home_currency"; + $sql .= "VALUES (".db_escape($type).", ".db_escape($trans_id).", '$date', + ".db_escape($account).", ".db_escape($dimension).", " + .db_escape($dimension2).", ".db_escape($memo_).", " + .db_escape($amount_in_home_currency); if ($person_type_id != null) - $sql .= ", $person_type_id, ". db_escape($person_id); + $sql .= ", ".db_escape($person_type_id).", ". db_escape($person_id); $sql .= ") "; @@ -95,31 +97,40 @@ function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, //-------------------------------------------------------------------------------- function get_gl_transactions($from_date, $to_date, $trans_no=0, - $account=null, $dimension=0, $dimension2=0, $filter_type=null) + $account=null, $dimension=0, $dimension2=0, $filter_type=null, + $amount_min=null, $amount_max=null) { $from = date2sql($from_date); $to = date2sql($to_date); - $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master + $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 tran_date >= '$from' AND tran_date <= '$to'"; if ($trans_no > 0) - $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE '%$trans_no'"; + $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no); if ($account != null) - $sql .= " AND ".TB_PREF."gl_trans.account = '$account'"; + $sql .= " AND ".TB_PREF."gl_trans.account = ".db_escape($account); - if ($dimension > 0) - $sql .= " AND ".TB_PREF."gl_trans.dimension_id = $dimension"; + if ($dimension != 0) + $sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".($dimension<0?0:db_escape($dimension)); - if ($dimension2 > 0) - $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = $dimension2"; + if ($dimension2 != 0) + $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); if ($filter_type != null AND is_numeric($filter_type)) - $sql .= " AND ".TB_PREF."gl_trans.type= $filter_type"; + $sql .= " AND ".TB_PREF."gl_trans.type= ".db_escape($filter_type); + + if ($amount_min != null) + $sql .= " AND ABS(".TB_PREF."gl_trans.amount) >= ABS(".db_escape($amount_min).")"; + + if ($amount_max != null) + $sql .= " AND ABS(".TB_PREF."gl_trans.amount) <= ABS(".db_escape($amount_max).")"; - $sql .= " ORDER BY tran_date"; + $sql .= " ORDER BY tran_date, counter"; return db_query($sql, "The transactions for could not be retrieved"); } @@ -129,9 +140,12 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0, function get_gl_trans($type, $trans_id) { - $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master + $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=$type AND ".TB_PREF."gl_trans.type_no=$trans_id"; + AND ".TB_PREF."gl_trans.type=".db_escape($type) + ." AND ".TB_PREF."gl_trans.type_no=".db_escape($trans_id); return db_query($sql, "The gl transactions could not be retrieved"); } @@ -140,12 +154,14 @@ function get_gl_trans($type, $trans_id) function get_gl_wo_cost_trans($trans_id, $person_id=-1) { - $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master + $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=".systypes::work_order()." AND ".TB_PREF."gl_trans.type_no=$trans_id - AND ".TB_PREF."gl_trans.person_type_id=".payment_person_types::WorkOrder(); + 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=$person_id"; + $sql .= " AND ".TB_PREF."gl_trans.person_id=".db_escape($person_id); $sql .= " AND amount < 0"; return db_query($sql, "The gl transactions could not be retrieved"); @@ -162,10 +178,10 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d $sql .= " AND tran_date > '$from'"; if ($to_date != "") $sql .= " AND tran_date < '$to'"; - if ($dimension > 0) - $sql .= " AND dimension_id = $dimension"; - if ($dimension2 > 0) - $sql .= " AND dimension2_id = $dimension2"; + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql, "The starting balance for account $account could not be calculated"); @@ -186,10 +202,10 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim $sql .= " AND tran_date >= '$from'"; if ($to_date != "") $sql .= " AND tran_date <= '$to'"; - if ($dimension > 0) - $sql .= " AND dimension_id = $dimension"; - if ($dimension2 > 0) - $sql .= " AND dimension2_id = $dimension2"; + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql, "Transactions for account $account could not be calculated"); @@ -200,22 +216,25 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim //---------------------------------------------------------------------------------------------------- function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true) { - $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance - FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,".TB_PREF."chart_types, ".TB_PREF."chart_class - WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id + $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, + SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance + FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master," + .TB_PREF."chart_types, ".TB_PREF."chart_class + WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND " + .TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND"; if ($account != null) - $sql .= " account='$account' AND"; - if ($dimension > 0) - $sql .= " dimension_id=$dimension AND"; - if ($dimension2 > 0) - $sql .= " dimension2_id=$dimension2 AND"; + $sql .= " account=".db_escape($account)." AND"; + if ($dimension != 0) + $sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND"; + if ($dimension2 != 0) + $sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND"; $from_date = date2sql($from); if ($from_incl) $sql .= " tran_date >= '$from_date' AND"; else - $sql .= " tran_date > IF(balance_sheet>0 AND balance_sheet<".CL_INCOME.", '0000-00-00', '$from_date') AND"; + $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND"; $to_date = date2sql($to); if ($to_incl) $sql .= " tran_date <= '$to_date' "; @@ -236,15 +255,15 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $to = date2sql($to_date); $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans - WHERE account='$account' "; + WHERE account=".db_escape($account); if ($from_date != "") $sql .= " AND tran_date >= '$from' "; if ($to_date != "") $sql .= " AND tran_date <= '$to' "; - if ($dimension > 0) - $sql .= " AND dimension_id = $dimension"; - if ($dimension2 > 0) - $sql .= " AND dimension2_id = $dimension2"; + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql,"No budget accounts were returned"); $row = db_fetch_row($result); @@ -260,8 +279,8 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, 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; + //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 @@ -291,7 +310,7 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included 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($rate).",".db_escape($ex_rate).",".($included ? 1:0)."," .db_escape($net_amount)."," .db_escape($amount).",".db_escape($memo).")"; @@ -302,10 +321,11 @@ 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 + $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 + WHERE trans_type = ".db_escape($trans_type)." + AND trans_no = ".db_escape($trans_no)." AND (net_amount != 0 OR amount != 0) AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_tax_details.tax_type_id"; @@ -317,8 +337,8 @@ function get_trans_tax_details($trans_type, $trans_no) 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"; + WHERE trans_no=".db_escape($type_no) + ." AND trans_type=".db_escape($type); db_query($sql, "The transaction tax details could not be voided"); } @@ -329,36 +349,53 @@ function get_tax_summary($from, $to) $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, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", net_amount*ex_rate,0)) net_output, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", 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.trans_type != ".ST_CUSTDELIVERY." 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, $reverse, $use_transaction=true) { - begin_transaction(); + global $Refs; + + $date_ = $cart->tran_date; + $ref = $cart->reference; + $memo_ = $cart->memo_; + $trans_type = $cart->trans_type; + $new = $cart->order_id == 0; + + if ($new) + $cart->order_id = get_next_trans_no($trans_type); + + $trans_id = $cart->order_id; - $trans_type = systypes::journal_entry(); - $trans_id = get_next_trans_no($trans_type); + if ($use_transaction) + begin_transaction(); + + if(!$new) + void_journal_trans($trans_type, $trans_id, false); - 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); @@ -369,29 +406,33 @@ 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, 1, $date_, $memo_); + ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, -$journal_item->amount, 1, $date_, $memo_); } - add_comments($trans_type, $trans_id, $date_, $memo_); + if ($new) { + add_comments($trans_type, $trans_id, $date_, $memo_); + $Refs->save($trans_type, $trans_id, $ref); + } else { + update_comments($trans_type, $trans_id, null, $memo_); + $Refs->update($trans_type, $trans_id, $ref); + } - references::save($trans_type, $trans_id, $ref); + add_audit_trail($trans_type, $trans_id, $date_); 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) + foreach ($cart->gl_items as $journal_item) { $is_bank_to = is_bank_account($journal_item->code_id); @@ -401,21 +442,23 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) if ($is_bank_to) { add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref, - $reversingDate, $journal_item->amount, + $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, 1, $date, $memo_); + ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, $journal_item->amount, 1, $reversingDate, $memo_); } add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_); - references::save($trans_type, $trans_id_reverse, $ref); + $Refs->save($trans_type, $trans_id_reverse, $ref); + add_audit_trail($trans_type, $trans_id_reverse, $reversingDate); } - commit_transaction(); + if ($use_transaction) + commit_transaction(); return $trans_id; } @@ -424,7 +467,8 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) function exists_gl_trans($type, $trans_id) { - $sql = "SELECT type_no FROM ".TB_PREF."gl_trans WHERE type=$type AND type_no=$trans_id"; + $sql = "SELECT type_no FROM ".TB_PREF."gl_trans WHERE type=".db_escape($type) + ." AND type_no=".db_escape($trans_id); $result = db_query($sql, "Cannot retreive a gl transaction"); return (db_num_rows($result) > 0); @@ -437,7 +481,8 @@ function void_gl_trans($type, $trans_id, $nested=false) if (!$nested) begin_transaction(); - $sql = "UPDATE ".TB_PREF."gl_trans SET amount=0 WHERE type=$type AND type_no=$trans_id"; + $sql = "UPDATE ".TB_PREF."gl_trans SET amount=0 WHERE type=".db_escape($type) + ." AND type_no=".db_escape($trans_id); db_query($sql, "could not void gl transactions for type=$type and trans_no=$trans_id"); @@ -447,15 +492,17 @@ function void_gl_trans($type, $trans_id, $nested=false) //---------------------------------------------------------------------------------------- -function void_journal_trans($type, $type_no) +function void_journal_trans($type, $type_no, $use_transaction=true) { - begin_transaction(); + if ($use_transaction) + 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(); + if ($use_transaction) + commit_transaction(); } ?> \ No newline at end of file