X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=b24c10679e2134e735470209948169140b58baa8;hb=00afe270e36d15bc5a817385463b1bb5f3520eb1;hp=52df0b7cece00410dcc636afc82efec888859968;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 52df0b7c..b24c1067 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -53,18 +53,10 @@ function print_sales_orders()
 	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
 
-	$params = array('comments' => $comments);
+	$params = array('comments' => $comments, 'print_quote' => $print_as_quote);
 
 	$cur = get_company_Pref('curr_default');
 
-	if ($email == 0)
-	{
-
-		if ($print_as_quote == 0)
-			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation);
-		else
-			$rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize(), 9, $orientation);
-	}
     if ($orientation == 'L')
     	recalculate_cols($cols);
 
@@ -77,34 +69,26 @@ function print_sales_orders()
 		$baccount = get_default_bank_account($myrow['curr_code']);
 		$params['bankaccount'] = $baccount['id'];
 		$branch = get_branch($myrow["branch_code"]);
-		if ($email == 1)
-			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+
+        if ($i == $from || $email == 1)
+            $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";
+        }		
 		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
-		if ($print_as_quote == 1)
-		{
-			$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 = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-		$rep->currency = $cur;
-		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
 
 		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts);
-		$rep->SetHeaderType('Header2');
 		$rep->NewPage();
 
 		$result = get_sales_order_details($i, ST_SALESORDER);
@@ -138,17 +122,15 @@ function print_sales_orders()
 				$rep->TextCol(6, 7,	$DisplayNet, -2);
 			}
 			$rep->row = $newrow;
-			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->NewPage();
 		}
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
-			$rep->TextColLines(1, 5, $myrow['comments'], -2);
+			$rep->TextColLines(1, 3, $myrow['comments'], -2);
 		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
-		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$doctype = ST_SALESORDER;
@@ -156,10 +138,13 @@ function print_sales_orders()
 		$rep->TextCol(3, 6, _("Sub-total"), -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$rep->NewLine();
-		$rep->TextCol(3, 6, _("Shipping"), -2);
-		$rep->TextCol(6, 7,	$DisplayFreight, -2);
-		$rep->NewLine();
-
+		if ($myrow['freight_cost'] != 0.0)
+		{
+			$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+			$rep->TextCol(3, 6, _("Shipping"), -2);
+			$rep->TextCol(6, 7,	$DisplayFreight, -2);
+			$rep->NewLine();
+		}	
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		if ($myrow['tax_included'] == 0) {
 			$rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
@@ -185,7 +170,7 @@ function print_sales_orders()
 					if ($first)
 					{
 						$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
-						$rep->TextCol(6, 7,	number_format2($sign*$tax_item['net_amount'], $dec), -2);
+						$rep->TextCol(6, 7,	number_format2($tax_item['net_amount'], $dec), -2);
 						$rep->NewLine();
 					}
 					$rep->TextCol(3, 6, $tax_type_name, -2);
@@ -217,12 +202,9 @@ function print_sales_orders()
 			$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
 		}	
 		$rep->Font();
-		if ($email == 1)
-		{
-			$rep->End($email);
-		}
+        if ($i == $to || $email == 1)
+            $rep->End($email);
+		
 	}
-	if ($email == 0)
-		$rep->End();
 }