X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_accounts.inc;h=0850dfe01a8c577cd6e5f45a7adafdf85e065aae;hb=79e9eb93c8f4f1cde88161253494626466ba7a50;hp=53f3facfbc9ba0c168ce77e455b75a772e94e096;hpb=86e4d1627183fb4d97fe145a5dd33b43b03284ee;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 53f3facf..0850dfe0 100644 --- a/gl/includes/db/gl_db_bank_accounts.inc +++ b/gl/includes/db/gl_db_bank_accounts.inc @@ -10,27 +10,45 @@ See the License here . ***********************************************************************/ //--------------------------------------------------------------------------------------------- +function clear_dflt_curr_account($curr_code) { + $sql = "UPDATE ".TB_PREF."bank_accounts SET dflt_curr_act=0 WHERE bank_curr_code=" + .db_escape($curr_code); + db_query($sql, "could not update default currency account"); +} -function add_bank_account($account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number, - $bank_address, $bank_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) { - $sql = "INSERT INTO ".TB_PREF."bank_accounts (account_code, account_type, bank_account_name, bank_name, bank_account_number, bank_address, bank_curr_code) - VALUES (".db_escape($account_code).", $account_type, ".db_escape($bank_account_name).", ".db_escape($bank_name).", ".db_escape($bank_account_number).", - ".db_escape($bank_address).", '$bank_curr_code')"; + 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) + 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_query($sql, "could not add a bank account for $account_code"); } //--------------------------------------------------------------------------------------------- -function update_bank_account($id, $account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number, - $bank_address, $bank_curr_code) +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) { - $sql = "UPDATE ".TB_PREF."bank_accounts SET account_type = $account_type, + if($dflt_curr_act) // only one default account for any currency + clear_dflt_curr_account($bank_curr_code); + + $sql = "UPDATE ".TB_PREF."bank_accounts SET account_type = ".db_escape($account_type).", account_code=".db_escape($account_code).", 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='$bank_curr_code', - bank_address=".db_escape($bank_address)." WHERE id = '$id'"; + 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); db_query($sql, "could not update bank account for $account_code"); } @@ -39,7 +57,7 @@ function update_bank_account($id, $account_code, $account_type, $bank_account_na function delete_bank_account($id) { - $sql = "DELETE FROM ".TB_PREF."bank_accounts WHERE id='$id'"; + $sql = "DELETE FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); db_query($sql,"could not delete bank account for $id"); } @@ -49,7 +67,7 @@ function delete_bank_account($id) function get_bank_account($id) { - $sql = "SELECT * FROM ".TB_PREF."bank_accounts WHERE id='$id'"; + $sql = "SELECT * FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); $result = db_query($sql, "could not retreive bank account for $id"); @@ -57,9 +75,23 @@ function get_bank_account($id) } //--------------------------------------------------------------------------------------------- + +function get_bank_accounts($show_inactive) +{ + $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"; + + return db_query($sql,"could not get bank accounts"); +} + +//--------------------------------------------------------------------------------------------- + function get_bank_gl_account($id) { - $sql = "SELECT account_code FROM ".TB_PREF."bank_accounts WHERE id='$id'"; + $sql = "SELECT account_code FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id); $result = db_query($sql, "could not retreive bank account for $id"); @@ -70,22 +102,23 @@ function get_bank_gl_account($id) //--------------------------------------------------------------------------------------------- -function add_quick_entry($description, $type, $base_amount, $base_desc) +function add_quick_entry($description, $type, $base_amount, $base_desc, $bal_type) { - $sql = "INSERT INTO ".TB_PREF."quick_entries (description, type, base_amount, base_desc) - VALUES (".db_escape($description).", $type, " - .db_escape($base_amount).", ".db_escape($base_desc).")"; + $sql = "INSERT INTO ".TB_PREF."quick_entries (description, type, base_amount, base_desc, bal_type) + VALUES (".db_escape($description).", ".db_escape($type).", " + .db_escape($base_amount).", ".db_escape($base_desc).", ".db_escape($bal_type).")"; db_query($sql, "could not insert quick entry for $description"); } //--------------------------------------------------------------------------------------------- -function update_quick_entry($selected_id, $description, $type, $base_amount, $base_desc) +function update_quick_entry($selected_id, $description, $type, $base_amount, $base_desc, $bal_type) { $sql = "UPDATE ".TB_PREF."quick_entries SET description = ".db_escape($description).", - type=$type, base_amount=".db_escape($base_amount).", base_desc=".db_escape($base_desc)." - WHERE id = $selected_id"; + type=".db_escape($type).", base_amount=".db_escape($base_amount) + .", base_desc=".db_escape($base_desc).", bal_type=".db_escape($bal_type)." + WHERE id = ".db_escape($selected_id); db_query($sql, "could not update quick entry for $selected_id"); } @@ -94,7 +127,7 @@ function update_quick_entry($selected_id, $description, $type, $base_amount, $ba function delete_quick_entry($selected_id) { - $sql = "DELETE FROM ".TB_PREF."quick_entries WHERE id=$selected_id"; + $sql = "DELETE FROM ".TB_PREF."quick_entries WHERE id=".db_escape($selected_id); db_query($sql,"could not delete quick entry $selected_id"); } @@ -106,8 +139,8 @@ function add_quick_entry_line($qid, $action, $dest_id, $amount, $dim, $dim2) $sql = "INSERT INTO ".TB_PREF."quick_entry_lines (qid, action, dest_id, amount, dimension_id, dimension2_id) VALUES - ($qid, ".db_escape($action).",".db_escape($dest_id).", - $amount, $dim, $dim2)"; + (".db_escape($qid).", ".db_escape($action).",".db_escape($dest_id).", + ".db_escape($amount).", ".db_escape($dim).", ".db_escape($dim2).")"; db_query($sql, "could not insert quick entry line for $qid"); } @@ -116,9 +149,11 @@ function add_quick_entry_line($qid, $action, $dest_id, $amount, $dim, $dim2) function update_quick_entry_line($selected_id, $qid, $action, $dest_id, $amount, $dim, $dim2) { - $sql = "UPDATE ".TB_PREF."quick_entry_lines SET qid = $qid, action=".db_escape($action).", - dest_id=".db_escape($dest_id).", amount=$amount, dimension_id=$dim, dimension2_id=$dim2 - WHERE id = $selected_id"; + $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)." + WHERE id = ".db_escape($selected_id); db_query($sql, "could not update quick entry line for $selected_id"); } @@ -127,7 +162,7 @@ function update_quick_entry_line($selected_id, $qid, $action, $dest_id, $amount, function delete_quick_entry_line($selected_id) { - $sql = "DELETE FROM ".TB_PREF."quick_entry_lines WHERE id=$selected_id"; + $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"); } @@ -138,7 +173,7 @@ function has_quick_entries($type=null) { $sql = "SELECT id FROM ".TB_PREF."quick_entries"; if ($type != null) - $sql .= " WHERE type=$type"; + $sql .= " WHERE type=".db_escape($type); $result = db_query($sql, "could not retreive quick entries"); return db_num_rows($result) > 0; @@ -148,7 +183,7 @@ function get_quick_entries($type = null) { $sql = "SELECT * FROM ".TB_PREF."quick_entries"; if ($type != null) - $sql .= " WHERE type=$type"; + $sql .= " WHERE type=".db_escape($type); $sql .= " ORDER BY description"; return db_query($sql, "could not retreive quick entries"); @@ -156,7 +191,7 @@ function get_quick_entries($type = null) function get_quick_entry($selected_id) { - $sql = "SELECT * FROM ".TB_PREF."quick_entries WHERE id=$selected_id"; + $sql = "SELECT * FROM ".TB_PREF."quick_entries WHERE id=".db_escape($selected_id); $result = db_query($sql, "could not retreive quick entry $selected_id"); @@ -173,15 +208,14 @@ function get_quick_entry_lines($qid) LEFT JOIN ".TB_PREF."tax_types ON ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."tax_types.id WHERE - qid=$qid - ORDER by id"; + qid=".db_escape($qid)." ORDER by id"; return db_query($sql, "could not retreive quick entries"); } function has_quick_entry_lines($qid) { - $sql = "SELECT id FROM ".TB_PREF."quick_entry_lines WHERE qid=$qid"; + $sql = "SELECT id FROM ".TB_PREF."quick_entry_lines WHERE qid=".db_escape($qid); $result = db_query($sql, "could not retreive quick entries"); return db_num_rows($result) > 0; @@ -191,7 +225,7 @@ function has_quick_entry_lines($qid) function get_quick_entry_line($selected_id) { - $sql = "SELECT * FROM ".TB_PREF."quick_entry_lines WHERE id=$selected_id"; + $sql = "SELECT * FROM ".TB_PREF."quick_entry_lines WHERE id=".db_escape($selected_id); $result = db_query($sql, "could not retreive quick entry for $selected_id"); @@ -200,4 +234,100 @@ function get_quick_entry_line($selected_id) //--------------------------------------------------------------------------------------------- +function get_max_reconciled($date, $bank_account) +{ + $date = date2sql($date); + // temporary fix to enable fix of invalid entries made in 2.2RC + if ($date == 0) $date = '0000-00-00'; + + $sql = "SELECT MAX(reconciled) as last_date, + SUM(IF(reconciled<='$date', amount, 0)) as end_balance, + SUM(IF(reconciled<'$date', amount, 0)) as beg_balance, + SUM(amount) as total + FROM ".TB_PREF."bank_trans trans + WHERE bank_act=".db_escape($bank_account); + // ." AND trans.reconciled IS NOT NULL"; + + return db_query($sql,"Cannot retrieve reconciliation data"); + +} + +//--------------------------------------------------------------------------------------------- + +function get_ending_reconciled($bank_account, $bank_date) +{ + $sql = "SELECT ending_reconcile_balance + FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($bank_account) + . " AND last_reconciled_date=".db_escape($bank_date); + $result = db_query($sql,"Cannot retrieve last reconciliation"); + return db_fetch($result); +} + +//--------------------------------------------------------------------------------------------- + +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) . " + 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"; + return $sql; +} + +//--------------------------------------------------------------------------------------------- + +function update_reconciled_values($reconcile_id, $reconcile_value, $reconcile_date, $end_balance, $bank_account) +{ + $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=$reconcile_value" + ." WHERE id=".db_escape($reconcile_id); + + db_query($sql, "Can't change reconciliation status"); + // save last reconcilation status (date, end balance) + $sql2 = "UPDATE ".TB_PREF."bank_accounts SET last_reconciled_date='" + .date2sql($reconcile_date)."', + ending_reconcile_balance=$end_balance + WHERE id=".db_escape($bank_account); + + db_query($sql2,"Error updating reconciliation information"); +} +//--------------------------------------------------------------------------------------------- + +function get_default_bank_account($curr) +{ + /* default bank account is selected as first found account from: + . default account in $curr if any + . first defined account in $curr if any + . default account in home currency + . first defined account in home currency + */ + $home_curr = get_company_pref('curr_default'); + + $sql = "SELECT b.*, b.bank_curr_code='$home_curr' as fall_back FROM " + .TB_PREF."bank_accounts b" + ." WHERE b.bank_curr_code=".db_escape($curr) + ." OR b.bank_curr_code='$home_curr' + ORDER BY fall_back, dflt_curr_act desc"; + + $result = db_query($sql, "could not retreive default bank account"); + + return db_fetch($result); +} +//--------------------------------------------------------------------------------------------- +// +// This function returns current allowed bank payment limit, or null if limit is not set. +// As of FA 2.3 check is done only on cash account, for which limit is bank amount as of the date selected. +// +function get_bank_account_limit($account, $date, $user=null) +{ +// $user = current_user(); + + $bankacc = get_bank_account($account); + if ($bankacc['account_type'] != BT_CASH) + return null; + return max(0, get_balance_before_for_bank_account($account, add_days($date,1))); // in case of manco made before the check was implemented +} + ?> \ No newline at end of file