Removed obsolete complete parameter.

[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 7661fb9a1eb7f36b5d1ac1ac9470a70f3fc33329..1e6f4f79bfdaf5ea560d60b45ce14ea7a6a79500 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -83,11 +83,11 @@ function create_new_po($trans_type, $trans_no)
 
 function display_po_header(&$order)
 {
-       global $table_style2, $Ajax, $Refs;
+       global $Ajax, $Refs;
 
        $editable = ($order->order_no == 0);
 
-       start_outer_table("width=80% $table_style2");
+       start_outer_table(TABLESTYLE2, "width=80%");
 
        table_section(1);
     if ($editable)
@@ -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');
        }
@@ -187,12 +190,10 @@ function display_po_header(&$order)
 
 function display_po_items(&$order, $editable=true)
 {
-       global $table_style;
-
     display_heading(_("Order Items"));
 
     div_start('items_table');
-    start_table("$table_style width=80%");
+    start_table(TABLESTYLE, "width=80%");
 
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
                _("Received"), _("Unit"),
@@ -254,8 +255,7 @@ function display_po_items(&$order, $editable=true)
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-       global $table_style;
-    start_table("$table_style width=90%");
+    start_table(TABLESTYLE, "width=90%");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");