X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=a0051c4586d4c1ed3c550363ba35283a4b2cb541;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=75ffe45be85563c2e93036ed1b9f247dbabd28f8;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 75ffe45b..a0051c45 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.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:	Janusz Dobrwolski
@@ -26,7 +27,6 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_deliveries();
 
 //----------------------------------------------------------------------------------------------------
@@ -62,7 +62,7 @@ function print_deliveries()
 
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk.pdf", user_pagesize());
+		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -74,7 +74,7 @@ function print_deliveries()
 				continue;
 			$myrow = get_customer_trans($i, 13);
 			$branch = get_branch($myrow["branch_code"]);
-			$sales_order = get_sales_order_header($myrow["order_"]); // ?
+			$sales_order = get_sales_order_header($myrow["order_"], 30); // ?
 			if ($email == 1)
 			{
 				$rep = new FrontReport("", "", user_pagesize());
@@ -103,13 +103,17 @@ function print_deliveries()
 	    		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,'',13);
 			}
@@ -143,7 +147,7 @@ function print_deliveries()
 			$rep->TextCol(3, 6, $doc_Shipping, -2);
 			$rep->TextCol(6, 7,	$DisplayFreight, -2);
 			$rep->NewLine();
-			$tax_items = get_customer_trans_tax_details(13, $i);
+			$tax_items = get_trans_tax_details(13, $i);
     		while ($tax_item = db_fetch($tax_items))
     		{
     			$DisplayTax = number_format2($tax_item['amount'], $dec);