Merging version 2.1 RC to main trunk.

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 05b28c3fdaf68f85636d1127c7edbbbcd311e328..d9f8aa22b5da82fc05eae1522b24960645008ac9 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
@@ -7,16 +16,15 @@ $page_security = 2;
 // date_:      2005-05-19
 // Title:      Print Invoices
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "sales/includes/sales_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_invoices();
 
 //----------------------------------------------------------------------------------------------------
@@ -25,7 +33,7 @@ function print_invoices()
 {
        global $path_to_root;
 
-       include_once($path_to_root . "reporting/includes/pdf_report.inc");
+       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
@@ -57,7 +65,7 @@ function print_invoices()
 
        if ($email == 0)
        {
-               $rep = new FrontReport(_('INVOICE'), "InvoiceBulk.pdf", user_pagesize());
+               $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
@@ -115,13 +123,17 @@ function print_invoices()
                        else
                                        $DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
                                $rep->TextCol(0, 1,     $myrow2['stock_id'], -2);
-                               $rep->TextCol(1, 2,     $myrow2['StockDescription'], -2);
+                               $oldrow = $rep->row;
+                               $rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
+                               $newrow = $rep->row;
+                               $rep->row = $oldrow;
                                $rep->TextCol(2, 3,     $DisplayQty, -2);
                                $rep->TextCol(3, 4,     $myrow2['units'], -2);
                                $rep->TextCol(4, 5,     $DisplayPrice, -2);
                                $rep->TextCol(5, 6,     $DisplayDiscount, -2);
                                $rep->TextCol(6, 7,     $DisplayNet, -2);
-                               $rep->NewLine(1);
+                               $rep->row = $newrow;
+                               //$rep->NewLine(1);
                                if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
                                        $rep->Header2($myrow, $branch, $sales_order, $baccount,$j);
                        }
@@ -137,16 +149,16 @@ function print_invoices()
                        $DisplaySubTot = number_format2($SubTotal,$dec);
                        $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
-                       $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+               $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $linetype = true;
                        $doctype = $j;
                        if ($rep->currency != $myrow['curr_code'])
                        {
-                               include($path_to_root . "reporting/includes/doctext2.inc");
+                               include($path_to_root . "/reporting/includes/doctext2.inc");
                        }
                        else
                        {
-                               include($path_to_root . "reporting/includes/doctext.inc");
+                               include($path_to_root . "/reporting/includes/doctext.inc");
                        }
 
                        $rep->TextCol(3, 6, $doc_Sub_total, -2);
@@ -155,7 +167,7 @@ function print_invoices()
                        $rep->TextCol(3, 6, $doc_Shipping, -2);
                        $rep->TextCol(6, 7,     $DisplayFreight, -2);
                        $rep->NewLine();
-                       $tax_items = get_customer_trans_tax_details($j, $i);
+                       $tax_items = get_trans_tax_details($j, $i);
                while ($tax_item = db_fetch($tax_items))
                {
                        $DisplayTax = number_format2($sign*$tax_item['amount'], $dec);