Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index b58436abd2561b448d2c3a7be31a9e79dfa756db..9c6925f46246d6c7f9897651dc1a2e30a808e59d 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -227,9 +227,7 @@ function display_order_summary($title, &$order, $editable_items=false)
        label_cell('', 'colspan=2');
        end_row();
        $display_sub_total = price_format($total + input_num('freight_cost'));
-
        label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
-
        $taxes = $order->get_taxes(input_num('freight_cost'));
        $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
 
@@ -254,9 +252,9 @@ function display_order_summary($title, &$order, $editable_items=false)
 
 function display_order_header(&$order, $editable, $date_text, $display_tax_group=false)
 {
-       global $table_style, $Ajax, $SysPrefs;
+       global $table_style2, $Ajax, $SysPrefs;
 
-       start_outer_table("width=80% $table_style");
+       start_outer_table("width=80% $table_style2");
 
        table_section(1);
        
@@ -360,7 +358,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                }
        }
 
-       ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
+       ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 
        if (!is_company_currency($order->customer_currency))
        {
@@ -533,7 +531,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
        label_cell($units, '', 'units');
 
-       $str = amount_cells(null, 'price');
+       amount_cells(null, 'price');
 
        small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec());