}
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);
//--------------------------------------------------------------------------------
function get_gl_transactions($from_date, $to_date, $trans_no=0,
- $account=null, $dimension=0, $dimension2=0, $filter_type=null,
- $amount_min=null, $amount_max=null, $person_id=null)
+ $account=null, $dimension=0, $dimension2=0, $filter_type=null,
+ $amount_min=null, $amount_max=null, $person_type=null, $person_id=null, $memo='')
{
- global $SysPrefs;
+ global $SysPrefs;
- $from = date2sql($from_date);
- $to = date2sql($to_date);
+ $from = date2sql($from_date);
+ $to = date2sql($to_date);
- $sql = "SELECT gl.*, j.event_date, j.doc_date, a.gl_seq, u.user_id, st.supp_reference, gl.person_id subcode,
- IFNULL(IFNULL(sup.supp_name, debt.name), bt.person_id) as person_name,
- IFNULL(gl.person_id, IFNULL(sup.supplier_id, debt.debtor_no)) as person_id,
- IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
- coa.account_name, ref.reference
- FROM "
- .TB_PREF."gl_trans gl
- LEFT JOIN ".TB_PREF."voided v ON gl.type_no=v.id AND v.type=gl.type
+ $sql = "SELECT gl.*, j.event_date, j.doc_date, a.gl_seq, u.user_id, st.supp_reference, gl.person_id subcode,
+ IFNULL(IFNULL(sup.supp_name, debt.name), bt.person_id) as person_name,
+ IFNULL(gl.person_id, IFNULL(sup.supplier_id, IFNULL(debt.debtor_no, bt.person_id))) as person_id,
+ IF(gl.person_id, gl.person_type_id, IF(sup.supplier_id,". PT_SUPPLIER . "," . "IF(debt.debtor_no," . PT_CUSTOMER . "," .
+ "IF(bt.person_id != '' AND !ISNULL(bt.person_id), bt.person_type_id, -1)))) as person_type_id,
+ IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
+ coa.account_name, ref.reference, IF(ISNULL(c.memo_), gl.memo_, CONCAT(gl.memo_,' ',c.memo_)) AS memo
+ FROM "
+ .TB_PREF."gl_trans gl
+ LEFT JOIN ".TB_PREF."voided v ON gl.type_no=v.id AND v.type=gl.type
- LEFT JOIN ".TB_PREF."supp_trans st ON gl.type_no=st.trans_no AND st.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=st.supplier_id)
- LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE." AND gl.person_id=grn.supplier_id
- LEFT JOIN ".TB_PREF."debtor_trans dt ON gl.type_no=dt.trans_no AND dt.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=dt.debtor_no)
+ LEFT JOIN ".TB_PREF."supp_trans st ON gl.type_no=st.trans_no AND st.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=st.supplier_id)
+ LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE."
+ LEFT JOIN ".TB_PREF."debtor_trans dt ON gl.type_no=dt.trans_no AND dt.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=dt.debtor_no)
- LEFT JOIN ".TB_PREF."suppliers sup ON st.supplier_id=sup.supplier_id OR grn.supplier_id=sup.supplier_id
- LEFT JOIN ".TB_PREF."cust_branch branch ON dt.branch_code=branch.branch_code
- LEFT JOIN ".TB_PREF."debtors_master debt ON dt.debtor_no=debt.debtor_no
+ LEFT JOIN ".TB_PREF."suppliers sup ON st.supplier_id=sup.supplier_id
+ LEFT JOIN ".TB_PREF."cust_branch branch ON dt.branch_code=branch.branch_code
+ LEFT JOIN ".TB_PREF."debtors_master debt ON dt.debtor_no=debt.debtor_no
- LEFT JOIN ".TB_PREF."bank_trans bt ON bt.type=gl.type AND bt.trans_no=gl.type_no AND bt.amount!=0
- AND bt.person_type_id=gl.person_type_id AND bt.person_id=gl.person_id
+ LEFT JOIN ".TB_PREF."bank_trans bt ON bt.type=gl.type AND bt.trans_no=gl.type_no AND bt.amount!=0
+ AND (bt.person_id != '' AND !ISNULL(bt.person_id))
- LEFT JOIN ".TB_PREF."journal j ON j.type=gl.type AND j.trans_no=gl.type_no
- LEFT JOIN ".TB_PREF."audit_trail a ON a.type=gl.type AND a.trans_no=gl.type_no AND NOT ISNULL(gl_seq)
- LEFT JOIN ".TB_PREF."users u ON a.user=u.id
+ LEFT JOIN ".TB_PREF."journal j ON j.type=gl.type AND j.trans_no=gl.type_no
+ LEFT JOIN ".TB_PREF."audit_trail a ON a.type=gl.type AND a.trans_no=gl.type_no AND NOT ISNULL(gl_seq)
+ LEFT JOIN ".TB_PREF."users u ON a.user=u.id
+ LEFT JOIN ".TB_PREF."comments c ON c.id=gl.type_no AND c.type=gl.type
- LEFT JOIN ".TB_PREF."refs ref ON ref.type=gl.type AND ref.id=gl.type_no,"
- .TB_PREF."chart_master coa
- 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";
+ LEFT JOIN ".TB_PREF."refs ref ON ref.type=gl.type AND ref.id=gl.type_no,"
+ .TB_PREF."chart_master coa
+ WHERE coa.account_code=gl.account
+ AND ISNULL(v.date_)
+ AND gl.tran_date >= '$from'
+ AND gl.tran_date <= '$to'
+ AND gl.amount <> 0";
- if ($person_id)
- $sql .= " AND gl.person_id=".db_escape($person_id);
+ if ($trans_no > 0)
+ $sql .= " AND gl.type_no LIKE ".db_escape('%'.$trans_no);
- if ($trans_no > 0)
- $sql .= " AND gl.type_no LIKE ".db_escape('%'.$trans_no);;
+ if ($account != null)
+ $sql .= " AND gl.account = ".db_escape($account);
- if ($account != null)
- $sql .= " AND gl.account = ".db_escape($account);
+ if ($dimension != 0)
+ $sql .= " AND gl.dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
- if ($dimension > 0)
- $sql .= " AND gl.dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
+ if ($dimension2 != 0)
+ $sql .= " AND gl.dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
- if ($dimension2 > 0)
- $sql .= " AND gl.dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
+ if ($filter_type != null)
+ $sql .= " AND gl.type IN (" . $filter_type .")";
- if ($filter_type != null AND is_numeric($filter_type))
- $sql .= " AND gl.type= ".db_escape($filter_type);
+ if ($amount_min != null)
+ $sql .= " AND ABS(gl.amount) >= ABS(".db_escape($amount_min).")";
+
+ if ($amount_max != null)
+ $sql .= " AND ABS(gl.amount) <= ABS(".db_escape($amount_max).")";
- if ($amount_min != null)
- $sql .= " AND ABS(gl.amount) >= ABS(".db_escape($amount_min).")";
-
- if ($amount_max != null)
- $sql .= " AND ABS(gl.amount) <= ABS(".db_escape($amount_max).")";
+ if ($memo)
+ $sql .= " AND (gl.memo_ LIKE ". db_escape("%$memo%") . " OR c.memo_ LIKE " . db_escape("%$memo%") . ")";
- $sql .= " ORDER BY tran_date, counter";
+ $sql .= " GROUP BY counter";
- return db_query($sql, "The transactions for could not be retrieved");
-}
+ $sql .= " HAVING TRUE";
+ if ($person_type != 0)
+ $sql .= " AND person_type_id=".db_escape($person_type);
+ if ($person_id != 0)
+ $sql .= " AND person_id=".db_escape($person_id);
+
+ $sql .= " ORDER BY tran_date, counter";
+ return db_query($sql, "The transactions for could not be retrieved");
+}
//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------
-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(!$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
function get_trans_tax_details($trans_type, $trans_no)
{
- $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 tax_type.id = tax_details.tax_type_id";
-
- return db_query($sql, "The transaction tax details could not be retrieved");
+ $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
+ WHERE
+ trans_type = ".db_escape($trans_type)."
+ AND trans_no = ".db_escape($trans_no)."
+ AND (net_amount != 0 OR amount != 0)";
+
+ return db_query($sql, "The transaction tax details could not be retrieved");
}
//----------------------------------------------------------------------------------------
$todate = date2sql($to);
$sql = "SELECT
- SUM(IF(trans_type=".ST_SUPPCREDIT.",-1,1)*
+ SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
IF((reg_type=".TR_OUTPUT.")"
- ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+ ." || ((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_SUPPCREDIT.",-1,1)*
+ SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
IF((reg_type=".TR_OUTPUT.")"
- ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+ ." || ((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)*
projects / fa-stable.git / blobdiff