From 80efce5505f062318be3deb37cf5e9d68680ccde Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 16 Nov 2021 08:25:05 +0100 Subject: [PATCH] Bug 5522,5523,5524: Journal Entry Affecting in both sales and purchase med flera. Rerun of rep409.php. --- reporting/rep709.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/reporting/rep709.php b/reporting/rep709.php index 435388d1..bd807a69 100644 --- a/reporting/rep709.php +++ b/reporting/rep709.php @@ -35,10 +35,9 @@ function getTaxTransactions($from, $to) $sql = "SELECT tt.name as taxname, taxrec.*, taxrec.amount*ex_rate AS amount, taxrec.net_amount*ex_rate AS net_amount, - IF(ISNULL(supp.supp_name), - IF(ISNULL(debt.name), - IF(gl.person_type_id<>".PT_MISC.", gl.memo_, gl.person_id), debt.name), - supp.supp_name) as name, + IF(taxrec.trans_type=".ST_BANKPAYMENT." OR taxrec.trans_type=".ST_BANKDEPOSIT.", + IF(gl.person_type_id<>".PT_MISC.", gl.memo_, gl.person_id), + IF(ISNULL(supp.supp_name), debt.name, supp.supp_name)) as name, branch.br_name FROM ".TB_PREF."trans_tax_details taxrec LEFT JOIN ".TB_PREF."tax_types tt @@ -55,10 +54,9 @@ function getTaxTransactions($from, $to) LEFT JOIN ".TB_PREF."debtors_master as debt ON dtrans.debtor_no=debt.debtor_no LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code WHERE (taxrec.amount <> 0 OR taxrec.net_amount <> 0) + AND !ISNULL(taxrec.reg_type) AND taxrec.tran_date >= '$fromdate' AND taxrec.tran_date <= '$todate' - AND taxrec.trans_type <> ".ST_CUSTDELIVERY." - GROUP BY taxrec.id ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate"; return db_query($sql,"No transactions were returned"); @@ -135,11 +133,10 @@ function print_tax_report() while ($trans=db_fetch($transactions)) { - if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE, ST_JOURNAL))) { - if ($trans['reg_type'] == TR_INPUT) { - $trans['net_amount'] *= -1; - $trans['amount'] *= -1; - } + if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE)) || + ($trans['trans_type'] == ST_JOURNAL && $trans['reg_type'] == TR_INPUT)) { + $trans['net_amount'] *= -1; + $trans['amount'] *= -1; } if (!$summaryOnly) @@ -178,7 +175,7 @@ function print_tax_report() elseif (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) { $taxes[$tax_type]['taxout'] += $trans['amount']; $taxes[$tax_type]['out'] += $trans['net_amount']; - } elseif ($trans['reg_type'] !== NULL || in_array($trans['trans_type'], array(ST_SUPPINVOICE, ST_SUPPCREDIT, ST_BANKPAYMENT))) { + } elseif ($trans['reg_type'] !== NULL) { $taxes[$tax_type]['taxin'] += $trans['amount']; $taxes[$tax_type]['in'] += $trans['net_amount']; } -- 2.30.2