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

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 9a4b2a5259a0e88ff6a32ce85e27042617be27a7..bd807a6973fcd7b8ff915da694587a72a09b0925 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -44,6 +44,7 @@ function getTaxTransactions($from, $to)
                        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 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
@@ -132,7 +133,8 @@ function print_tax_report()
 
        while ($trans=db_fetch($transactions))
        {
-               if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE,ST_JOURNAL))) {
+               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;
                }