MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $account,
+function add_exchange_variation($trans_no, $date_, $acc_id, $account,
$currency, $person_type_id=null, $person_id = "")
{
if (is_company_currency($currency))
- return;
+ return false;
if ($date_ == null)
$date_ = Today();
- $rate = get_exchange_rate_from_home_currency($currency, $date_);
- $for_amount = $amount = 0;
- // We had to split up the SQL statements to retrieve the correct GL counter-parts
- // 2010-02-19 Joe Hunt with help of Ary Wibowo
- $sql = "SELECT bt.*, bt.amount AS for_amount, ba.account_code
+ $for_amount = 0;
+
+ // We have to calculate all the currency accounts belonging to the GL account
+ // upto $date_ and calculate with the exchange rates. And then compare with the GL account balance.
+ // 2010-02-23 Joe Hunt with help of Ary Wibowo
+ $sql = "SELECT SUM(bt.amount) AS for_amount, ba.bank_curr_code
FROM ".TB_PREF."bank_trans bt, ".TB_PREF."bank_accounts ba
- WHERE ba.id = bt.bank_act AND bt.bank_act=".db_escape($acc_id)." AND bt.trans_date<='".date2sql($date_)."'
- ORDER BY bt.type, bt.trans_no";
+ WHERE ba.id = bt.bank_act AND ba.account_code = ".db_escape($account)." AND bt.trans_date<='".date2sql($date_)."'
+ GROUP BY ba.bank_curr_code";
$result = db_query($sql, "Transactions for bank account $acc_id could not be calculated");
while ($row = db_fetch($result))
{
- $for_amount += $row['for_amount'];
-
- $sql2 = "SELECT SUM(IF(((gt.amount < 0 AND ".$row['for_amount']." < 0) OR (gt.amount >= 0 AND ".$row['for_amount']." >= 0)),
- gt.amount, 0)) AS amount FROM ".TB_PREF."gl_trans gt
- WHERE gt.account = '".$row['account_code']."' AND gt.type = ".$row['type']."
- AND gt.type_no = ".$row['trans_no']." AND gt.tran_date = '".$row['trans_date']."'";
- $res = db_query($sql2, "Transactions for GL account ".$row['account_code']." could not be calculated");
- $row2 = db_fetch_row($res);
- $amount += $row2[0];
+ if ($row['for_amount'] == 0)
+ continue;
+ $rate = get_exchange_rate_from_home_currency($row['bank_curr_code'], $date_);
+ $for_amount += round2($row['for_amount'] * $rate, user_price_dec());
}
- $diff = $amount - (round2($for_amount * $rate, user_price_dec()));
+ $amount = get_gl_trans_from_to("", $date_, $account);
+ $diff = $amount - $for_amount;
if ($diff != 0)
{
- if ($trans_type == null)
- $trans_type = ST_JOURNAL;
if ($trans_no == null)
- $trans_no = get_next_trans_no($trans_type);
+ $trans_no = get_next_trans_no(ST_JOURNAL);
if ($person_type_id == null)
$person_type_id = PT_MISC;
- add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"),
+ add_gl_trans(ST_JOURNAL, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"),
-$diff, null, $person_type_id, $person_id);
- add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0,
+ add_gl_trans(ST_JOURNAL, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0,
_("Exchange Variance"), $diff, null, $person_type_id, $person_id);
- }
+ }
+ return ($diff != 0);
}
-function add_exchange_variation_all()
+function add_exchange_variation_all($date=null, $ref="", $memo)
{
+ global $Refs;
+ begin_transaction();
+ $exchanged = false;
$trans_no = get_next_trans_no(ST_JOURNAL);
$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
$result = db_query($sql, "could not retreive bank accounts");
while ($myrow = db_fetch($result))
- add_exchange_variation(ST_JOURNAL, $trans_no, null, $myrow['id'], $myrow['account_code'],
- $myrow['currency_code']);
+ {
+ if (add_exchange_variation($trans_no, $date, $myrow['id'], $myrow['account_code'],
+ $myrow['bank_curr_code']))
+ $exchanged = true;
+ }
+ if ($exchanged)
+ {
+ add_comments(ST_JOURNAL, $trans_no, $date, $memo);
+ if ($ref == "")
+ $ref = $Refs->get_next(ST_JOURNAL);
+ $Refs->save(ST_JOURNAL, $trans_no, $ref);
+ add_audit_trail(ST_JOURNAL, $trans_no, $date);
+ }
+ commit_transaction();
+ return ($exchanged ? $trans_no : 0);
}
//----------------------------------------------------------------------------------
// Add bank tranfer to database.
function add_bank_transfer($from_account, $to_account, $date_,
$amount, $ref, $memo_, $charge=0)
{
- global $Refs;
+ global $Refs, $SysPrefs;
begin_transaction();
+ $args = func_get_args(); if (count($args) < 7) $args[] = 0;
+ $args = (object)array_combine(array('from_account', 'to_account', 'date_', 'amount',
+ 'ref', 'memo_', 'charge'), $args);
+ $args->trans_no = 0;
+ hook_db_prewrite($args, ST_BANKTRANSFER);
$trans_type = ST_BANKTRANSFER;
$currency = get_bank_account_currency($from_account);
$trans_no = get_next_trans_no($trans_type);
+
+ $fromact = get_bank_account($from_account);
+ $toact = get_bank_account($to_account);
+ $person_id = _("From")." ".$fromact['bank_account_name']." "._("To")." ".$toact['bank_account_name'];
$from_gl_account = get_bank_gl_account($from_account);
$to_gl_account = get_bank_gl_account($to_account);
-
+
+ $exchanged = false;
$total = 0;
// do the source account postings
- $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "",
+ $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, $person_id,
-($amount + $charge), $currency);
add_bank_trans($trans_type, $trans_no, $from_account, $ref,
$date_, -($amount + $charge),
- PT_MISC, "", $currency,
+ PT_MISC, $person_id, $currency,
"Cannot insert a source bank transaction");
-
- add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account,
- $currency, PT_MISC, "");
-
+ if ($SysPrefs->auto_currency_revaluation())
+ {
+ $trans_no1 = get_next_trans_no(ST_JOURNAL);
+ if (add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account,
+ $currency, PT_MISC, $person_id))
+ $exchanged = true;
+ }
if ($charge != 0)
{
/* Now Debit bank charge account with charges */
$charge_act = get_company_pref('bank_charge_act');
$total += add_gl_trans($trans_type, $trans_no, $date_,
- $charge_act, 0, 0, "", $charge, $currency);
+ $charge_act, 0, 0, $person_id, $charge, $currency);
}
// do the destination account postings
- $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "",
+ $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, $person_id,
$amount, $currency);
/*Post a balance post if $total != 0 */
add_gl_balance($trans_type, $trans_no, $date_, -$total);
add_bank_trans($trans_type, $trans_no, $to_account, $ref,
- $date_, $amount, PT_MISC, "",
+ $date_, $amount, PT_MISC, $person_id,
$currency, "Cannot insert a destination bank transaction");
- $currency = get_bank_account_currency($to_account);
-
- add_exchange_variation($trans_type, $trans_no, $date_, $to_account, $to_gl_account,
- $currency, PT_MISC, "");
+ if ($SysPrefs->auto_currency_revaluation())
+ {
+ $currency = get_bank_account_currency($to_account);
+ if (add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account,
+ $currency, PT_MISC, $person_id))
+ $exchanged = true;
+ }
+ if ($exchanged == true)
+ {
+ $ref1 = $Refs->get_next(ST_JOURNAL);
+ $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
+ add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+ }
add_comments($trans_type, $trans_no, $date_, $memo_);
$Refs->save($trans_type, $trans_no, $ref);
add_audit_trail($trans_type, $trans_no, $date_);
+ $args->trans_no = $trans_no;
+ hook_db_postwrite($args, ST_BANKTRANSFER);
commit_transaction();
return $trans_no;
}
-
//----------------------------------------------------------------------------------
// Add bank payment or deposit to database.
//
// $person_detail_id - customer branch id or not used
//
// returns an array of (inserted trans type, trans no)
-
-function add_bank_transaction($trans_type, $from_account, $items, $date_,
+//
+// FIXME -revise code for update case
+//
+function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $date_,
$person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true)
{
- global $Refs;
+ global $Refs, $SysPrefs;
// we can only handle type 1 (payment)and type 2 (deposit)
if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT)
display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
$do_exchange_variance = false;
-
+ $exchanged = false;
if ($use_transaction)
begin_transaction();
+ $args = func_get_args(); if (count($args) < 11) $args[] = true;
+ $args = (object)array_combine(array('trans_type', 'trans_no', 'from_account', 'items', 'date_',
+ 'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction'),
+ $args);
+ hook_db_prewrite($args, $trans_type);
+
+ if ($trans_no)
+ clear_bank_transaction($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id);
+
$currency = get_bank_account_currency($from_account);
$bank_gl_account = get_bank_gl_account($from_account);
// we need to negate it too
$cust_amount = -$cust_amount;
- $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
+ $trans_no = write_customer_trans($trans_type, $trans_no, $person_id, $person_detail_id, $date_,
$ref, $cust_amount);
}
// we need to negate it too
$supp_amount = -$supp_amount;
- $trans_no = add_supp_trans($trans_type, $person_id, $date_, '',
- $ref, "", $supp_amount, 0, 0);
+ $trans_no = write_supp_trans($trans_type, $trans_no, $person_id, $date_, '',
+ $ref, "", $supp_amount, 0, 0);
}
else
{
- $trans_no = get_next_trans_no($trans_type);
- $do_exchange_variance = true;
+ if (!$trans_no)
+ $trans_no = get_next_trans_no($trans_type);
+ $do_exchange_variance = $SysPrefs->auto_currency_revaluation();
+ if ($do_exchange_variance)
+ $trans_no1 = get_next_trans_no(ST_JOURNAL);
}
// do the source account postings
$person_type_id, $person_id, $currency,
"Cannot insert a destination bank transaction");
if ($do_exchange_variance)
- add_exchange_variation($trans_type, $trans_no, $date_, $is_bank_to, $gl_item->code_id,
+ {
+ add_exchange_variation($trans_no1, $date_, $is_bank_to, $gl_item->code_id,
$currency, $person_type_id, $person_id);
+ }
}
// store tax details if the gl account is a tax account
-$total, null, $person_type_id, $person_id);
if ($do_exchange_variance)
- add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $bank_gl_account,
- $currency, $person_type_id, $person_id);
+ {
+ if ($exchanged || add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account,
+ $currency, $person_type_id, $person_id))
+ {
+ $ref1 = $Refs->get_next(ST_JOURNAL);
+ $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
+ add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+ }
+ }
add_comments($trans_type, $trans_no, $date_, $memo_);
$Refs->save($trans_type, $trans_no, $ref);
add_audit_trail($trans_type, $trans_no, $date_);
+ $args->trans_no = $trans_no;
+ hook_db_postwrite($args, $trans_type);
if ($use_transaction)
commit_transaction();
return array($trans_type, $trans_no);
}
-
//----------------------------------------------------------------------------------------
+function clear_bank_transaction($type, $type_no)
+{
+
+ hook_db_prevoid($type, $type_no);
+
+ $sql = "DELETE FROM ".TB_PREF."bank_trans
+ WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+
+ $result = db_query($sql, "could not clear bank transactions for type=$type and trans_no=$type_no");
+
+ clear_gl_trans($type, $type_no, true);
+
+ // in case it's a customer trans - probably better to check first
+ void_cust_allocations($type, $type_no);
+
+ // in case it's a supplier trans - probably better to check first
+ void_supp_allocations($type, $type_no);
+ clear_supp_trans($type, $type_no);
+
+ clear_trans_tax_details($type, $type_no);
+
+ delete_comments($type, $type_no);
+}
+
?>
\ No newline at end of file
projects / fa-stable.git / blobdiff