X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=d30d06a94424fa5d3cbd10400e81cc866ee64174;hb=2929f4274302269fcc09f23eb214a51c9d522adb;hp=7142c38666a557b06a5acd1b1c6ef6faae422ba6;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 7142c386..d30d06a9 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -37,7 +37,7 @@ function print_deliveries()
 		$from = 0;
 	if ($to == null)
 		$to = 0;
-	$dec =user_price_dec();
+	$dec = user_price_dec();
 	
 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
@@ -65,7 +65,7 @@ function print_deliveries()
 				continue;
 			$myrow = get_customer_trans($i, 13);
 			$branch = get_branch($myrow["branch_code"]);
-			$sales_order = get_sales_order($myrow["order_"]); // ?
+			$sales_order = get_sales_order_header($myrow["order_"]); // ?
 			if ($email == 1)
 			{
 				$rep = new FrontReport("", "", user_pagesize());
@@ -83,10 +83,11 @@ function print_deliveries()
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
-				$Net = ((1 - $myrow2["discount_percent"]) * $myrow2["FullUnitPrice"] * -$myrow2["quantity"]);
+				$Net = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), 
+				   user_price_dec());
 				$SubTotal += $Net;
-	    		$DisplayPrice = number_format2($myrow2["FullUnitPrice"],$dec);
-	    		$DisplayQty = number_format2(-$myrow2["quantity"],user_qty_dec());
+	    		$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
+	    		$DisplayQty = number_format2($myrow2["quantity"],user_qty_dec());
 	    		$DisplayNet = number_format2($Net,$dec);
 	    		if ($myrow2["discount_percent"]==0)
 		  			$DisplayDiscount ="";
@@ -151,7 +152,7 @@ function print_deliveries()
 				$rep->NewLine();
     		}
     		$rep->NewLine();
-			$DisplayTotal = number_format2($myrow["ov_freight"] + $myrow["ov_gst"] +
+			$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);