projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c85c10b
)
[0003240] Tax Report: duplicated lines were listed for edited transactions.
author
Janusz Dobrowolski
<janusz@frontaccounting.eu>
Fri, 10 Jul 2015 13:22:28 +0000
(15:22 +0200)
committer
Janusz Dobrowolski
<janusz@frontaccounting.eu>
Fri, 10 Jul 2015 15:43:56 +0000
(17:43 +0200)
reporting/rep709.php
patch
|
blob
|
history
diff --git
a/reporting/rep709.php
b/reporting/rep709.php
index 20dbf267be717e2690a2e2bcf8b30b2b9c761925..d4421eeb7dd3947db06006383b115e9f609a0839 100644
(file)
--- a/
reporting/rep709.php
+++ b/
reporting/rep709.php
@@
-43,7
+43,7
@@
function getTaxTransactions($from, $to)
LEFT JOIN ".TB_PREF."tax_types tt
ON taxrec.tax_type_id=tt.id
LEFT JOIN ".TB_PREF."gl_trans gl
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
(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
(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
@@
-57,7
+57,7
@@
function getTaxTransactions($from, $to)
AND taxrec.tran_date >= '$fromdate'
AND taxrec.tran_date <= '$todate'
ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
AND taxrec.tran_date >= '$fromdate'
AND taxrec.tran_date <= '$todate'
ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
-//display_error($sql);
+
return db_query($sql,"No transactions were returned");
}
return db_query($sql,"No transactions were returned");
}