Moving 2.0 development version to main trunk.

[fa-stable.git] / purchasing / view / view_grn.php

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 0df3c99458930ec1f1379646e8a80275f989f948..4988358cb98c5e7ce799c9b291b1f6e346d25606 100644 (file)
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -9,7 +9,7 @@ page(_("View Purchase Order Delivery"), true);
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
-if (!isset($_GET['trans_no'])) 
+if (!isset($_GET['trans_no']))
 {
        die ("<BR>" . _("This page must be called with a Purchase Order Delivery number to review."));
 }
@@ -26,13 +26,13 @@ display_heading2(_("Line Details"));
 start_table("colspan=9 $table_style width=90%");
 $th = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"),
        _("Unit"), _("Price"), _("Line Total"), _("Quantity Invoiced"));
-       
-table_header($th);     
+
+table_header($th);
 
 $total = 0;
 $k = 0;  //row colour counter
 
-foreach ($purchase_order->line_items as $stock_item) 
+foreach ($purchase_order->line_items as $stock_item)
 {
 
        $line_total = $stock_item->qty_received * $stock_item->price;
@@ -42,18 +42,19 @@ foreach ($purchase_order->line_items as $stock_item)
        label_cell($stock_item->stock_id);
        label_cell($stock_item->item_description);
        label_cell($stock_item->req_del_date, "nowrap align=right");
-       qty_cell($stock_item->qty_received);
+       $dec = get_qty_dec($stock_item->stock_id);
+       qty_cell($stock_item->qty_received, false, $dec);
        label_cell($stock_item->units);
        amount_cell($stock_item->price);
        amount_cell($line_total);
-       qty_cell($stock_item->qty_inv);
+       qty_cell($stock_item->qty_inv, false, $dec);
        end_row();
 
        $total += $line_total;
 }
 
 $display_total = number_format2($total,user_price_dec());
-label_row(_("Total Excluding Tax/Shipping"),  $display_total, 
+label_row(_("Total Excluding Tax/Shipping"),  $display_total,
        "colspan=6", "nowrap align=right");
 
 end_table(1);