X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=f24512d6a734ee9d453656c23edb5c6db4e2067f;hb=b54fdb00859af85c72742d32ebc628ef52b81cec;hp=4baf0105841b9e4e4b91416a7c8446ab4258f03e;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git diff --git a/reporting/rep709.php b/reporting/rep709.php index 4baf0105..f24512d6 100644 --- a/reporting/rep709.php +++ b/reporting/rep709.php @@ -77,8 +77,12 @@ function print_tax_report() $to = $_POST['PARAM_1']; $summaryOnly = $_POST['PARAM_2']; $comments = $_POST['PARAM_3']; + $destination = $_POST['PARAM_4']; - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $dec = user_price_dec(); @@ -107,7 +111,7 @@ function print_tax_report() $rep->Info($params, $cols, $headers, $aligns); if (!$summaryOnly) { - $rep->Header(); + $rep->NewPage(); } $totalnet = 0.0; @@ -140,10 +144,14 @@ function print_tax_report() if ($rep->row < $rep->bottomMargin + $rep->lineHeight) { $rep->Line($rep->row - 2); - $rep->Header(); + $rep->NewPage(); } } - if (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) { + 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 { @@ -161,12 +169,14 @@ function print_tax_report() $aligns2 = array('left', 'right', 'right', 'right', 'right', 'right', 'right'); - for ($i = 0; $i < count($cols2); $i++) - $rep->cols[$i] = $rep->leftMargin + $cols2[$i]; + $rep->Info($params, $cols2, $headers2, $aligns2); + + //for ($i = 0; $i < count($cols2); $i++) + // $rep->cols[$i] = $rep->leftMargin + $cols2[$i]; $rep->headers = $headers2; $rep->aligns = $aligns2; - $rep->Header(); + $rep->NewPage(); $taxtotal = 0; foreach( $taxes as $id=>$sum)