}
if (!is_subledger_account($account) || $account==get_company_pref('grn_clearing_act'))
$person_id = $person_type_id = null;
-
+
$sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
account, dimension_id, dimension2_id, memo_, amount";
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);
WHERE coa.account_code=gl.account
AND ISNULL(v.date_)
AND gl.tran_date >= '$from'
- AND gl.tran_date <= '$to'";
- if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
- $sql .= " AND gl.amount <> 0";
+ AND gl.tran_date <= '$to'
+ AND gl.amount <> 0";
if ($person_id)
$sql .= " AND gl.person_id=".db_escape($person_id);
function get_gl_trans($type, $trans_id)
{
- $sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference, user.real_name,
- IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
+ $sql = "SELECT gl.*, cm.account_name, IFNULL(refs.reference, '') AS reference, user.real_name,
+ COALESCE(st.tran_date, dt.tran_date, bt.trans_date, grn.delivery_date, gl.tran_date) as doc_date,
IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference
FROM ".TB_PREF."gl_trans as gl
LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code
//--------------------------------------------------------------------------------
-function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1, $all_gl=false)
{
- $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM "
+ $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_
+ FROM "
.TB_PREF."wo_costing costing, "
.TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type AND gl.type_no=com.id,"
.TB_PREF."chart_master chart
AND gl.type_no=costing.trans_no";
if ($cost_type != -1)
$sql .= " AND costing.cost_type=".db_escape($cost_type);
- $sql .= " AND amount < 0";
+ $sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+
+ return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_issue_trans($trans_id, $person_id=-1, $all_gl=false)
+{
+ $sql = "SELECT issue.*, gl.*, chart.account_name, com.memo_
+ FROM "
+ .TB_PREF."wo_issues issue,"
+ .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type AND gl.type_no=com.id,"
+ .TB_PREF."chart_master chart
+ WHERE issue.workorder_id=".db_escape($trans_id)
+ ." AND chart.account_code=gl.account
+ AND gl.type=".ST_MANUISSUE." AND gl.type_no=issue.issue_no";
+// ." AND gl.person_type_id=".PT_WORKORDER;
+ if ($person_id != -1)
+ $sql .= " AND gl.person_id=".db_escape($person_id);
+ $sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+ $sql .= " ORDER BY type, type_no";
+ return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_productions($trans_id, $all_gl=false)
+{
+ $sql = "SELECT rcv.*, gl.*, chart.account_name, com.memo_
+ FROM "
+ .TB_PREF."wo_manufacture rcv, "
+ .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type AND gl.type_no=com.id,"
+ .TB_PREF."chart_master chart
+ WHERE
+ rcv.workorder_id=".db_escape($trans_id)
+ ." AND chart.account_code=gl.account
+ AND gl.type=".ST_MANURECEIVE."
+ AND gl.type_no=rcv.id
+ AND amount != 0 "
+ .($all_gl ? " AND amount != 0" : " AND amount < 0")
+ ." ORDER BY type, type_no";
return db_query($sql, "The gl transactions could not be retrieved");
}
if ($to_date != "")
$sql .= " AND tran_date < '$to'";
if ($dimension != 0)
- $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+ $sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
if ($dimension2 != 0)
- $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+ $sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
$result = db_query($sql, "The starting balance for account $account could not be calculated");
if ($to_date != "")
$sql .= " AND tran_date <= '$to'";
if ($dimension != 0)
- $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+ $sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
if ($dimension2 != 0)
- $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+ $sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
$result = db_query($sql, "Transactions for account $account could not be calculated");
//----------------------------------------------------------------------------------------------------
function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true)
{
- $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit,
- SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance
- FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,"
- .TB_PREF."chart_types, ".TB_PREF."chart_class
- WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND "
- .TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id
- AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
-
- if ($account != null)
- $sql .= " account=".db_escape($account)." AND";
- if ($dimension != 0)
- $sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND";
- if ($dimension2 != 0)
- $sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND";
$from_date = date2sql($from);
- if ($from_incl)
- $sql .= " tran_date >= '$from_date' AND";
- else
- $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND";
$to_date = date2sql($to);
- if ($to_incl)
- $sql .= " tran_date <= '$to_date' ";
- else
- $sql .= " tran_date < '$to_date' ";
+
+ $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit,
+ SUM(IF(amount < 0, -amount, 0)) as credit,
+ SUM(amount) as balance
+ FROM ".TB_PREF."gl_trans trans,"
+ .TB_PREF."chart_master coa,"
+ .TB_PREF."chart_types act_type, "
+ .TB_PREF."chart_class act_class
+ WHERE trans.account=coa.account_code
+ AND coa.account_type=act_type.id
+ AND act_type.class_id=act_class.cid"
+ ." AND ".($from_incl ? "tran_date >= '$from_date'" : "tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date')")
+ ." AND ".($to_incl ? "tran_date <= '$to_date'" : "tran_date < '$to_date'")
+ .($account == null ? '' : " AND account=".db_escape($account))
+ .($dimension == 0 ? '' : " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension)))
+ .($dimension2 == 0 ? '' : " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2)));
$result = db_query($sql,"No general ledger accounts were returned");
$from = date2sql($from_date);
$to = date2sql($to_date);
- $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
+ $sql = "SELECT SUM(amount)
+ FROM ".TB_PREF."budget_trans
WHERE account=".db_escape($account);
if ($from_date != "")
$sql .= " AND tran_date >= '$from' ";
if(!$tax_type) return; // $gl_code is not tax account
$tax = get_tax_type($tax_type);
- //if ($gl_code == $tax['sales_gl_code'])
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT)
$amount = -$amount;
// we have to restore net amount as we cannot know the base amount
if ($net_amount===null) {
if ($tax['rate'] == 0) {
-// display_warning(_("You should not post gl transactions
-// to tax account with zero tax rate."));
$net_amount = 0;
} else {
// calculate net amount
}
}
add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included,
- $amount, $net_amount, $ex_rate, $date, $memo);
+ $amount, $net_amount, $ex_rate, $date, $memo, null);
}
// 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)
+ $amount, $net_amount, $ex_rate, $tran_date, $memo, $reg_type=null)
{
+ // guess tax register if not set
+ if (!isset($reg_type))
+ $reg_type = in_array($trans_type, array(ST_SUPPINVOICE, ST_SUPPCREDIT)) ? TR_OUTPUT
+ : in_array($trans_type, array(ST_SALESINVOICE, ST_CUSTCREDIT)) ? TR_INPUT : null;
$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)
+ included_in_price, net_amount, amount, memo, reg_type)
VALUES (".db_escape($trans_type)."," . db_escape($trans_no).",'"
.date2sql($tran_date)."',".db_escape($tax_id).","
.db_escape($rate).",".db_escape($ex_rate).",".($included ? 1:0).","
.db_escape($net_amount).","
- .db_escape($amount).",".db_escape($memo).")";
+ .db_escape($amount).",".db_escape($memo).",".db_escape($reg_type, true).")";
db_query($sql, "Cannot save trans tax details");
function get_trans_tax_details($trans_type, $trans_no)
{
- $sql = "SELECT ".TB_PREF."trans_tax_details.*, "
- .TB_PREF."tax_types.name AS tax_type_name, "
- .TB_PREF."trans_tax_details.rate AS effective_rate, "
- .TB_PREF."tax_types.rate AS rate
- FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
- WHERE trans_type = ".db_escape($trans_type)."
+ $sql = "SELECT tax_details.*,
+ tax_type.name AS tax_type_name,
+ tax_details.rate AS effective_rate,
+ tax_type.rate AS rate
+ FROM ".TB_PREF."trans_tax_details tax_details,
+ ".TB_PREF."tax_types tax_type
+ WHERE
+ trans_type = ".db_escape($trans_type)."
AND trans_no = ".db_escape($trans_no)."
AND (net_amount != 0 OR amount != 0)
- AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_tax_details.tax_type_id";
+ AND tax_type.id = tax_details.tax_type_id";
return db_query($sql, "The transaction tax details could not be retrieved");
}
db_query($sql, "The transaction tax details could not be cleared");
}
-function get_tax_summary($from, $to)
+function get_tax_summary($from, $to, $also_zero_purchases=false)
{
$fromdate = date2sql($from);
$todate = date2sql($to);
$sql = "SELECT
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE
- ." || trans_type=".ST_JOURNAL.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
- ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
- ." || trans_type=".ST_CUSTCREDIT.", net_amount*ex_rate,0)) net_output,
-
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE
- ." || trans_type=".ST_JOURNAL.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
- ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
- ." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
-
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
- ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
- ." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
-
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
- ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
- ." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
+ 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)
+ ) 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."))
+ ), 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,
+
+ 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,
taxrec.rate,
ttype.id,
ttype.name
- FROM ".TB_PREF."tax_types ttype,
- ".TB_PREF."trans_tax_details taxrec
- WHERE taxrec.tax_type_id=ttype.id
- AND taxrec.trans_type != ".ST_CUSTDELIVERY."
+ FROM ".TB_PREF."trans_tax_details taxrec LEFT JOIN ".TB_PREF."tax_types ttype ON taxrec.tax_type_id=ttype.id
+ WHERE taxrec.trans_type IN (".implode(',',
+ array(ST_SALESINVOICE, ST_CUSTCREDIT, ST_SUPPINVOICE, ST_SUPPCREDIT, ST_JOURNAL)).")
AND taxrec.tran_date >= '$fromdate'
AND taxrec.tran_date <= '$todate'
GROUP BY ttype.id";
-//display_error($sql);
+
+ // display_error($sql);
return db_query($sql,"Cannot retrieve tax summary");
}
$user_id=null, $contractor_id=null, $dimension=null)
{
- $sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
+ $sql = "SELECT IFNULL(a.gl_seq,0) as gl_seq,
gl.tran_date,
gl.type as trans_type,
gl.type_no as trans_no,
- IFNULL(max(supp.supp_name), max(cust.name)) as name,
+ IFNULL(MAX(supp.supp_name), MAX(cust.name)) as name,
IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference,
refs.reference,"
.($dimension ? " -SUM(IF(dim.dimension in(gl.dimension_id,gl.dimension2_id), gl.amount, 0)) as amount,":" SUM(IF(gl.amount>0, gl.amount,0)) as amount,")
if ($dimension != null)
$sql .= " AND dim.dimension = ".db_escape($dimension);
- $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl_seq, gl.type, gl.type_no";
+ $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
return $sql;
}
projects / fa-stable.git / blobdiff