// if $currency is not set, then defaults to no conversion
function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
- $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="")
+ $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="", $rate=0)
{
+ global $use_audit_trail;
+
$date = date2sql($date_);
if ($currency != null)
- $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+ {
+ if ($rate == 0)
+ $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+ else
+ $amount_in_home_currency = round2($amount * $rate, user_price_dec());
+ }
else
- $amount_in_home_currency = $amount;
+ $amount_in_home_currency = round2($amount, user_price_dec());
if ($dimension == null || $dimension < 0)
$dimension = 0;
if ($dimension2 == null || $dimension2 < 0)
$dimension2 = 0;
+ if (isset($use_audit_trail) && $use_audit_trail)
+ {
+ if ($memo_ == "" || $memo_ == null)
+ $memo_ = $_SESSION["wa_current_user"]->username;
+ else
+ $memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
+ }
$sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
account, dimension_id, dimension2_id, memo_, amount";
$sql .= ") ";
$sql .= "VALUES ($type, $trans_id, '$date',
- $account, $dimension, $dimension2, '$memo_', $amount_in_home_currency";
+ '$account', $dimension, $dimension2, ".db_escape($memo_).", $amount_in_home_currency";
if ($person_type_id != null)
- $sql .= ", $person_type_id, '$person_id'";
+ $sql .= ", $person_type_id, ". db_escape($person_id);
$sql .= ") ";
if ($err_msg == "")
$err_msg = "The GL transaction could not be inserted";
- return db_query($sql, $err_msg);
+ db_query($sql, $err_msg);
+ return $amount_in_home_currency;
}
//--------------------------------------------------------------------------------
// $date_ is display date (non-sql)
// $amount is in HOME currency
-function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
+function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
$memo_, $amount, $person_type_id=null, $person_id=null, $err_msg="")
{
if ($amount != 0)
return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
$amount, null, $person_type_id, $person_id, $err_msg);
else
- return null;
+ return 0;
}
+// Function for even out rounding problems
+function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, $person_id=null)
+{
+ $amount = round2($amount, user_price_dec());
+ if ($amount != 0)
+ return add_gl_trans($type, $trans_id, $date_, get_company_pref('exchange_diff_act'), 0, 0, "",
+ $amount, null, $person_type_id, $person_id, "The balanced GL transaction could not be inserted");
+ else
+ return 0;
+}
+
//--------------------------------------------------------------------------------
function get_gl_transactions($from_date, $to_date, $trans_no=0,
$sql .= " AND ".TB_PREF."gl_trans.type_no LIKE '%$trans_no'";
if ($account != null)
- $sql .= " AND ".TB_PREF."gl_trans.account = $account";
+ $sql .= " AND ".TB_PREF."gl_trans.account = '$account'";
if ($dimension > 0)
$sql .= " AND ".TB_PREF."gl_trans.dimension_id = $dimension";
$to = date2sql($to_date);
$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
- WHERE account='" . $account . "'";
+ WHERE account='$account'";
if ($from_date != "")
$sql .= " AND tran_date > '$from'";
if ($to_date != "")
$to = date2sql($to_date);
$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
- WHERE account='" . $account . "'";
+ WHERE account='$account'";
if ($from_date != "")
$sql .= " AND tran_date >= '$from'";
if ($to_date != "")
//--------------------------------------------------------------------------------
-function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
+function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
{
$from = date2sql($from_date);
$to = date2sql($to_date);
-
+
$sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
- WHERE account=$account ";
- if ($from_date != "")
+ WHERE account='$account' ";
+ if ($from_date != "")
$sql .= " AND tran_date >= '$from' ";
- if ($to_date != "")
+ if ($to_date != "")
$sql .= " AND tran_date <= '$to' ";
if ($dimension > 0)
$sql .= " AND dimension_id = $dimension";
$trans_type = systypes::journal_entry();
$trans_id = get_next_trans_no($trans_type);
- foreach ($items as $journal_item)
+ foreach ($items as $journal_item)
{
+ // post to first found bank account using given gl acount code.
$is_bank_to = is_bank_account($journal_item->code_id);
- add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
- $journal_item->dimension_id, $journal_item->dimension2_id,
+ add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
+ $journal_item->dimension_id, $journal_item->dimension2_id,
$journal_item->reference, $journal_item->amount);
- if ($is_bank_to)
+ if ($is_bank_to)
{
- add_bank_trans($trans_type, $trans_id, $journal_item->code_id, $ref,
- $date_, 3, $journal_item->amount,
- 0, "", get_company_currency(),
- "Cannot insert a destination bank transaction");
- }
+ add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref,
+ $date_, $journal_item->amount,
+ 0, "", get_company_currency(),
+ "Cannot insert a destination bank transaction");
+ }
}
add_comments($trans_type, $trans_id, $date_, $memo_);
references::save($trans_type, $trans_id, $ref);
- if ($reverse)
+ if ($reverse)
{
- $reversingDate = date(user_date_display(),
- Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
+ //$reversingDate = date(user_date_display(),
+ // Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
+ $reversingDate = begin_month(add_months($date_, 1));
$trans_id_reverse = get_next_trans_no($trans_type);
- foreach ($items as $journal_item)
+ foreach ($items as $journal_item)
{
$is_bank_to = is_bank_account($journal_item->code_id);
add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
- $journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
+ $journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
$journal_item->reference, -$journal_item->amount);
- if ($is_bank_to)
+ if ($is_bank_to)
{
- add_bank_trans($trans_type, $trans_id_reverse, $journal_item->code_id, $ref,
- $reversingDate, 3, $journal_item->amount,
- 0, "", get_company_currency(),
- "Cannot insert a destination bank transaction");
- }
+ add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref,
+ $reversingDate, $journal_item->amount,
+ 0, "", get_company_currency(),
+ "Cannot insert a destination bank transaction");
+ }
}
add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);
projects / fa-stable.git / blobdiff