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)
{
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");
}
//---------------------------------------------------------------------------------------------
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)
{
if($dflt_curr_act) // only one default account for any currency
clear_dflt_curr_account($bank_curr_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=".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");
}
//---------------------------------------------------------------------------------------------
-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
//---------------------------------------------------------------------------------------------
-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)
+{
+ $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");
}
//---------------------------------------------------------------------------------------------
-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)
{
$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");
//---------------------------------------------------------------------------------------------
-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)
{
$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");
}
//---------------------------------------------------------------------------------------------
-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)
{
$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");
}
//---------------------------------------------------------------------------------------------
-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
. 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"
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];
+}
+