Merged changes from main trunk up to 2.2.7

[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..c862cca236fbd0819bc0d14d38229886025cd939 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -104,12 +104,15 @@ function display_po_header(&$order)
     }
 
        if ($order->supplier_id != get_post('supplier_id',-1)) {
+               $old_supp = $order->supplier_id;
                get_supplier_details_to_order($order, $_POST['supplier_id']);
                // supplier default price update
                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']);
+                       $line->price =  get_purchase_price ($order->supplier_id, $line->stock_id);
+                       $line->quantity =
+                               $line->quantity/get_purchase_conversion_factor ($old_supp, $line->stock_id)
+                                       *get_purchase_conversion_factor ($order->supplier_id, $line->stock_id);
                }
            $Ajax->activate('items_table');
        }
@@ -149,11 +152,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 +257,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'");