Added invoice preselection option.

[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 237d34b10c9d689af55e44ec0bc4fc00085ff66d..ae8f4ba297ff2b32d900383ea62707163bc0b42b 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();
@@ -119,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);
@@ -177,45 +177,41 @@ function display_po_items(&$order, $editable=true)
        $k = 0;
        foreach ($order->line_items as $line_no => $po_line)
        {
-
-               if ($po_line->Deleted == false)
+       $line_total =   round($po_line->quantity * $po_line->price,  user_price_dec());
+       if (!$editable || ($id != $line_no))
                {
-               $line_total =   round($po_line->quantity * $po_line->price,  user_price_dec());
-               if (!$editable || ($id != $line_no))
+               alt_table_row_color($k);
+               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_decimal_cell($po_line->price);
+            amount_cell($line_total);
+
+                       if ($editable)
                        {
-                       alt_table_row_color($k);
-                       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_decimal_cell($po_line->price);
-                amount_cell($line_total);
-
-                if ($editable)
-                {
                                        edit_button_cell("Edit$line_no", _("Edit"),
                                          _('Edit document line'));
                                        delete_button_cell("Delete$line_no", _("Delete"),
-                                         _('Remove line from document'));
-                }
-                       end_row();
-                       }
-                       else
-                       {
-                               po_item_controls($order, $po_line->stock_id);
+                                               _('Remove line from document'));
                        }
-               $total += $line_total;
+               end_row();
+               }
+               else
+               {
+                       po_item_controls($order, $po_line->stock_id);
                }
+               $total += $line_total;
     }
 
        if ($id==-1 && $editable)
                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();
@@ -304,7 +300,7 @@ function po_item_controls(&$order, $stock_id=null)
        {
                hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-               stock_purchasable_items_list_cells(null, 'stock_id', null, false, 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');