projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes in hotkeys system for tas support.
[fa-stable.git]
/
reporting
/
rep709.php
diff --git
a/reporting/rep709.php
b/reporting/rep709.php
index 57183a884a6ff64fe97a0d78d13d1f9da2bcde5c..d944960c87b16e97d4c9be84ecedd9adec0563e7 100644
(file)
--- a/
reporting/rep709.php
+++ b/
reporting/rep709.php
@@
-9,7
+9,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_TAXREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-45,8
+45,8
@@
function getTaxTransactions($from, $to)
ON taxrec.trans_no=dtrans.trans_no AND taxrec.trans_type=dtrans.type
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
ON taxrec.trans_no=dtrans.trans_no AND taxrec.trans_type=dtrans.type
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
!= 13
+ WHERE (taxrec.amount
<> 0 OR taxrec.net_amount <>
0)
+ AND taxrec.trans_type
<> ".ST_CUSTDELIVERY."
AND taxrec.tran_date >= '$fromdate'
AND taxrec.tran_date <= '$todate'
ORDER BY taxrec.tran_date";
AND taxrec.tran_date >= '$fromdate'
AND taxrec.tran_date <= '$todate'
ORDER BY taxrec.tran_date";
@@
-71,7
+71,7
@@
function getTaxInfo($id)
function print_tax_report()
{
function print_tax_report()
{
- global $path_to_root, $trans_dir, $Hooks;
+ global $path_to_root, $trans_dir, $Hooks
, $systypes_array
;
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
@@
-107,7
+107,7
@@
function print_tax_report()
$rep->Info($params, $cols, $headers, $aligns);
if (!$summaryOnly)
{
$rep->Info($params, $cols, $headers, $aligns);
if (!$summaryOnly)
{
- $rep->
Header
();
+ $rep->
NewPage
();
}
$totalnet = 0.0;
}
$totalnet = 0.0;
@@
-116,14
+116,16
@@
function print_tax_report()
while ($trans=db_fetch($transactions))
{
while ($trans=db_fetch($transactions))
{
- if (in_array($trans['trans_type'], array(
11,20
))) {
+ if (in_array($trans['trans_type'], array(
ST_CUSTCREDIT,ST_SUPPINVOICE
))) {
$trans['net_amount'] *= -1;
$trans['amount'] *= -1;
}
if (!$summaryOnly)
{
$trans['net_amount'] *= -1;
$trans['amount'] *= -1;
}
if (!$summaryOnly)
{
- $rep->TextCol(0, 1, systypes::name($trans['trans_type']));
+ $rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
+ if ($trans['memo'] == '')
+ $trans['memo'] = get_reference($trans['trans_type'], $trans['trans_no']);
$rep->TextCol(1, 2, $trans['memo']);
$rep->DateCol(2, 3, $trans['tran_date'], true);
$rep->TextCol(3, 4, $trans['name']);
$rep->TextCol(1, 2, $trans['memo']);
$rep->DateCol(2, 3, $trans['tran_date'], true);
$rep->TextCol(3, 4, $trans['name']);
@@
-138,10
+140,14
@@
function print_tax_report()
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->Line($rep->row - 2);
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->Line($rep->row - 2);
- $rep->
Header
();
+ $rep->
NewPage
();
}
}
}
}
- if (in_array($trans['trans_type'], array(2,10,11))) {
+ if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
+ $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 {
$taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
$taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
} else {
@@
-164,7
+170,7
@@
function print_tax_report()
$rep->headers = $headers2;
$rep->aligns = $aligns2;
$rep->headers = $headers2;
$rep->aligns = $aligns2;
- $rep->
Header
();
+ $rep->
NewPage
();
$taxtotal = 0;
foreach( $taxes as $id=>$sum)
$taxtotal = 0;
foreach( $taxes as $id=>$sum)