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)
+ $amount_min=null, $amount_max=null, $person_id=null, $memo='')
{
global $SysPrefs;
$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(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
FROM "
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."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."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
+ 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)
if ($account != null)
$sql .= " AND gl.account = ".db_escape($account);
- if ($dimension > 0)
+ if ($dimension != 0)
$sql .= " AND gl.dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
- if ($dimension2 > 0)
+ if ($dimension2 != 0)
$sql .= " AND gl.dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
if ($filter_type != null AND is_numeric($filter_type))
if ($amount_max != null)
$sql .= " AND ABS(gl.amount) <= ABS(".db_escape($amount_max).")";
+ if ($memo) {
+ $sql .= " AND gl.memo_ LIKE ". db_escape("%$memo%");
+ }
+ $sql .= " GROUP BY counter";
$sql .= " ORDER BY tran_date, counter";
return db_query($sql, "The transactions for could not be retrieved");
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");
}
//----------------------------------------------------------------------------------------