X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=6b392cd0ab3fe987d107348586c74b7d8726c636;hb=f36a75347f4940099744e978acb5f043785a4fea;hp=a8fdbc4a6caae71abf175ab090c49b5b6d9d4ac8;hpb=08e465dd87f4929fcd07ba944c4451bc3437f2b3;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index a8fdbc4a..6b392cd0 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -34,7 +34,7 @@ print_deliveries();
 
 function print_deliveries()
 {
-	global $path_to_root, $packing_slip;
+	global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -68,6 +68,7 @@ function print_deliveries()
 			$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
 		else
 			$rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize());
+		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -83,6 +84,7 @@ function print_deliveries()
 			if ($email == 1)
 			{
 				$rep = new FrontReport("", "", user_pagesize());
+				$rep->SetHeaderType('Header2');
 				$rep->currency = $cur;
 				$rep->Font();
 				if ($packing_slip == 0)
@@ -99,12 +101,17 @@ function print_deliveries()
 			}
 			else
 				$rep->title = _('DELIVERY NOTE');
-			$rep->Header2($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY);
+			$contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no']);
+			$rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
+			$rep->NewPage();
 
    			$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
+				if ($myrow2["quantity"] == 0)
+					continue;
+					
 				$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
 				   user_price_dec());
 				$SubTotal += $Net;
@@ -131,7 +138,7 @@ function print_deliveries()
 				$rep->row = $newrow;
 				//$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-					$rep->Header2($myrow, $branch, $sales_order,'',ST_CUSTDELIVERY);
+					$rep->NewPage();
 			}
 
 			$comments = get_comments(ST_CUSTDELIVERY, $i);
@@ -148,14 +155,7 @@ function print_deliveries()
     		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 			$linetype = true;
 			$doctype=ST_CUSTDELIVERY;
-			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");
 			if ($packing_slip == 0)
 			{
 				$rep->TextCol(3, 6, $doc_Sub_total, -2);
@@ -165,18 +165,36 @@ function print_deliveries()
 				$rep->TextCol(6, 7,	$DisplayFreight, -2);
 				$rep->NewLine();
 				$tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i);
+				$first = true;
     			while ($tax_item = db_fetch($tax_items))
     			{
     				$DisplayTax = number_format2($tax_item['amount'], $dec);
-    				if ($tax_item['included_in_price'])
+ 
+ 					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 ($tax_item['included_in_price'])
     				{
-						$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
-							" (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2);
+   						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($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
     				{
-						$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
-							$tax_item['rate'] . "%)", -2);
+						$rep->TextCol(3, 6, $tax_type_name, -2);
 						$rep->TextCol(6, 7,	$DisplayTax, -2);
 					}
 					$rep->NewLine();
@@ -187,15 +205,16 @@ function print_deliveries()
 				$rep->Font('bold');
 				$rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2);
 				$rep->TextCol(6, 7,	$DisplayTotal, -2);
+				$words = price_in_words($myrow['Total'], ST_CUSTDELIVERY);
+				if ($words != "")
+				{
+					$rep->NewLine(1);
+					$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+				}	
 				$rep->Font();
 			}	
 			if ($email == 1)
 			{
-				if ($myrow['email'] == '')
-				{
-					$myrow['email'] = $branch['email'];
-					$myrow['DebtorName'] = $branch['br_name'];
-				}
 				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY);
 			}
 	}