Merged changes from main trunk 2.2.1-2.2.2

[fa-stable.git] / purchasing / includes / ui / invoice_ui.inc

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index c5eafa8039f8188b66015f546cf63526d42cd42c..baf2ceb5fa281f390a920d1eb1a198921bc9e77f 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -170,7 +170,7 @@ function display_gl_controls(&$supp_trans, $k)
        $_POST['gl_code'] = $accs['purchase_account'];
 
        alt_table_row_color($k);
-       gl_all_accounts_list('gl_code', null, true, true);
+       echo gl_all_accounts_list('gl_code', null, true, true);
        $dim = get_company_pref('use_dimension');
        if ($dim >= 1)
                dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
@@ -219,7 +219,7 @@ function display_gl_items(&$supp_trans, $mode=0)
                {
                        echo "<div style='float:right;'>";
                        echo _("Quick Entry:")."&nbsp;"; 
-                       quick_entries_list('qid', null, QE_SUPPINV, true);
+                       echo quick_entries_list('qid', null, QE_SUPPINV, true);
                        $qid = get_quick_entry(get_post('qid'));
                        if (list_updated('qid')) {
                                unset($_POST['totamount']); // enable default
@@ -308,7 +308,7 @@ function display_gl_items(&$supp_trans, $mode=0)
                display_gl_controls($supp_trans, $k);
        $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
        label_row(_("Total"), price_format($total_gl_value),
-               "colspan=".$colspan." align=right", "nowrap align=right");
+               "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1));
 
        end_table();
        div_end();