X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=a265bd603a69c9442ff3f5ad4fb38c427628d405;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=f4e43cc0f3b85e80a621f54aae9691991b807777;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index f4e43cc0..a265bd60 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -1,15 +1,16 @@
 <?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;
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+	'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -25,7 +26,6 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_invoices();
 
 //----------------------------------------------------------------------------------------------------
@@ -33,7 +33,7 @@ print_invoices();
 function print_invoices()
 {
 	global $path_to_root;
-
+	
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	$from = $_POST['PARAM_0'];
@@ -50,7 +50,7 @@ function print_invoices()
 		$to = 0;
 	$dec = user_price_dec();
 
-	$fno = explode("-", $from);
+ 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@ -66,7 +66,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);
@@ -85,7 +85,7 @@ function print_invoices()
 			$branch = get_branch($myrow["branch_code"]);
 			$branch['disable_branch'] = $paylink; // helper
 			if ($j == 10)
-				$sales_order = get_sales_order_header($myrow["order_"]);
+				$sales_order = get_sales_order_header($myrow["order_"], 30);
 			else
 				$sales_order = null;
 			if ($email == 1)
@@ -124,13 +124,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);
 			}
@@ -146,7 +150,7 @@ 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'])
@@ -164,7 +168,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);