projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main trunk up to version_2_1_4
[fa-stable.git]
/
reporting
/
rep709.php
diff --git
a/reporting/rep709.php
b/reporting/rep709.php
index 6b1f1e40eaf05ab683d788be63012f246c9f0845..57183a884a6ff64fe97a0d78d13d1f9da2bcde5c 100644
(file)
--- a/
reporting/rep709.php
+++ b/
reporting/rep709.php
@@
-71,7
+71,7
@@
function getTaxInfo($id)
function print_tax_report()
{
function print_tax_report()
{
- global $path_to_root, $trans_dir;
+ global $path_to_root, $trans_dir
, $Hooks
;
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
@@
-98,7
+98,7
@@
function print_tax_report()
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
- $cols = array(0, 100, 130, 180, 290, 370, 4
55, 505, 555
);
+ $cols = array(0, 100, 130, 180, 290, 370, 4
20, 470, 520
);
$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
_('Net'), _('Rate'), _('Tax'));
$headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
_('Net'), _('Rate'), _('Tax'));
@@
-116,7
+116,7
@@
function print_tax_report()
while ($trans=db_fetch($transactions))
{
while ($trans=db_fetch($transactions))
{
- if (in_array($trans['trans_type'], array(11,20
,1
))) {
+ if (in_array($trans['trans_type'], array(11,20))) {
$trans['net_amount'] *= -1;
$trans['amount'] *= -1;
}
$trans['net_amount'] *= -1;
$trans['amount'] *= -1;
}
@@
-141,7
+141,7
@@
function print_tax_report()
$rep->Header();
}
}
$rep->Header();
}
}
- if (in_array($trans['trans_type'], array(
0,
2,10,11))) {
+ if (in_array($trans['trans_type'], array(2,10,11))) {
$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 {