Bug 5522, 5523, 5524: Journal Entry Affecting in both sales and purchase and more...

[fa-stable.git] / reporting / rep709.php

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 5c12ac9dd32d4e1a3709588303660f3b36473463..435388d12474e1cd70334e1130fbb74f0b86fcbf 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -35,15 +35,17 @@ 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(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,
+                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,
                                branch.br_name
                FROM ".TB_PREF."trans_tax_details taxrec
                LEFT JOIN ".TB_PREF."tax_types tt
                        ON taxrec.tax_type_id=tt.id
                LEFT JOIN ".TB_PREF."gl_trans gl 
-                       ON taxrec.trans_type=gl.type AND taxrec.trans_no=gl.type_no AND 
+                       ON taxrec.trans_type=gl.type AND taxrec.trans_no=gl.type_no AND gl.amount<>0 AND
+                       gl.amount=taxrec.amount AND
                        (tt.purchasing_gl_code=gl.account OR tt.sales_gl_code=gl.account)
                LEFT JOIN ".TB_PREF."supp_trans strans
                        ON taxrec.trans_no=strans.trans_no AND taxrec.trans_type=strans.type
@@ -53,10 +55,12 @@ 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");
 }
 
@@ -77,7 +81,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-       global $path_to_root, $Hooks, $systypes_array;
+       global $path_to_root, $systypes_array;
 
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
@@ -131,9 +135,11 @@ function print_tax_report()
 
        while ($trans=db_fetch($transactions))
        {
-               if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE,ST_JOURNAL))) {
-                       $trans['net_amount'] *= -1;
-                       $trans['amount'] *= -1;
+               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 (!$summaryOnly)
@@ -172,7 +178,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) {
+               } elseif ($trans['reg_type'] !== NULL || in_array($trans['trans_type'], array(ST_SUPPINVOICE, ST_SUPPCREDIT, ST_BANKPAYMENT))) {
                        $taxes[$tax_type]['taxin'] += $trans['amount'];
                        $taxes[$tax_type]['in'] += $trans['net_amount'];
                }
@@ -191,9 +197,6 @@ function print_tax_report()
 
        $rep->Info($params, $cols2, $headers2, $aligns2);
 
-       //for ($i = 0; $i < count($cols2); $i++)
-       //      $rep->cols[$i] = $rep->leftMargin + $cols2[$i];
-
        $rep->headers = $headers2;
        $rep->aligns = $aligns2;
        $rep->NewPage();