X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep110.php;h=9f418f7c712746a3e8b0aff0b725259638a3e5b3;hb=0e64cd1cf3fe3e0c27627641e67f2fbb0c4723c5;hp=fc330428b7f6af2f030b9dd28198f467b8cf6489;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index fc330428..9f418f7c 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -99,12 +99,15 @@ function print_deliveries()
 			}
 			else
 				$rep->title = _('DELIVERY NOTE');
-			$rep->Header2($myrow, $branch, $sales_order, '', 13);
+			$rep->Header2($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY);
 
-   			$result = get_customer_trans_details(13, $i);
+   			$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 +134,7 @@ function print_deliveries()
 				$rep->row = $newrow;
 				//$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-					$rep->Header2($myrow, $branch, $sales_order,'',13);
+					$rep->Header2($myrow, $branch, $sales_order,'',ST_CUSTDELIVERY);
 			}
 
 			$comments = get_comments(ST_CUSTDELIVERY, $i);
@@ -147,7 +150,7 @@ function print_deliveries()
 
     		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 			$linetype = true;
-			$doctype=13;
+			$doctype=ST_CUSTDELIVERY;
 			if ($rep->currency != $myrow['curr_code'])
 			{
 				include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -164,14 +167,14 @@ function print_deliveries()
 				$rep->TextCol(3, 6, $doc_Shipping, -2);
 				$rep->TextCol(6, 7,	$DisplayFreight, -2);
 				$rep->NewLine();
-				$tax_items = get_trans_tax_details(13, $i);
+				$tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i);
     			while ($tax_item = db_fetch($tax_items))
     			{
     				$DisplayTax = number_format2($tax_item['amount'], $dec);
     				if ($tax_item['included_in_price'])
     				{
 						$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
-							" (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2);
+							" (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2);
 					}
     				else
     				{
@@ -187,6 +190,12 @@ 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)
@@ -196,7 +205,7 @@ function print_deliveries()
 					$myrow['email'] = $branch['email'];
 					$myrow['DebtorName'] = $branch['br_name'];
 				}
-				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, 13);
+				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY);
 			}
 	}
 	if ($email == 0)