Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

[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 34252f3427a325df1302e5ec08a2986b195e02c9..092e801c58952f2df1d07514d5790d49217eedc1 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -283,11 +283,11 @@ function display_po_items(&$order, $editable=true)
 
        label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
 
-       $taxes = $order->get_taxes(input_num('freight_cost'));
+       $taxes = $order->get_taxes();
        
        $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
 
-       $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+       $display_total = price_format(($total + $tax_total));
 
        start_row();
        label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
@@ -402,7 +402,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
                if ($order->fixed_asset)
                        stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
                else
-                       stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+                       stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
 
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');