X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=56498f0b62658a773552024f1329ec7cc4e2f1d6;hb=c5dc92bf60148463852a81f74284117ce3fd1e92;hp=11349184d626e43203791e1eb8a2ca92d2269964;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 11349184..56498f0b 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -64,6 +64,7 @@ function print_sales_orders()
 			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
 		else
 			$rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize());
+		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -78,6 +79,7 @@ function print_sales_orders()
 		if ($email == 1)
 		{
 			$rep = new FrontReport("", "", user_pagesize());
+			$rep->SetHeaderType('Header2');
 			$rep->currency = $cur;
 			$rep->Font();
 			if ($print_as_quote == 1)
@@ -94,7 +96,10 @@ function print_sales_orders()
 		}
 		else
 			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-		$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+
+		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts);
+		$rep->NewPage();
 
 		$result = get_sales_order_details($i, ST_SALESORDER);
 		$SubTotal = 0;
@@ -123,7 +128,7 @@ function print_sales_orders()
 			$rep->row = $newrow;
 			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-				$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+				$rep->NewPage();
 		}
 		if ($myrow['comments'] != "")
 		{
@@ -135,15 +140,8 @@ function print_sales_orders()
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
-		$doctype = 9;
-		if ($rep->currency != $myrow['curr_code'])
-		{
-			include($path_to_root . "/reporting/includes/doctext2.inc");
-		}
-		else
-		{
-			include($path_to_root . "/reporting/includes/doctext.inc");
-		}
+		$doctype = ST_SALESORDER;
+		include($path_to_root . "/reporting/includes/doctext.inc");
 
 		$rep->TextCol(3, 6, $doc_Sub_total, -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
@@ -158,9 +156,16 @@ function print_sales_orders()
 		else	
 			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
+		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
+		if ($words != "")
+		{
+			$rep->NewLine(1);
+			$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+		}	
 		$rep->Font();
 		if ($email == 1)
 		{
+			$res = get_branch_contacts(branch_code, 'order', customer_id);
 			if ($myrow['contact_email'] == '')
 			{
 				$myrow['contact_email'] = $branch['email'];