X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=7c57da3f3f643afd30ff6d7ba4dda7ee85c3d351;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=c93fe0699e98a61ef95edf5797a30648c3d4c6d9;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index c93fe069..7c57da3f 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.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;
 // ----------------------------------------------------------------
@@ -25,7 +25,6 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_sales_orders();
 
 $print_as_quote = 0;
@@ -64,9 +63,9 @@ function print_sales_orders()
 	if ($email == 0)
 	{
 		if ($print_as_quote == 0)
-			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk.pdf", user_pagesize());
+			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
 		else
-			$rep = new FrontReport(_("QUOTE"), "QuoteBulk.pdf", user_pagesize());
+			$rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -112,13 +111,17 @@ function print_sales_orders()
 			else
 				$DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
 			$rep->TextCol(0, 1,	$myrow2['stk_code'], -2);
-			$rep->TextCol(1, 2,	$myrow2['description'], -2);
+			$oldrow = $rep->row;
+			$rep->TextColLines(1, 2, $myrow2['description'], -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, $myrow, $baccount, 9);
 		}
@@ -160,7 +163,7 @@ function print_sales_orders()
 				$myrow['contact_email'] = $branch['email'];
 				$myrow['DebtorName'] = $branch['br_name'];
 			}
-			$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
+			$rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
 		}
 	}
 	if ($email == 0)