Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / reporting / rep709.php

diff --git a/reporting/rep709.php b/reporting/rep709.php
index d944960c87b16e97d4c9be84ecedd9adec0563e7..f24512d6a734ee9d453656c23edb5c6db4e2067f 100644 (file)
--- 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();
 
@@ -165,8 +169,10 @@ 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;