projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to upgrade scripts.
[fa-stable.git]
/
reporting
/
rep709.php
diff --git
a/reporting/rep709.php
b/reporting/rep709.php
index 6b1f1e40eaf05ab683d788be63012f246c9f0845..4baf0105841b9e4e4b91416a7c8446ab4258f03e 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;
+ 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'];
@@
-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,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,1
))) {
+ 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']);
@@
-141,7
+143,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(
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 {