See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
function add_exchange_variation($trans_no, $date_, $acc_id, $account,
- $currency, $person_type_id=null, $person_id = "")
+ $currency, $person_type_id=null, $person_id = "", $memo='')
{
if (is_company_currency($currency))
return false;
begin_transaction();
$trans_no = get_next_trans_no(ST_JOURNAL);
- $ref = $Refs->get_next(ST_JOURNAL);
+ $ref = $Refs->get_next(ST_JOURNAL, null, $date_);
add_journal(ST_JOURNAL, $trans_no, $diff, $date_ , get_company_currency(), $ref, '', 1, $date_, $date_);
$Refs->save(ST_JOURNAL, $trans_no, $ref);
-$diff, null, $person_type_id, $person_id);
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);
+ _("Exchange Variance"), $diff, null, $person_type_id, $person_id);
+
+ if ($memo)
+ add_comments(ST_JOURNAL, $trans_no, $date_, $memo);
+
+ $Refs->save(ST_JOURNAL, $trans_no, $ref);
+ add_audit_trail(ST_JOURNAL, $trans_no, $date_);
+
commit_transaction();
return true;
}
$row = db_fetch_row($result);
return $row[0];
}
-//------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
-function add_exchange_variation_all($date=null, $ref="", $memo)
+//
+// Calculate and post currency accounts revaluation including foreign AP/AR
+// Note: in 2.4.9 sparse 'ref' argument was removed (generated transactions use
+// next references from default refline).
+//
+function add_exchange_variation_all($date=null, $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");
+ $b_num = 0;
while ($myrow = db_fetch($result))
{
if (add_exchange_variation($trans_no, $date, $myrow['id'], $myrow['account_code'],
- $myrow['bank_curr_code']))
- $exchanged = true;
+ $myrow['bank_curr_code'], null, '', $memo))
+ $b_num++;
}
- if ($exchanged)
- {
- add_comments(ST_JOURNAL, $trans_no, $date, $memo);
- if ($ref == "")
- $ref = $Refs->get_next(ST_JOURNAL, null, $date);
- $Refs->save(ST_JOURNAL, $trans_no, $ref);
- add_audit_trail(ST_JOURNAL, $trans_no, $date);
- }
- //------------- BEGIN inserted for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
+ // revaluation of customer/supplier currencies
+
if ($date == null)
$date = Today();
$exchange_act = get_company_pref('exchange_diff_act');
$je++;
}
}
- //------------- END
commit_transaction();
- return array(($exchanged ? $trans_no : 0), $je);
+ return array($b_num, $je);
}
//----------------------------------------------------------------------------------
// Add bank tranfer to database.
$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, $person_id,
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;
+ add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account,
+ $currency, PT_MISC, $person_id);
}
if ($charge != 0)
{
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, null, $date_);
- $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
- add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+ add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account,
+ $currency, PT_MISC, $person_id);
}
add_comments($trans_type, $trans_no, $date_, $memo_);
{
begin_transaction();
delete_comments(ST_BANKTRANSFER, $trans_no);
- void_transaction(ST_BANKTRANSFER, $trans_no, Today(), _("Document reentered."));
+ void_transaction(ST_BANKTRANSFER, $trans_no, $date_, _("Document reentered."));
void_gl_trans(ST_BANKTRANSFER, $trans_no, true);
$new_trans_no = add_bank_transfer(
$from_account, $to_account, $date_, $amount,
display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
$do_exchange_variance = false;
- $exchanged = false;
if ($use_transaction)
begin_transaction();
}
// do the source account postings
- add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, $memo_,
+ add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, $gl_item->dimension_id, $gl_item->dimension2_id, $memo_,
-$total, null, $person_type_id, $person_id);
if ($do_exchange_variance)
{
- 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, null, $date_);
- $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
- add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
- }
+ add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account,
+ $currency, $person_type_id, $person_id);
}
add_comments($trans_type, $trans_no, $date_, $memo_);
// otherwise the operation could fail for cash accounts due to temporary negative balance
if ($old_trans)
{
- $msg = void_transaction($trans_type, $old_trans, Today(), _("Document reentered."));
+ $msg = void_transaction($trans_type, $old_trans, $date_, _("Document reentered."));
if ($msg)
{
display_error($msg);