X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep109.php;h=845d0ac746301e19fb1643c60e8380e068b9f91b;hb=931f50706c4dcc60c5a26c99d0837b7509277f78;hp=a6a4a434e9b08f12952221aceea5dee802532017;hpb=a3c366442e07bfa82a326df8fea3d9d4b35a3dd8;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index a6a4a434..845d0ac7 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -23,6 +23,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
+include_once($path_to_root . "/taxes/tax_calc.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -64,6 +65,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 +80,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,14 +97,20 @@ function print_sales_orders()
 		}
 		else
 			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-		$rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
+
+		$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;
+		$items = $prices = array();
 		while ($myrow2=db_fetch($result))
 		{
 			$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
 			   user_price_dec());
+			$prices[] = $Net;
+			$items[] = $myrow2['stk_code'];
 			$SubTotal += $Net;
 			$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
 			$DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stk_code']));
@@ -123,7 +132,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, ST_SALESORDER);
+				$rep->NewPage();
 		}
 		if ($myrow['comments'] != "")
 		{
@@ -136,14 +145,7 @@ function print_sales_orders()
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
 		$doctype = ST_SALESORDER;
-		if ($rep->currency != $myrow['curr_code'])
-		{
-			include($path_to_root . "/reporting/includes/doctext2.inc");
-		}
-		else
-		{
-			include($path_to_root . "/reporting/includes/doctext.inc");
-		}
+		include($path_to_root . "/reporting/includes/doctext.inc");
 
 		$rep->TextCol(3, 6, $doc_Sub_total, -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
@@ -151,14 +153,59 @@ function print_sales_orders()
 		$rep->TextCol(3, 6, $doc_Shipping, -2);
 		$rep->TextCol(6, 7,	$DisplayFreight, -2);
 		$rep->NewLine();
+
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
-		$rep->Font('bold');
-		if ($myrow['tax_included'] == 0)
+		if ($myrow['tax_included'] == 0) {
 			$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
-		else	
-			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
+			$rep->TextCol(6, 7,	$DisplayTotal, -2);
+			$rep->NewLine();
+		}
+
+		$tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"],
+		  $myrow['tax_group_id'], $myrow['tax_included'],  null);
+		$first = true;
+		foreach($tax_items as $tax_item)
+		{
+			$DisplayTax = number_format2($tax_item['Value'], $dec);
+
+			if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+				$tax_type_name = $tax_item['tax_type_name'];
+			else
+				$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
+
+			if ($myrow['tax_included'])
+			{
+				if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+				{
+					if ($first)
+					{
+						$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
+						$rep->TextCol(6, 7,	number_format2($sign*$tax_item['net_amount'], $dec), -2);
+						$rep->NewLine();
+					}
+					$rep->TextCol(3, 6, $tax_type_name, -2);
+					$rep->TextCol(6, 7,	$DisplayTax, -2);
+					$first = false;
+				}
+				else
+					$rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+			}
+			else
+			{
+				$SubTotal += $tax_item['Value'];
+				$rep->TextCol(3, 6, $tax_type_name, -2);
+				$rep->TextCol(6, 7,	$DisplayTax, -2);
+			}
+			$rep->NewLine();
+		}
+
+		$rep->NewLine();
+
+		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
+		$rep->Font('bold');
+		$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$words = price_in_words($myrow['Total'], ST_SALESORDER);
+		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
 		if ($words != "")
 		{
 			$rep->NewLine(1);
@@ -167,14 +214,6 @@ function print_sales_orders()
 		$rep->Font();
 		if ($email == 1)
 		{
-			if ($myrow['contact_email'] == '')
-			{
-				$myrow['contact_email'] = $branch['email'];
-				if ($myrow['contact_email'] == '')
-					$myrow['contact_email'] = $myrow['master_email'];
-				$myrow['DebtorName'] = $branch['br_name'];
-			}
-			//$myrow['reference'] = $i;
 			$rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
 		}
 	}