X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_accounts.inc;h=12238c4044472a40bb8aeda56394895143630d05;hb=eefe5267ed97b38ac66179141994fc8c9dd09ea8;hp=c4318279a033840c769c8293e132c06b1a78aa4e;hpb=090d7aa59c80c1fb5089f6b4376b51c46244eca5;p=fa-stable.git diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc index c4318279..12238c40 100644 --- a/gl/includes/db/gl_db_bank_accounts.inc +++ b/gl/includes/db/gl_db_bank_accounts.inc @@ -1,12 +1,12 @@ . ***********************************************************************/ //--------------------------------------------------------------------------------------------- @@ -18,27 +18,33 @@ function clear_dflt_curr_account($curr_code) { function add_bank_account($account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number, $bank_address, $bank_curr_code, - $dflt_curr_act) + $dflt_curr_act, $bank_charge_act) { + begin_transaction(__FUNCTION__, func_get_args()); if($dflt_curr_act) // only one default account for any currency clear_dflt_curr_account($bank_curr_code); $sql = "INSERT INTO ".TB_PREF."bank_accounts (account_code, account_type, bank_account_name, bank_name, bank_account_number, bank_address, - bank_curr_code, dflt_curr_act) + bank_curr_code, dflt_curr_act, bank_charge_act) VALUES (".db_escape($account_code).", ".db_escape($account_type).", " .db_escape($bank_account_name).", ".db_escape($bank_name).", " .db_escape($bank_account_number).",".db_escape($bank_address). - ", ".db_escape($bank_curr_code).", ".db_escape($dflt_curr_act).")"; + ", ".db_escape($bank_curr_code).", ".db_escape($dflt_curr_act).", ".db_escape($bank_charge_act).")"; db_query($sql, "could not add a bank account for $account_code"); + $result = db_insert_id(); + commit_transaction(); + return $result; } //--------------------------------------------------------------------------------------------- function update_bank_account($id, $account_code, $account_type, $bank_account_name, - $bank_name, $bank_account_number, $bank_address, $bank_curr_code, $dflt_curr_act) + $bank_name, $bank_account_number, $bank_address, $bank_curr_code, $dflt_curr_act, $bank_charge_act) { + begin_transaction(__FUNCTION__, func_get_args()); + if($dflt_curr_act) // only one default account for any currency clear_dflt_curr_account($bank_curr_code); @@ -47,19 +53,23 @@ function update_bank_account($id, $account_code, $account_type, $bank_account_na bank_account_name=".db_escape($bank_account_name).", bank_name=".db_escape($bank_name).", bank_account_number=".db_escape($bank_account_number).", bank_curr_code=".db_escape($bank_curr_code).", bank_address=".db_escape($bank_address).", - dflt_curr_act=".db_escape($dflt_curr_act) - ." WHERE id = ".db_escape($id); + dflt_curr_act=".db_escape($dflt_curr_act).", bank_charge_act=".db_escape($bank_charge_act)." + WHERE id = ".db_escape($id); db_query($sql, "could not update bank account for $account_code"); + + commit_transaction(); } //--------------------------------------------------------------------------------------------- function delete_bank_account($id) { + begin_transaction(__FUNCTION__, func_get_args()); $sql = "DELETE FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); db_query($sql,"could not delete bank account for $id"); + commit_transaction(); } @@ -76,10 +86,10 @@ function get_bank_account($id) //--------------------------------------------------------------------------------------------- -function get_bank_accounts($show_inactive) +function get_bank_accounts($show_inactive=false) { - $sql = "SELECT account.*, gl_account.account_name - FROM ".TB_PREF."bank_accounts account, ".TB_PREF."chart_master gl_account + $sql = "SELECT account.*, gl_account.account_name + FROM ".TB_PREF."bank_accounts account, ".TB_PREF."chart_master gl_account WHERE account.account_code = gl_account.account_code"; if (!$show_inactive) $sql .= " AND !account.inactive"; $sql .= " ORDER BY account_code, bank_curr_code"; @@ -102,69 +112,102 @@ function get_bank_gl_account($id) //--------------------------------------------------------------------------------------------- -function add_quick_entry($description, $type, $base_amount, $base_desc, $bal_type) +function get_bank_charge_account($id) { - $sql = "INSERT INTO ".TB_PREF."quick_entries (description, type, base_amount, base_desc, bal_type) + $sql = "SELECT bank_charge_act FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); + + $result = db_query($sql, "could not retreive bank account for $id"); + + $bank_account = db_fetch($result); + + return $bank_account['bank_charge_act']; +} + +//--------------------------------------------------------------------------------------------- + +function add_quick_entry($description, $type, $base_amount, $base_desc, $bal_type, $usage) +{ + begin_transaction(__FUNCTION__, func_get_args()); + $sql = "INSERT INTO ".TB_PREF."quick_entries (description, type, base_amount, base_desc, bal_type, `usage`) VALUES (".db_escape($description).", ".db_escape($type).", " - .db_escape($base_amount).", ".db_escape($base_desc).", ".db_escape($bal_type).")"; + .db_escape($base_amount).", ".db_escape($base_desc).", ".db_escape($bal_type).", ".db_escape($usage).")"; db_query($sql, "could not insert quick entry for $description"); + + $result = db_insert_id(); + commit_transaction(); + return $result; } //--------------------------------------------------------------------------------------------- -function update_quick_entry($selected_id, $description, $type, $base_amount, $base_desc, $bal_type) +function update_quick_entry($selected_id, $description, $type, $base_amount, $base_desc, $bal_type, $usage) { + begin_transaction(__FUNCTION__, func_get_args()); $sql = "UPDATE ".TB_PREF."quick_entries SET description = ".db_escape($description).", type=".db_escape($type).", base_amount=".db_escape($base_amount) - .", base_desc=".db_escape($base_desc).", bal_type=".db_escape($bal_type)." + .", base_desc=".db_escape($base_desc).", bal_type=".db_escape($bal_type).", `usage`=".db_escape($usage)." WHERE id = ".db_escape($selected_id); db_query($sql, "could not update quick entry for $selected_id"); + commit_transaction(); } //--------------------------------------------------------------------------------------------- function delete_quick_entry($selected_id) { + begin_transaction(__FUNCTION__, func_get_args()); $sql = "DELETE FROM ".TB_PREF."quick_entries WHERE id=".db_escape($selected_id); db_query($sql,"could not delete quick entry $selected_id"); + commit_transaction(); } //--------------------------------------------------------------------------------------------- -function add_quick_entry_line($qid, $action, $dest_id, $amount, $dim, $dim2) +function add_quick_entry_line($qid, $action, $dest_id, $amount, $dim, $dim2, $memo) { + begin_transaction(__FUNCTION__, func_get_args()); + $sql = "INSERT INTO ".TB_PREF."quick_entry_lines - (qid, action, dest_id, amount, dimension_id, dimension2_id) + (qid, action, dest_id, amount, dimension_id, dimension2_id, memo) VALUES (".db_escape($qid).", ".db_escape($action).",".db_escape($dest_id).", - ".db_escape($amount).", ".db_escape($dim).", ".db_escape($dim2).")"; + ".db_escape($amount).", ".db_escape($dim).", ".db_escape($dim2).", ".db_escape($memo).")"; db_query($sql, "could not insert quick entry line for $qid"); + + commit_transaction(); } //--------------------------------------------------------------------------------------------- -function update_quick_entry_line($selected_id, $qid, $action, $dest_id, $amount, $dim, $dim2) +function update_quick_entry_line($selected_id, $qid, $action, $dest_id, $amount, $dim, $dim2, $memo) { + begin_transaction(__FUNCTION__, func_get_args()); + $sql = "UPDATE ".TB_PREF."quick_entry_lines SET qid = ".db_escape($qid) .", action=".db_escape($action).", dest_id=".db_escape($dest_id).", amount=".db_escape($amount) - .", dimension_id=".db_escape($dim).", dimension2_id=".db_escape($dim2)." + .", dimension_id=".db_escape($dim).", dimension2_id=".db_escape($dim2).", memo=".db_escape($memo)." WHERE id = ".db_escape($selected_id); db_query($sql, "could not update quick entry line for $selected_id"); + + commit_transaction(); } //--------------------------------------------------------------------------------------------- function delete_quick_entry_line($selected_id) { - $sql = "DELETE FROM ".TB_PREF."quick_entry_lines WHERE id=".db_escape($selected_id); + begin_transaction(__FUNCTION__, func_get_args()); + $sql = "DELETE FROM ".TB_PREF."quick_entry_lines WHERE id=".db_escape($selected_id); db_query($sql,"could not delete quick entry line $selected_id"); + + commit_transaction(); } //--------------------------------------------------------------------------------------------- @@ -196,17 +239,14 @@ function get_quick_entry($selected_id) $result = db_query($sql, "could not retreive quick entry $selected_id"); return db_fetch($result); -} +} function get_quick_entry_lines($qid) { - $sql = "SELECT ".TB_PREF."quick_entry_lines.*, ".TB_PREF."chart_master.account_name, - ".TB_PREF."tax_types.name as tax_name - FROM ".TB_PREF."quick_entry_lines - LEFT JOIN ".TB_PREF."chart_master ON - ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."chart_master.account_code - LEFT JOIN ".TB_PREF."tax_types ON - ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."tax_types.id + $sql = "SELECT line.*, coa.account_name, taxtype.name as tax_name + FROM ".TB_PREF."quick_entry_lines line + LEFT JOIN ".TB_PREF."chart_master coa ON line.dest_id = coa.account_code + LEFT JOIN ".TB_PREF."tax_types taxtype ON line.dest_id = taxtype.id WHERE qid=".db_escape($qid)." ORDER by id"; @@ -267,13 +307,15 @@ function get_ending_reconciled($bank_account, $bank_date) function get_sql_for_bank_account_reconcile($bank_account, $date) { - $sql = "SELECT type, trans_no, ref, trans_date, - amount, person_id, person_type_id, reconciled, id - FROM ".TB_PREF."bank_trans - WHERE ".TB_PREF."bank_trans.bank_act = ".db_escape($bank_account) . " + $sql = "SELECT bt.type, trans_no, ref, trans_date, + amount, charge, person_id, person_type_id, reconciled, bt.id, c.memo_ + FROM ".TB_PREF."bank_trans bt + LEFT JOIN ".TB_PREF."comments c ON c.type = bt.type AND c.id = bt.trans_no + WHERE bank_act = ".db_escape($bank_account) . " AND (reconciled IS NULL OR reconciled='". date2sql($date) ."') - ORDER BY trans_date,".TB_PREF."bank_trans.id"; -// or ORDER BY reconciled desc, trans_date,".TB_PREF."bank_trans.id"; + AND amount != 0 + ORDER BY trans_date, bt.id"; + return $sql; } @@ -281,6 +323,8 @@ function get_sql_for_bank_account_reconcile($bank_account, $date) function update_reconciled_values($reconcile_id, $reconcile_value, $reconcile_date, $end_balance, $bank_account) { + begin_transaction(__FUNCTION__, func_get_args()); + $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=$reconcile_value" ." WHERE id=".db_escape($reconcile_id); @@ -292,10 +336,12 @@ function update_reconciled_values($reconcile_id, $reconcile_value, $reconcile_da WHERE id=".db_escape($bank_account); db_query($sql2,"Error updating reconciliation information"); + + commit_transaction(); } //--------------------------------------------------------------------------------------------- -function get_default_bank_account($curr) +function get_default_bank_account($curr=null) { /* default bank account is selected as first found account from: . default account in $curr if any @@ -304,6 +350,8 @@ function get_default_bank_account($curr) . first defined account in home currency */ $home_curr = get_company_pref('curr_default'); + if (!isset($curr)) + $curr = $home_curr; $sql = "SELECT b.*, b.bank_curr_code='$home_curr' as fall_back FROM " .TB_PREF."bank_accounts b" @@ -363,4 +411,14 @@ function identify_bank_account($account_number) return null; } -?> \ No newline at end of file +//---------------------------------------------------------------------------------- + +function get_bank_account_currency($id) +{ + $sql= "SELECT bank_curr_code FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); + $result = db_query($sql, "retreive bank account currency"); + + $myrow = db_fetch_row($result); + return $myrow[0]; +} +