[Frontaccounting-cvs_updates] frontaccount/reporting rep709.php, 1.1.2.11, 1.1.2.12
Brought to you by:
frontaccounting,
itronics
From: itronics <itr...@us...> - 2009-01-29 20:50:30
|
Update of /cvsroot/frontaccounting/frontaccount/reporting In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10467 Modified Files: Tag: unstable rep709.php Log Message: Fixed input/output tax qualification. Index: rep709.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/reporting/rep709.php,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** rep709.php 29 Jan 2009 20:32:04 -0000 1.1.2.11 --- rep709.php 29 Jan 2009 20:50:25 -0000 1.1.2.12 *************** *** 49,52 **** --- 49,53 ---- ".TB_PREF."sys_types stype WHERE taxrec.trans_type=stype.type_id + AND (taxrec.amount != 0 OR taxrec.net_amount != 0) AND taxrec.trans_type != 13 AND taxrec.tran_date >= '$fromdate' *************** *** 145,149 **** } } ! if ($trans['net_amount'] > 0) { $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount']; $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount']; --- 146,150 ---- } } ! if (in_array($trans['trans_type'], array(0,2,10,11))) { $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount']; $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount']; |