Javascript bugfix in selecting orders as template

[fa-stable.git] / purchasing / includes / ui / po_ui.inc

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index a78263a89271caf8de02d1b47981a10631df0703..a4f5115b798fb2533c37a69bcebc0b2bc8aba56b 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -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,7 +177,7 @@ 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);
@@ -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);
                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;
 
@@ -290,37 +292,36 @@ function po_item_controls(&$order, $stock_id=null)
        }
        else
        {
-               global $no_item_list;
-
                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";
+                       echo "<td colspan=2 nowrap>\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)'");
+                       text_cells(null, "StockID2", "", 12, 10, "", "", "class='combo' rel='stock_id' onblur='submit()'");
+                       stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "class='combo' rel='StockID2'");
                }
        $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['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);
 
        label_cell($_POST['units']);
        date_cells(null, 'req_del_date', null, 0, 0, 0);
-       text_cells(null, 'price', null, 15, 14);
+       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']))