X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=333a11301284140d63818efc27cebc402988c9fd;hb=de320b43ef41373a90d9061483b6e8970947fdfa;hp=32cd1b7440c28f33820f0bd93a05df4d80eefda8;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 32cd1b74..333a1130 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -39,7 +39,7 @@ echo "<tr valign=top><td>";
 start_table("$table_style width=95%");
 label_row(_("Customer Name"), $_SESSION['Items']->customer_name, "class='tableheader2'",
 	"colspan=3");
-start_row();	
+start_row();
 label_cells(_("Customer Order Ref."), $_SESSION['Items']->cust_ref, "class='tableheader2'");
 label_cells(_("Deliver To Branch"), $_SESSION['Items']->deliver_to, "class='tableheader2'");
 end_row();
@@ -52,7 +52,7 @@ label_cells(_("Order Currency"), $_SESSION['Items']->customer_currency, "class='
 label_cells(_("Deliver From Location"), $_SESSION['Items']->location_name, "class='tableheader2'");
 end_row();
 
-label_row(_("Delivery Address"), nl2br($_SESSION['Items']->delivery_address), 
+label_row(_("Delivery Address"), nl2br($_SESSION['Items']->delivery_address),
 	"class='tableheader2'", "colspan=3");
 label_row(_("Telephone"), $_SESSION['Items']->phone, "class='tableheader2'", "colspan=3");
 label_row(_("E-mail"), "<a href='mailto:" . $_SESSION['Items']->email . "'>" . $_SESSION['Items']->email . "</a>",
@@ -74,7 +74,7 @@ $result = db_query($sql,"The related delivery notes could not be retreived");
 $delivery_total = 0;
 $k = 0;
 
-while ($del_row = db_fetch($result)) 
+while ($del_row = db_fetch($result))
 {
 
 	alt_table_row_color($k);
@@ -90,7 +90,7 @@ while ($del_row = db_fetch($result))
 
 }
 
-label_row(null, number_format2($delivery_total,user_price_dec()), "", "colspan=4 align=right");
+label_row(null, price_format($delivery_total), "", "colspan=4 align=right");
 
 end_table();
 echo "</td><td valign='top'>";
@@ -107,7 +107,7 @@ $result = db_query($sql,"The related invoices could not be retreived");
 $invoices_total = 0;
 $k = 0;
 
-while ($inv_row = db_fetch($result)) 
+while ($inv_row = db_fetch($result))
 {
 
 	alt_table_row_color($k);
@@ -123,7 +123,7 @@ while ($inv_row = db_fetch($result))
 
 }
 
-label_row(null, number_format2($invoices_total,user_price_dec()), "", "colspan=4 align=right");
+label_row(null, price_format($invoices_total), "", "colspan=4 align=right");
 
 end_table();
 
@@ -139,7 +139,7 @@ $result = db_query($sql,"The related credit notes could not be retreived");
 $credits_total = 0;
 $k = 0;
 
-while ($credits_row = db_fetch($result)) 
+while ($credits_row = db_fetch($result))
 {
 
 	alt_table_row_color($k);
@@ -155,7 +155,7 @@ while ($credits_row = db_fetch($result))
 
 }
 
-label_row(null, "<font color=red>" . number_format2(-$credits_total,user_price_dec()) . "</font>",
+label_row(null, "<font color=red>" . price_format(-$credits_total) . "</font>",
 	"", "colspan=4 align=right");
 
 
@@ -177,27 +177,29 @@ $k = 0;  //row colour counter
 
 foreach ($_SESSION['Items']->line_items as $stock_item) {
 
-	$line_total =	$stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent);
+	$line_total = round($stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent),
+	   user_price_dec());
 
 	alt_table_row_color($k);
 
 	label_cell($stock_item->stock_id);
 	label_cell($stock_item->item_description);
-	qty_cell($stock_item->quantity);
+	$dec = get_qty_dec($stock_item->stock_id);
+	qty_cell($stock_item->quantity, false, $dec);
 	label_cell($stock_item->units);
 	amount_cell($stock_item->price);
 	amount_cell($stock_item->discount_percent * 100);
 	amount_cell($line_total);
-	
-	qty_cell($stock_item->qty_done);
+
+	qty_cell($stock_item->qty_done, false, $dec);
 	end_row();
 }
 
 $items_total = $_SESSION['Items']->get_items_total();
 
-$display_total = number_format2($items_total + $_SESSION['Items']->freight_cost,user_price_dec());
+$display_total = price_format($items_total + $_SESSION['Items']->freight_cost);
 
-label_row(_("Shipping"), number_format2($_SESSION['Items']->freight_cost,user_price_dec()),
+label_row(_("Shipping"), price_format($_SESSION['Items']->freight_cost),
 	"align=right colspan=6", "nowrap align=right");
 label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
 	"nowrap align=right");