X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=c7e7cb134d34699128aa109c21302f3673df1877;hb=39150665d5955716247c6c6e06adbcc2cad037a9;hp=5d3f28d14917cde55d3224d67cb232f2f366828d;hpb=84e2f869630484bd9380e5c30647a483bce14d1e;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 5d3f28d1..c7e7cb13 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -53,10 +53,8 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
 
 function display_po_receive_items()
 {
-	global $table_style;
-
 	div_start('grn_items');
-    start_table("colspan=7 $table_style width=90%");
+    start_table(TABLESTYLE, "colspan=7 width=90%");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
     	_("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
     table_header($th);
@@ -105,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();
 }
@@ -122,7 +131,7 @@ function check_po_changed()
 	// Otherwise if you try to fullfill item quantities separately will give error.
 	$result = get_po_items($_SESSION['PO']->order_no);
 
-	$line_no = 1;
+	$line_no = 0;
 	while ($myrow = db_fetch($result))
 	{
 		$ln_item = $_SESSION['PO']->line_items[$line_no];
@@ -316,7 +325,6 @@ submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear
 end_form();
 
 //--------------------------------------------------------------------------------------------------
-
 end_page();
 ?>