LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
." WHERE gl.type= ".db_escape($type)
." AND gl.type_no = ".db_escape($trans_id)
+ ." AND gl.amount <> 0"
." ORDER BY counter";
return db_query($sql, "The gl transactions could not be retrieved");
}
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."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)."
AND trans_no = ".db_escape($trans_no)."
." || (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.",-1,1)*
+ 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.",-1,1)*
+ 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,
commit_transaction();
}
-//--------------------------------------------------------------------------------------------------
-
-function clear_gl_trans($type, $trans_id, $nested=false)
-{
- if (!$nested)
- begin_transaction();
-
- $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 (!$nested)
- commit_transaction();
-}
-
//----------------------------------------------------------------------------------------
function void_journal_trans($type, $type_no, $use_transaction=true)
if (!$alsoclosed) {
$sql .= " AND gl_seq=0";
}
- $sql .= " GROUP BY gl.type, gl.type_no";
+ $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
return $sql;
}
?>
\ No newline at end of file