X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=659a4a490e3774b7f09c1f0bfc38bf7c2ea7b2d5;hb=b9656a694227d0d22242fffbb343691b0db82030;hp=d30d06a94424fa5d3cbd10400e81cc866ee64174;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index d30d06a9..659a4a49 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -25,12 +25,12 @@ print_deliveries();
 function print_deliveries()
 {
 	global $path_to_root;
-	
+
 	include_once($path_to_root . "reporting/includes/pdf_report.inc");
-	
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
-	$email = $_POST['PARAM_2'];	
+	$email = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
 
 	if ($from == null)
@@ -38,19 +38,19 @@ function print_deliveries()
 	if ($to == null)
 		$to = 0;
 	$dec = user_price_dec();
-	
+
 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
-	// $headers in doctext.inc	
+	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
-	
+
 	$params = array('comments' => $comments);
-	
+
 	$cur = get_company_Pref('curr_default');
-	
+
 	if ($email == 0)
 	{
 		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk.pdf", user_pagesize());
@@ -78,20 +78,20 @@ function print_deliveries()
 			else
 				$rep->title = _('DELIVERY NOTE');
 			$rep->Header2($myrow, $branch, $sales_order, '', 13);
-			
+
    		$result = get_customer_trans_details(13, $i);
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
-				$Net = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), 
+				$Net = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
 				   user_price_dec());
 				$SubTotal += $Net;
 	    		$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
-	    		$DisplayQty = number_format2($myrow2["quantity"],user_qty_dec());
+	    		$DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stock_id']));
 	    		$DisplayNet = number_format2($Net,$dec);
 	    		if ($myrow2["discount_percent"]==0)
 		  			$DisplayDiscount ="";
-	    		else 
+	    		else
 		  			$DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
 				$rep->TextCol(0, 1,	$myrow2['stock_id'], -2);
 				$rep->TextCol(1, 2,	$myrow2['StockDescription'], -2);
@@ -101,18 +101,18 @@ function print_deliveries()
 				$rep->TextCol(5, 6,	$DisplayDiscount, -2);
 				$rep->TextCol(6, 7,	$DisplayNet, -2);
 				$rep->NewLine(1);
-				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) 
+				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 					$rep->Header2($myrow, $branch, $sales_order,'',13);
 			}
-			
+
 			$comments = get_comments(13, $i);
 			if ($comments && db_num_rows($comments))
-			{ 	
+			{
 				$rep->NewLine();
-    			while ($comment=db_fetch($comments)) 
+    			while ($comment=db_fetch($comments))
     				$rep->TextColLines(0, 6, $comment['memo_'], -2);
-			}	
-				
+			}
+
    			$DisplaySubTot = number_format2($SubTotal,$dec);
    			$DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
@@ -121,13 +121,13 @@ function print_deliveries()
 			$doctype=13;
 			if ($rep->currency != $myrow['curr_code'])
 			{
-				include($path_to_root . "reporting/includes/doctext2.inc");			
-			}	
+				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);
 			$rep->NewLine();
@@ -135,29 +135,29 @@ function print_deliveries()
 			$rep->TextCol(6, 7,	$DisplayFreight, -2);
 			$rep->NewLine();
 			$tax_items = get_customer_trans_tax_details(13, $i);
-    		while ($tax_item = db_fetch($tax_items)) 
+    		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'] . 
+					$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
 						" (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2);
-				}		
+				}
     			else
     			{
-					$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . 
+					$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
 						$tax_item['rate'] . "%)", -2);
 					$rep->TextCol(6, 7,	$DisplayTax, -2);
-				}    			
+				}
 				$rep->NewLine();
     		}
     		$rep->NewLine();
 			$DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] +
 				$myrow["ov_amount"],$dec);
-			$rep->Font('bold');	
-			$rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2); 
+			$rep->Font('bold');
+			$rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2);
 			$rep->TextCol(6, 7,	$DisplayTotal, -2);
-			$rep->Font();	
+			$rep->Font();
 			if ($email == 1)
 			{
 				$myrow['dimension_id'] = $paylink; // helper for pmt link
@@ -167,7 +167,7 @@ function print_deliveries()
 					$myrow['DebtorName'] = $branch['br_name'];
 				}
 				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, 13);
-			}	
+			}
 	}
 	if ($email == 0)
 		$rep->End();