X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=2a151def233bde1eaeac89f9791a6d098b6765c7;hb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;hp=9c99ff037e3ab964eb5e9377085a6ae320388cee;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 9c99ff03..2a151def 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -9,7 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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_sales_orders();
 
 $print_as_quote = 0;
@@ -64,9 +64,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);
@@ -74,7 +74,7 @@ function print_sales_orders()
 
 	for ($i = $from; $i <= $to; $i++)
 	{
-		$myrow = get_sales_order_header($i);
+		$myrow = get_sales_order_header($i, 30);
 		$branch = get_branch($myrow["branch_code"]);
 		if ($email == 1)
 		{
@@ -97,7 +97,7 @@ function print_sales_orders()
 			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
 		$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
 
-		$result = get_sales_order_details($i);
+		$result = get_sales_order_details($i, 30);
 		$SubTotal = 0;
 		while ($myrow2=db_fetch($result))
 		{
@@ -162,9 +162,12 @@ function print_sales_orders()
 			if ($myrow['contact_email'] == '')
 			{
 				$myrow['contact_email'] = $branch['email'];
+				if ($myrow['contact_email'] == '')
+					$myrow['contact_email'] = $myrow['master_email'];
 				$myrow['DebtorName'] = $branch['br_name'];
 			}
-			$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
+			//$myrow['reference'] = $i;
+			$rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
 		}
 	}
 	if ($email == 0)