return $result;
}
-function get_cust_account_home_balance($debtor_no, $rec_account, $to_date)
-{
- $to = date2sql($to_date);
-
- $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans t
- WHERE t.person_id=".db_escape($debtor_no)." AND t.account='$rec_account'
- AND person_type_id=".PT_CUSTOMER." AND t.tran_date <= '$to'";
- $result = db_query($sql, "The AR balance for customer $debtor_no could not be calculated");
- $row = db_fetch_row($result);
- return $row[0];
-}
-
function get_supp_account_curr_balances($date)
{
$to = date2sql($date);
return $result;
}
-function get_supp_account_home_balance($supplier_id, $rec_account, $to_date)
+function get_account_home_balance($person_id, $person_type, $rec_account, $to_date)
{
$to = date2sql($to_date);
- $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans t
- WHERE t.person_id=".db_escape($supplier_id)." AND t.account='$rec_account'
- AND person_type_id=".PT_SUPPLIER." AND t.tran_date <= '$to'";
- $result = db_query($sql, "The AP balance for customer $supplier_id could not be calculated");
+ $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
+ WHERE person_id=".db_escape($person_id)." AND account='$rec_account'
+ AND person_type_id=$person_type AND tran_date <= '$to'";
+ $result = db_query($sql, "The AR/AP balance for customer $person_id could not be calculated");
$row = db_fetch_row($result);
return $row[0];
}
{
$exrate = get_exchange_rate_from_home_currency($row['curr_code'], $date);
$foreign = round2($row['amount']*$exrate, user_price_dec());
- $home = round2(get_cust_account_home_balance($row['debtor_no'], $row['receivables_account'], $date), user_price_dec());
+ $home = round2(get_account_home_balance($row['debtor_no'], PT_CUSTOMER, $row['receivables_account'], $date), user_price_dec());
if ($foreign != $home)
{
$amount = $foreign - $home;
{
$exrate = get_exchange_rate_from_home_currency($row['curr_code'], $date);
$foreign = round2($row['amount']*$exrate, user_price_dec());
- $home = round2(get_supp_account_home_balance($row['supplier_id'], $row['payable_account'], $date), user_price_dec());
+ $home = round2(get_account_home_balance($row['supplier_id'], PT_SUPPLIER, $row['payable_account'], $date), user_price_dec());
if ($foreign != $home)
{
$amount = $foreign - $home;
}
}
//------------- END
-
+
commit_transaction();
return array(($exchanged ? $trans_no : 0), $je);
}
'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);
+ $aid = 0;
+ if ($trans_no) {
+ $old_trans = $trans_no;
+ $Refs->restore_last($trans_type, $trans_no);
+ $aid = has_attachment($trans_type, $trans_no);
+ }
$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, $trans_no, $person_id, $person_detail_id, $date_,
+ $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
$ref, $cust_amount);
}
// we need to negate it too
$supp_amount = -$supp_amount;
- $trans_no = write_supp_trans($trans_type, $trans_no, $person_id, $date_, '',
+ $trans_no = write_supp_trans($trans_type, 0, $person_id, $date_, '',
$ref, "", $supp_amount, 0, 0);
}
else
{
- if (!$trans_no)
- $trans_no = get_next_trans_no($trans_type);
+ $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);
}
-
+ if ($aid != 0)
+ {
+ $row = get_attachment($aid);
+ update_attachment($aid, $row['type_no'], $trans_no, $row['description'],
+ $row['filename'], $row['unique_name'], $row['filesize'], $row['filetype']);
+ }
// do the source account postings
add_bank_trans($trans_type, $trans_no, $from_account, $ref,
{
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
$amount = $gl_item->amount;
$ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
-
+
add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, -$amount,
$ex_rate, $date_, $memo_);
}
{
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_);
+ // old transaction can be voided only after new transaction is entered,
+ // otherwise the operation could fail for cash accounts due to temporary negative balance
+ if (@$old_trans)
+ void_transaction($trans_type, $old_trans, Today(), _("Document reentered."));
+
$args->trans_no = $trans_no;
hook_db_postwrite($args, $trans_type);
if ($use_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