Merging changes form main trunk 2.2.5-2.2.6

[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 885af754583cc8d9beae75bb86fb57735c415c7a..7661fb9a1eb7f36b5d1ac1ac9470a70f3fc33329 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -149,11 +149,7 @@ function display_po_header(&$order)
        }
 
        text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
-
-       echo "<tr><td>" . _("Receive Into:") . "</td>";
-       echo "<td>";
-    echo locations_list('StkLocation', null, false, true);
-       echo "</td></tr>";
+       locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); 
 
        table_section(3);
 
@@ -258,8 +254,8 @@ function display_po_items(&$order, $editable=true)
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-       global $table_style2;
-    start_table("$table_style2 width=90%");
+       global $table_style;
+    start_table("$table_style width=90%");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");