X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=f9a5071c6bc5c1b80a6909d4f3c92220cd1f26ae;hb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;hp=240012538af61f25f0ff4c104300df29bc7fd8c8;hpb=217f175953339fd10cd5aee5942cc263a4092323;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 24001253..f9a5071c 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -54,7 +54,7 @@ function display_po_header(&$order)
         if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
         	$_POST['supplier_id'] = get_global_supplier();
 
-    	supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+    	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
 
     	if ($order->supplier_id != $_POST['supplier_id'])
     	{
@@ -84,7 +84,7 @@ function display_po_header(&$order)
 
     if ($editable)
     {
-    	ref_row(_("Reference:"), 'ref', references::get_next(systypes::po()));
+    	ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po()));
     }
     else
     {
@@ -106,7 +106,7 @@ function display_po_header(&$order)
 	//	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 	//		$_POST['OrderDate'] = end_fiscalyear();
 	//}
-	date_row(_("Order Date:"), 'OrderDate', $_POST['OrderDate'], 0, 0, 0);
+	date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0);
 
   	text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
 
@@ -166,6 +166,8 @@ function display_po_items(&$order, $editable=true)
 
    	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
    		_("Required Delivery Date"), _("Price"), _("Line Total"));
+
+	if (count($order->line_items)) $th[] = '';
    	table_header($th);
 
 	$total = 0;
@@ -175,13 +177,13 @@ function display_po_items(&$order, $editable=true)
 
 		if ($po_line->Deleted == false)
 		{
-    		$line_total =	$po_line->quantity * $po_line->price;
+    		$line_total =	round($po_line->quantity * $po_line->price,  user_price_dec());
     		if (!$editable || !isset($_GET['Edit']) || $_GET['Edit'] != $po_line->line_no)
 			{
     			alt_table_row_color($k);
         		label_cell($po_line->stock_id);
     			label_cell($po_line->item_description);
-                qty_cell($po_line->quantity);
+                qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
     			label_cell($po_line->units);
                 label_cell($po_line->req_del_date);
     			amount_cell($po_line->price);
@@ -205,7 +207,7 @@ function display_po_items(&$order, $editable=true)
 	if (!isset($_GET['Edit']) && $editable)
 		po_item_controls($order);
 
-    $display_total = number_format2($total,user_price_dec());
+    $display_total = price_format($total);
     label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
     	"nowrap align=right");
 
@@ -276,9 +278,9 @@ function po_item_controls(&$order, $stock_id=null)
 		if (!isset($_POST['stock_id']))
 			$_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id;
 		if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
-			$_POST['qty'] = $order->line_items[$_GET['Edit']]->quantity;
+			$_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->quantity, $_POST['stock_id'], $dec);
 		if (!isset($_POST['price']) || ($_POST['price'] == ""))
-			$_POST['price'] = $order->line_items[$_GET['Edit']]->price;
+			$_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price);
 		if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == ""))
 			$_POST['req_del_date'] = $order->line_items[$_GET['Edit']]->req_del_date;
 
@@ -292,34 +294,23 @@ function po_item_controls(&$order, $stock_id=null)
 	{
 		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-		$no_item_list = get_company_pref('no_item_list');
-		if ($no_item_list)
-		{
-			echo "<td colspan=2>\n";
-			stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
-			echo "</td>\n";
-		}
-		else
-		{
-			text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
-			stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "onchange='return setAccount(1, true)'");
-		}
+		stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
     	$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
-   		$_POST['qty'] = 1;
-		$_POST['price'] = get_purchase_price ($order->supplier_id, $_POST['stock_id']);
+   		$_POST['qty'] = qty_format(1, $_POST['stock_id'], $dec);
+		$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
 		$_POST['req_del_date'] = add_days(Today(), 10);
 	}
 
-	text_cells(null, 'qty', null, 13, 15);
+	qty_cells(null, 'qty', null, null, null, $dec);
 
 	label_cell($_POST['units']);
-	date_cells(null, 'req_del_date', null, 0, 0, 0);
-	text_cells(null, 'price', null, 15, 14);
+	date_cells(null, 'req_del_date', '', null, 0, 0, 0);
+	amount_cells(null, 'price', null);
 
 	//$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
-	$line_total = $_POST['qty'] * $_POST['price'];
+	$line_total = round(input_num('qty') * input_num('price'),  user_price_dec());
 	amount_cell($line_total);
 
 	if (isset($_GET['Edit']))