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)
{
- global $use_audit_trail;
+ global $SysPrefs;
$date = date2sql($date_);
if ($currency != null)
$dimension = 0;
if ($dimension2 == null || $dimension2 < 0)
$dimension2 = 0;
- if (isset($use_audit_trail) && $use_audit_trail)
+ if (isset($SysPrefs->use_audit_trail) && $SysPrefs->use_audit_trail)
{
if ($memo_ == "" || $memo_ == null)
$memo_ = $_SESSION["wa_current_user"]->username;
else
$memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
}
+ 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 add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, $person_id=null)
{
$amount = round2($amount, user_price_dec());
- if ($amount != 0)
+
+ if (floatcmp($amount, 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");
- else
+ } else
return 0;
-}
+}
//--------------------------------------------------------------------------------
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)
+ $account=null, $dimension=0, $dimension2=0, $filter_type=null,
+ $amount_min=null, $amount_max=null, $person_type=null, $person_id=null, $memo='')
{
- $from = date2sql($from_date);
- $to = date2sql($to_date);
+ global $SysPrefs;
- $sql = "SELECT ".TB_PREF."gl_trans.*, "
- .TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, "
- .TB_PREF."chart_master
- WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
- AND tran_date >= '$from'
- AND tran_date <= '$to'";
- if ($trans_no > 0)
- $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no);
+ $from = date2sql($from_date);
+ $to = date2sql($to_date);
- if ($account != null)
- $sql .= " AND ".TB_PREF."gl_trans.account = ".db_escape($account);
+ $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
- if ($dimension != 0)
- $sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".($dimension<0?0:db_escape($dimension));
+ 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)
- if ($dimension2 != 0)
- $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+ 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
- if ($filter_type != null AND is_numeric($filter_type))
- $sql .= " AND ".TB_PREF."gl_trans.type= ".db_escape($filter_type);
-
- if ($amount_min != null)
- $sql .= " AND ABS(".TB_PREF."gl_trans.amount) >= ABS(".db_escape($amount_min).")";
-
- if ($amount_max != null)
- $sql .= " AND ABS(".TB_PREF."gl_trans.amount) <= ABS(".db_escape($amount_max).")";
+ 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))
- $sql .= " ORDER BY tran_date, counter";
+ 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
- return db_query($sql, "The transactions for could not be retrieved");
-}
+ 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 ($trans_no > 0)
+ $sql .= " AND gl.type_no LIKE ".db_escape('%'.$trans_no);
+
+ 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 ($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 ($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 .= " GROUP BY counter";
+
+ $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_trans($type, $trans_id)
{
- $sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference FROM "
- .TB_PREF."gl_trans as gl
+ $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
- LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
+ LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)
+ LEFT JOIN ".TB_PREF."audit_trail as audit ON (gl.type=audit.type AND gl.type_no=audit.trans_no AND NOT ISNULL(gl_seq))
+ LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
+ # all this below just to retrieve doc_date :>
+ 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."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."journal j ON j.type=gl.type AND j.trans_no=gl.type_no"
+
." WHERE gl.type= ".db_escape($type)
." AND gl.type_no = ".db_escape($trans_id)
- ." ORDER BY counter";
+ ." AND gl.amount <> 0"
+ ." ORDER BY tran_date, counter";
+
return db_query($sql, "The gl transactions could not be retrieved");
}
//--------------------------------------------------------------------------------
-function get_gl_wo_cost_trans($trans_id, $person_id=-1)
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1, $all_gl=false)
{
- $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM "
- .TB_PREF."gl_trans, ".TB_PREF."chart_master
- WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
- AND ".TB_PREF."gl_trans.type=".ST_WORKORDER
- ." AND ".TB_PREF."gl_trans.type_no=".db_escape($trans_id)."
- AND ".TB_PREF."gl_trans.person_type_id=".PT_WORKORDER;
+ $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
+ WHERE
+ costing.workorder_id=".db_escape($trans_id)
+ ." AND chart.account_code=gl.account
+ AND gl.type=costing.trans_type
+ AND gl.type_no=costing.trans_no";
+ if ($cost_type != -1)
+ $sql .= " AND costing.cost_type=".db_escape($cost_type);
+ $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 ".TB_PREF."gl_trans.person_id=".db_escape($person_id);
- $sql .= " AND amount < 0";
+ $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");
$row = db_fetch_row($result);
- return $row[0];
+ return (float)$row[0];
}
//----------------------------------------------------------------------------------------------------
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' ";
//--------------------------------------------------------------------------------
// Stores journal/bank transaction tax details if applicable
//
-function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo)
+function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null)
{
$tax_type = is_tax_account($gl_code);
if(!$tax_type) return; // $gl_code is not tax account
$tax = get_tax_type($tax_type);
- //if ($gl_code == $tax['sales_gl_code'])
- // $amount = -$amount;
+ 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 ($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
- $net_amount = $amount/$tax['rate']*100;
+ if ($net_amount===null) {
+ if ($tax['rate'] == 0) {
+ $net_amount = 0;
+ } else {
+ // calculate net amount
+ $net_amount = $amount/$tax['rate']*100;
+ }
}
-
- add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], 0,
- $amount, $net_amount, $ex_rate, $date, $memo);
-
+ add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included,
+ $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
- FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
- 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";
-
- 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");
}
//----------------------------------------------------------------------------------------
db_query($sql, "The transaction tax details could not be voided");
}
-function get_tax_summary($from, $to)
+//----------------------------------------------------------------------------------------
+
+function clear_trans_tax_details($type, $type_no)
+{
+ $sql = "DELETE FROM ".TB_PREF."trans_tax_details
+ WHERE trans_no=".db_escape($type_no)
+ ." AND trans_type=".db_escape($type);
+
+ db_query($sql, "The transaction tax details could not be cleared");
+}
+
+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.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", net_amount*ex_rate,0)) net_output,
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
- IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || 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);
- return db_query($sql,"Cannot retrieve tax summary");
-}
-
-//--------------------------------------------------------------------------------
-// Write/update journal entries.
-//
-function write_journal_entries(&$cart, $reverse, $use_transaction=true)
-{
- global $Refs;
-
- $date_ = $cart->tran_date;
- $ref = $cart->reference;
- $memo_ = $cart->memo_;
- $trans_type = $cart->trans_type;
- $new = $cart->order_id == 0;
-
- if ($new)
- $cart->order_id = get_next_trans_no($trans_type);
-
- $trans_id = $cart->order_id;
-
- if ($use_transaction)
- begin_transaction();
-
- if(!$new)
- void_journal_trans($trans_type, $trans_id, false);
-
- foreach ($cart->gl_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,
- $journal_item->reference, $journal_item->amount);
- if ($is_bank_to)
- {
- 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");
- }
- // store tax details if the gl account is a tax account
- add_gl_tax_details($journal_item->code_id,
- ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, -$journal_item->amount, 1, $date_, $memo_);
- }
-
- if ($new) {
- add_comments($trans_type, $trans_id, $date_, $memo_);
- $Refs->save($trans_type, $trans_id, $ref);
- } else {
- update_comments($trans_type, $trans_id, null, $memo_);
- $Refs->update($trans_type, $trans_id, $ref);
- }
-
- add_audit_trail($trans_type, $trans_id, $date_);
-
- if ($reverse)
- {
- //$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 ($cart->gl_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->reference, -$journal_item->amount);
- if ($is_bank_to)
- {
- 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");
- }
- // store tax details if the gl account is a tax account
- add_gl_tax_details($journal_item->code_id,
- ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, $journal_item->amount, 1, $reversingDate, $memo_);
- }
-
- add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);
-
- $Refs->save($trans_type, $trans_id_reverse, $ref);
- add_audit_trail($trans_type, $trans_id_reverse, $reversingDate);
- }
- if ($use_transaction)
- commit_transaction();
-
- return $trans_id;
+ // display_error($sql);
+ return db_query($sql,"Cannot retrieve tax summary");
}
//--------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
-function void_journal_trans($type, $type_no, $use_transaction=true)
+function clear_gl_trans($type, $trans_id, $nested=false)
{
- if ($use_transaction)
+ if (!$nested)
begin_transaction();
- void_bank_trans($type, $type_no, true);
-// void_gl_trans($type, $type_no, true); // this is done above
-// void_trans_tax_details($type, $type_no); // ditto
+ $sql = "DELETE FROM ".TB_PREF."gl_trans WHERE type=".db_escape($type)
+ ." AND type_no=".db_escape($trans_id);
+
+ db_query($sql, "could not clear gl transactions for type=$type and trans_no=$trans_id");
- if ($use_transaction)
+ if (!$nested)
commit_transaction();
}
-function get_sql_for_journal_inquiry()
+function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false,
+ $user_id=null, $contractor_id=null, $dimension=null)
{
-/*
- // Tom Hallman 11 Nov 2009
- // IF(gl.type = 1... statement is for deposits/payments that may not actually result
- // in a deposit, such as when a fix is made. Without that statement (and the
- // joining of the bank_trans table), the fix deposit/payment amount would show up
- // incorrectly as only the positive side of the fix.
- $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,
- gl.type_no,
- refs.reference,
- IF(gl.type = 1 OR gl.type = 2,
- bank_trans.amount,
- SUM(IF(gl.amount>0, gl.amount,0))) as amount,
- com.memo_,
- IF(ISNULL(u.user_id),'',u.user_id) as user_id
- FROM ".TB_PREF."gl_trans as gl
- LEFT JOIN ".TB_PREF."audit_trail as a ON
- (gl.type=a.type AND gl.type_no=a.trans_no)
- LEFT JOIN ".TB_PREF."comments as com ON
- (gl.type=com.type AND gl.type_no=com.id)
- LEFT JOIN ".TB_PREF."refs as refs ON
- (gl.type=refs.type AND gl.type_no=refs.id)
- LEFT JOIN ".TB_PREF."users as u ON
- a.user=u.id
- LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON
- (gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)
- WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
- AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
- AND gl.amount!=0";
- if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
- $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
- }
- if (get_post('filterType') != -1) {
- $sql .= " AND gl.type=".get_post('filterType');
- }
- if (!check_value('AlsoClosed')) {
- $sql .= " AND gl_seq=0";
+ gl.type as trans_type,
+ gl.type_no as trans_no,
+ 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,")
+ ."com.memo_,
+ IF(ISNULL(u.user_id),'',u.user_id) as user_id";
+
+ if ($contractor_id > 0) {
+ $sql.= ", st.supplier_id, dt.debtor_no ";
}
- $sql .= " GROUP BY gl.type, gl.type_no";
-*/
- $sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
- gl.tran_date,
- gl.type,
- gl.type_no,
- refs.reference,
- SUM(IF(gl.amount>0, gl.amount,0)) as amount,
- com.memo_,
- IF(ISNULL(u.user_id),'',u.user_id) as user_id
- FROM ".TB_PREF."gl_trans as gl
+
+ $sql.= " FROM ".TB_PREF."gl_trans as gl
LEFT JOIN ".TB_PREF."audit_trail as a ON
(gl.type=a.type AND gl.type_no=a.trans_no)
LEFT JOIN ".TB_PREF."comments as com ON
(gl.type=refs.type AND gl.type_no=refs.id)
LEFT JOIN ".TB_PREF."users as u ON
a.user=u.id
- WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
- AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
+ LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=gl.type AND gl.type_no=dt.trans_no
+ LEFT JOIN ".TB_PREF."debtors_master cust ON gl.person_type_id=2 AND gl.person_id=cust.debtor_no
+ LEFT JOIN ".TB_PREF."supp_trans st ON st.type=gl.type AND gl.type_no=st.trans_no
+ LEFT JOIN ".TB_PREF."suppliers supp ON gl.person_type_id=3 AND gl.person_id=supp.supplier_id"
+ .($dimension ?
+ " LEFT JOIN (SELECT type, type_no, MAX(IFNULL(dimension_id, dimension2_id)) dimension FROM ".TB_PREF."gl_trans GROUP BY type, type_no) dim
+ ON gl.type=dim.type AND gl.type_no=dim.type_no" : '')
+ ." WHERE gl.tran_date >= '" . date2sql($from) . "'
+ AND gl.tran_date <= '" . date2sql($to) . "'
AND gl.amount!=0";
- if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
- $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
+ if ($ref) {
+ $sql .= " AND refs.reference LIKE ". db_escape("%$ref%");
+ }
+ if ($memo) {
+ $sql .= " AND com.memo_ LIKE ". db_escape("%$memo%");
}
- if (get_post('filterType') != -1) {
- $sql .= " AND gl.type=".get_post('filterType');
+ if ($filter != -1) {
+ $sql .= " AND gl.type=".db_escape($filter);
}
- if (!check_value('AlsoClosed')) {
+ if (!$alsoclosed) {
$sql .= " AND gl_seq=0";
}
- $sql .= " GROUP BY gl.type, gl.type_no";
+ else
+ $sql .= " AND NOT ISNULL(a.gl_seq)";
+
+ if ($user_id != null)
+ $sql .= " AND user_id = ".db_escape($user_id);
+
+ if ($contractor_id > 0) {
+ $sql.= " AND (dt.debtor_no =".$contractor_id;
+ $sql.= " OR st.supplier_id =".$contractor_id.") ";
+ }
+
+ if ($dimension != null)
+ $sql .= " AND dim.dimension = ".db_escape($dimension);
+
+ $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
+
return $sql;
}
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff