Merged changes from main trunk 2.2.1-2.2.2

[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 336b8a6e154fe2ae888726c49a971e574d419d7f..830f483f3998e7e04a9ec150f4508d1f618cb8a9 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -37,7 +37,7 @@ function create_new_po()
                unset ($_SESSION['PO']);
        }
 
-       session_register("PO");
+       //session_register("PO");
 
        $_SESSION['PO'] = new purch_order;
        $_POST['OrderDate'] = new_doc_date();
@@ -50,7 +50,7 @@ function create_new_po()
 
 function display_po_header(&$order)
 {
-       global $table_style2, $Ajax;
+       global $table_style2, $Ajax, $Refs;
 
        $editable = ($order->order_no == 0);
 
@@ -59,10 +59,10 @@ function display_po_header(&$order)
        table_section(1);
     if ($editable)
     {
-        if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+        if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT))
                $_POST['supplier_id'] = get_global_supplier();
 
-       supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
+       supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true);
        }
        else
        {
@@ -76,6 +76,7 @@ function display_po_header(&$order)
                foreach ($order->line_items as $line_no=>$item) {
                        $line = &$order->line_items[$line_no];
                        $line->price =  get_purchase_price ($order->supplier_id, $_POST['stock_id']);
+                       $line->quantity =  get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']);
                }
            $Ajax->activate('items_table');
        }
@@ -90,7 +91,7 @@ function display_po_header(&$order)
 
     if ($editable)
     {
-       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po()));
+       ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_PURCHORDER));
     }
     else
     {
@@ -118,7 +119,7 @@ function display_po_header(&$order)
 
        echo "<tr><td>" . _("Receive Into:") . "</td>";
        echo "<td>";
-    locations_list('StkLocation', null, false, true);
+    echo locations_list('StkLocation', null, false, true);
        echo "</td></tr>";
 
        table_section(3);
@@ -164,7 +165,8 @@ function display_po_items(&$order, $editable=true)
     div_start('items_table');
     start_table("$table_style width=80%");
 
-       $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
+       $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
+               _("Received"), _("Unit"),
                _("Required Delivery Date"), _("Price"), _("Line Total"), "");
 
        if (count($order->line_items)) $th[] = '';
@@ -185,9 +187,10 @@ function display_po_items(&$order, $editable=true)
                        label_cell($po_line->stock_id);
                        label_cell($po_line->item_description);
                 qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+                qty_cell($po_line->qty_received, 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);
+                       amount_decimal_cell($po_line->price);
                 amount_cell($line_total);
 
                 if ($editable)
@@ -211,8 +214,8 @@ function display_po_items(&$order, $editable=true)
                po_item_controls($order);
 
     $display_total = price_format($total);
-    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
-       "nowrap align=right");
+    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=7 align=right",
+       "nowrap align=right", 2);
 
        end_table(1);
        div_end();
@@ -235,7 +238,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
 
     if (!$is_self)
     {
-       label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no),
+       label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
                "class='tableheader2'");
     }
        end_row();
@@ -276,6 +279,7 @@ function po_item_controls(&$order, $stock_id=null)
    global $Ajax;
        start_row();
 
+       $dec2 = 0;
        $id = find_submit('Edit');
        if (($id != -1) && $stock_id != null)
        {
@@ -284,7 +288,8 @@ function po_item_controls(&$order, $stock_id=null)
                $_POST['stock_id'] = $order->line_items[$id]->stock_id;
                        $dec = get_qty_dec($_POST['stock_id']);
                $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
-               $_POST['price'] = price_format($order->line_items[$id]->price);
+               //$_POST['price'] = price_format($order->line_items[$id]->price);
+               $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
                $_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
 
                $_POST['units'] = $order->line_items[$id]->units;
@@ -293,12 +298,13 @@ function po_item_controls(&$order, $stock_id=null)
                label_cell($_POST['stock_id']);
                label_cell($order->line_items[$id]->item_description);
            $Ajax->activate('items_table');
+               $qty_rcvd = $order->line_items[$id]->qty_received;
        }
        else
        {
                hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-               stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
+               stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');
@@ -310,16 +316,19 @@ function po_item_controls(&$order, $stock_id=null)
                $_POST['units'] = $item_info["units"];
 
                $dec = $item_info["decimals"];
-               $_POST['qty'] = number_format2(1, $dec);
-               $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+               $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
+               //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+               $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
                $_POST['req_del_date'] = add_days(Today(), 10);
+               $qty_rcvd = '';
        }
 
        qty_cells(null, 'qty', null, null, null, $dec);
+       qty_cell($qty_rcvd, false, $dec);
 
        label_cell($_POST['units'], '', 'units');
        date_cells(null, 'req_del_date', '', null, 0, 0, 0);
-       amount_cells(null, 'price', null);
+       amount_cells(null, 'price', null, null, null, $dec2);
 
        //$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
        $line_total = round(input_num('qty') * input_num('price'),  user_price_dec());