// 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="", $rate=0)
+ $amount, $currency=null, $person_type_id=null, $person_id=null, $rate=0)
{
global $SysPrefs;
$sql .= ") ";
- if ($err_msg == "")
- $err_msg = "The GL transaction could not be inserted";
-
- db_query($sql, $err_msg);
+ db_query($sql, "The GL transaction could not be inserted");
return $amount_in_home_currency;
}
// $amount is in HOME currency
function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
- $memo_, $amount, $person_type_id=null, $person_id=null, $err_msg="")
+ $memo_, $amount, $person_type_id=null, $person_id=null)
{
if ($amount != 0)
return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
- $amount, null, $person_type_id, $person_id, $err_msg);
+ $amount, null, $person_type_id, $person_id);
else
return 0;
}
{
error_log(sprintf( _("Rounding error %s encountered for trans_type:%s,trans_no:%s"), $amount, $type, $trans_id));
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");
+ $amount, null, $person_type_id, $person_id);
} else
return 0;
}
//--------------------------------------------------------------------------------
// Stores journal/bank transaction tax details if applicable
//
-function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null)
+function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null, $tax_group_id=null)
{
$tax_type = is_tax_account($gl_code);
if(!$tax_type) return; // $gl_code is not tax account
}
}
add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included,
- $amount, $net_amount, $ex_rate, $date, $memo, null);
+ $amount, $net_amount, $ex_rate, $date, $memo, null, $tax_group_id);
}
// actual tax type rate.
//
function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included,
- $amount, $net_amount, $ex_rate, $tran_date, $memo, $reg_type=null)
+ $amount, $net_amount, $ex_rate, $tran_date, $memo, $reg_type=null, $tax_group_id=null, $vat_category=0)
{
// guess tax register if not set
if (!isset($reg_type))
$sql = "INSERT INTO ".TB_PREF."trans_tax_details
(trans_type, trans_no, tran_date, tax_type_id, rate, ex_rate,
- included_in_price, net_amount, amount, memo, reg_type)
+ included_in_price, net_amount, amount, memo, reg_type, tax_group_id, vat_category)
VALUES (".db_escape($trans_type)."," . db_escape($trans_no).",'"
.date2sql($tran_date)."',"
.(int)($tax_id).","
.(float)($rate).","
.(float)($ex_rate).",".($included ? 1:0).","
.db_escape($net_amount).","
- .db_escape($amount).",".db_escape($memo).",".db_escape($reg_type, true).")";
+ .db_escape($amount).","
+ .db_escape($memo).","
+ .db_escape($reg_type, true).","
+ .db_escape($tax_group_id).","
+ .db_escape($vat_category).")";
db_query($sql, "Cannot save trans tax details");
function get_trans_tax_details($trans_type, $trans_no)
{
- $sql = "SELECT tax_details.*, tax_type.name AS tax_type_name, tax_type.rate AS rate
- FROM ".TB_PREF."trans_tax_details tax_details INNER JOIN
- ".TB_PREF."tax_types tax_type ON tax_type.id = tax_details.tax_type_id
+ $sql = "SELECT tax_details.*, SUM(tax_details.amount) amount, SUM(tax_details.net_amount) as net_amount,
+ tax_type.name AS tax_type_name, tax_type.rate AS rate
+ FROM ".TB_PREF."trans_tax_details tax_details
+ LEFT JOIN ".TB_PREF."tax_types tax_type ON tax_type.id = tax_details.tax_type_id
WHERE
trans_type = ".db_escape($trans_type)."
AND trans_no = ".db_escape($trans_no)."
- AND (net_amount != 0 OR amount != 0)";
+ AND (net_amount != 0 OR amount != 0)
+ GROUP BY tax_type_id";
return db_query($sql, "The transaction tax details could not be retrieved");
}
SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
IF((reg_type=".TR_OUTPUT.")"
." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
- ), net_amount*ex_rate,0)
+ AND (tgroup.tax_area=".TA_EU." OR (tgroup.tax_area=".TA_EXPORT." AND taxrec.vat_category=".VC_SERVICES.")
+ OR taxrec.vat_category=".VC_REVERSE."))"
+ .($also_zero_purchases ? '': " AND tax_type_id AND taxrec.rate")
+ ."), net_amount*ex_rate,0)
) net_output,
SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
IF((reg_type=".TR_OUTPUT.")"
." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+ AND (tgroup.tax_area=".TA_EU." OR (tgroup.tax_area=".TA_EXPORT." AND taxrec.vat_category=".VC_SERVICES.")
+ OR taxrec.vat_category=".VC_REVERSE.")
), amount*ex_rate,0)) payable,
SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*
IF(reg_type=".TR_INPUT
. ($also_zero_purchases ? '': " AND tax_type_id AND taxrec.rate")
- .", net_amount*ex_rate, 0)) net_input,
+ ." AND vat_category!=".VC_NONDEDUCT.", net_amount*ex_rate, 0)) net_input,
SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*
IF(reg_type=".TR_INPUT
. ($also_zero_purchases ? '': " AND tax_type_id AND taxrec.rate ")
- .", amount*ex_rate, 0)) collectible,
+ ." AND vat_category!=".VC_NONDEDUCT.", amount*ex_rate, 0)) collectible,
taxrec.rate,
ttype.id,
ttype.name
FROM ".TB_PREF."trans_tax_details taxrec LEFT JOIN ".TB_PREF."tax_types ttype ON taxrec.tax_type_id=ttype.id
+ LEFT JOIN ".TB_PREF."tax_groups tgroup ON taxrec.tax_group_id=tgroup.id
WHERE taxrec.trans_type IN (".implode(',',
array(ST_SALESINVOICE, ST_CUSTCREDIT, ST_SUPPINVOICE, ST_SUPPCREDIT, ST_JOURNAL)).")
AND taxrec.tran_date >= '$fromdate'
projects / fa-stable.git / blobdiff