Added tax information

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 19d0719833c373cd1ed6aa054fc37c0f558960cd..31126c97f05a5912fbc4917d7af73b478f11a108 100644 (file)
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -66,9 +66,20 @@ foreach ($purchase_order->line_items as $stock_item)
        $total += $line_total;
 }
 
-$display_total = number_format2($total,user_price_dec());
-label_row(_("Total Excluding Tax/Shipping"),  $display_total,
-       "colspan=6", "nowrap align=right");
+$display_sub_tot = number_format2($total,user_price_dec());
+label_row(_("Sub Total"), $display_sub_tot,
+       "align=right colspan=6", "nowrap align=right", 1);
+
+$taxes = $purchase_order->get_taxes();
+$tax_total = display_edit_tax_items($taxes, 6, $purchase_order->tax_included, 1);
+
+$display_total = price_format(($total + $tax_total));
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('');
+end_row();
+
 
 end_table(1);
 

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index 0c00949304e15cfda9440fe84cb0e911b6b3ef72..ef54291f26ff4839e8654a151ff89f26baba8e23 100644 (file)
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -43,7 +43,7 @@ display_heading2(_("Line Details"));
 start_table(TABLESTYLE, "colspan=9 width=100%");
 
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"),
-       _("Line Total"), _("Requested By"), _("Quantity Received"), _("Quantity Invoiced"));
+       _("Requested By"), _("Line Total"), _("Quantity Received"), _("Quantity Invoiced"));
 table_header($th);
 $total = $k = 0;
 $overdue_items = false;
@@ -71,8 +71,8 @@ foreach ($purchase_order->line_items as $stock_item)
        qty_cell($stock_item->quantity, false, $dec);
        label_cell($stock_item->units);
        amount_decimal_cell($stock_item->price);
-       amount_cell($line_total);
        label_cell($stock_item->req_del_date);
+       amount_cell($line_total);
        qty_cell($stock_item->qty_received, false, $dec);
        qty_cell($stock_item->qty_inv, false, $dec);
        end_row();
@@ -80,9 +80,19 @@ foreach ($purchase_order->line_items as $stock_item)
        $total += $line_total;
 }
 
-$display_total = number_format2($total,user_price_dec());
-label_row(_("Total Excluding Tax/Shipping"), $display_total,
-       "align=right colspan=5", "nowrap align=right", 3);
+$display_sub_tot = number_format2($total,user_price_dec());
+label_row(_("Sub Total"), $display_sub_tot,
+       "align=right colspan=6", "nowrap align=right",2);
+
+$taxes = $purchase_order->get_taxes();
+$tax_total = display_edit_tax_items($taxes, 6, $purchase_order->tax_included,2);
+
+$display_total = price_format(($total + $tax_total));
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('', "colspan=2");
+end_row();
 
 end_table();