Added support for tax included prices in transactions.

[fa-stable.git] / purchasing / po_receive_items.php

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index b536ba82b1a2e8a4bc265ae7c93f5a879976cc74..c7e7cb134d34699128aa109c21302f3673df1877 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -103,9 +103,20 @@ function display_po_receive_items()
                }
     }
 
-    $display_total = number_format2($total,user_price_dec());
-    label_row(_("Total value of items received"), $display_total, "colspan=8 align=right",
-       "nowrap align=right");
+       $colspan = count($th)-1;
+
+       $display_sub_total = price_format($total/* + input_num('freight_cost')*/);
+
+       label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
+       $taxes = $_SESSION['PO']->get_taxes(input_num('freight_cost'));
+       
+       $tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['PO']->tax_included);
+
+       $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+
+       start_row();
+       label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
+       end_row();
     end_table();
        div_end();
 }
@@ -314,7 +325,6 @@ submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear
 end_form();
 
 //--------------------------------------------------------------------------------------------------
-
 end_page();
 ?>