Preparation for Excel Writer continued

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

diff --git a/reporting/rep304.php b/reporting/rep304.php
index f77251d17671464a816d8c9bc9518f4c5ceddef6..5ac7f6b58182f73f38175005751b4abe917a937c 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
@@ -106,14 +106,23 @@ function print_inventory_sales()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
     $category = $_POST['PARAM_2'];
     $location = $_POST['PARAM_3'];
     $detail = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
+       if ($destination)
+       {
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+               $filename = "InventorySalesReport.xml";
+       }       
+       else
+       {
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+               $filename = "InventorySalesReport.pdf";
+       }
 
     $dec = user_price_dec();
 
@@ -165,9 +174,9 @@ function print_inventory_sales()
                                        $rep->NewLine(2, 3);
                                        $rep->TextCol(0, 2, _('Total'));
                                }
-                               $rep->TextCol(2, 3, number_format2($total, $dec));
-                               $rep->TextCol(3, 4, number_format2($total1, $dec));
-                               $rep->Textcol(4, 5, number_format2($total2, $dec));
+                               $rep->AmountCol(2, 3, $total, $dec);
+                               $rep->AmountCol(3, 4, $total1, $dec);
+                               $rep->AmountCol(4, 5, $total2, $dec);
                                if ($detail)
                                {
                                        $rep->Line($rep->row - 2);
@@ -192,9 +201,9 @@ function print_inventory_sales()
                                        $rep->fontsize -= 2;
                                        $rep->TextCol(0, 1, $stock_id);
                                        $rep->TextCol(1, 2, $stock_desc);
-                                       $rep->TextCol(2, 3, number_format2($amt, $dec));
-                                       $rep->TextCol(3, 4, number_format2($cost, $dec));
-                                       $rep->TextCol(4, 5, number_format2($cb, $dec));
+                                       $rep->AmountCol(2, 3, $amt, $dec);
+                                       $rep->AmountCol(3, 4, $cost, $dec);
+                                       $rep->AmountCol(4, 5, $cb, $dec);
                                        $rep->fontsize += 2;
                                }
                                $amt = $cost = $cb = 0;
@@ -222,17 +231,17 @@ function print_inventory_sales()
                $rep->fontsize -= 2;
                $rep->TextCol(0, 1, $stock_id);
                $rep->TextCol(1, 2, $stock_desc);
-               $rep->TextCol(2, 3, number_format2($amt, $dec));
-               $rep->TextCol(3, 4, number_format2($cost, $dec));
-               $rep->TextCol(4, 5, number_format2($cb, $dec));
+               $rep->AmountCol(2, 3, $amt, $dec);
+               $rep->AmountCol(3, 4, $cost, $dec);
+               $rep->AmountCol(4, 5, $cb, $dec);
                $rep->fontsize += 2;
 
                $rep->NewLine(2, 3);
                $rep->TextCol(0, 2, _('Total'));
        }
-       $rep->TextCol(2, 3, number_format2($total, $dec));
-       $rep->TextCol(3, 4, number_format2($total1, $dec));
-       $rep->Textcol(4, 5, number_format2($total2, $dec));
+       $rep->AmountCol(2, 3, $total, $dec);
+       $rep->AmountCol(3, 4, $total1, $dec);
+       $rep->AmountCol(4, 5, $total2, $dec);
        if ($detail)
        {
                $rep->Line($rep->row - 2);
@@ -240,11 +249,12 @@ function print_inventory_sales()
        }
        $rep->NewLine(2, 1);
        $rep->TextCol(0, 2, _('Grand Total'));
-       $rep->TextCol(2, 3, number_format2($grandtotal, $dec));
-       $rep->TextCol(3, 4, number_format2($grandtotal1, $dec));
-       $rep->Textcol(4, 5, number_format2($grandtotal2, $dec));
+       $rep->AmountCol(2, 3, $grandtotal, $dec);
+       $rep->AmountCol(3, 4, $grandtotal1, $dec);
+       $rep->AmountCol(4, 5, $grandtotal2, $dec);
 
        $rep->Line($rep->row  - 4);
+       $rep->NewLine();
     $rep->End();
 }