Small cleanups in mail class.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 1ffa5f089fe129e9514e6c553df8280ef4c8d1a9..9ee5ef2c3050f289c715a5dd21a46c2b32c49468 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -35,11 +35,16 @@ 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), 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
                        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 
+                       (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
                LEFT JOIN ".TB_PREF."suppliers as supp ON strans.supplier_id=supp.supplier_id
@@ -48,7 +53,7 @@ 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 taxrec.trans_type <> ".ST_CUSTDELIVERY."
+                       AND !ISNULL(taxrec.reg_type)
                        AND taxrec.tran_date >= '$fromdate'
                        AND taxrec.tran_date <= '$todate'
                ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
@@ -73,7 +78,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-       global $path_to_root, $trans_dir, $Hooks, $systypes_array;
+       global $path_to_root, $Hooks, $systypes_array;
 
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
@@ -156,18 +161,18 @@ function print_tax_report()
                                $rep->NewPage();
                        }
                }
-               if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
+               if ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_INPUT) {
                        $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
                        $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
                }
-               elseif ($trans['trans_type']==ST_JOURNAL && $trans['amount']>=0) {
+               elseif ($trans['trans_type']==ST_JOURNAL && $trans['reg_type']==TR_OUTPUT) {
                        $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
                        $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
                }
                elseif (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) {
                        $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
                        $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
-               } else {
+               } elseif ($trans['reg_type'] !== NULL) {
                        $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
                        $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
                }
@@ -222,4 +227,3 @@ function print_tax_report()
        $rep->End();
 }
 
-?>
\ No newline at end of file