X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=1f7270c4840e1c1885d3b013430ee38fea7dede7;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=64502e2abd6202f3958b58f739ca347579f95592;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 64502e2a..1f7270c4 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -45,11 +45,9 @@ function print_sales_orders()
 	$comments = $_POST['PARAM_5'];
 	$orientation = $_POST['PARAM_6'];
 
+	if (!$from || !$to) return;
+
 	$orientation = ($orientation ? 'L' : 'P');
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
 	$dec = user_price_dec();
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@ -70,7 +68,7 @@ function print_sales_orders()
 			$rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize(), 9, $orientation);
 	}
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
@@ -85,17 +83,26 @@ function print_sales_orders()
 		$rep->Font();
 		if ($print_as_quote == 1)
 		{
-			$rep->title = _('QUOTE');
-			$rep->filename = "Quote" . $i . ".pdf";
+			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+			if ($print_as_quote == 1)
+			{
+				$rep->title = _('QUOTE');
+				$rep->filename = "Quote" . $i . ".pdf";
+			}
+			else
+			{
+				$rep->title = _("SALES ORDER");
+				$rep->filename = "SalesOrder" . $i . ".pdf";
+			}
 		}
 		else
-		{
-			$rep->title = _("SALES ORDER");
-			$rep->filename = "SalesOrder" . $i . ".pdf";
-		}
+			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
+		$rep->SetHeaderType('Header2');
+		$rep->currency = $cur;
+		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
 
-		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
+		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts);
 		$rep->NewPage();