4867: supplier quick entry g/l account list should show the bank accounts in the...

[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 1b53f6c3bd5ddbe4f5b85d25fe56414221a2f4b7..d6258d281b5c180c842686f36d5a53a82d7f01d3 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -122,12 +122,6 @@ function invoice_header(&$supp_trans)
        }
                text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60);
 
-       if (get_company_pref('use_dimension'))
-               dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
-
-       if (get_company_pref('use_dimension') == 2)
-               dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
-
        table_section(2, "33%");
 
        if (isset($_POST['_tran_date_changed'])) {
@@ -142,6 +136,12 @@ function invoice_header(&$supp_trans)
 
     label_row(_("Terms:"), $supp_trans->terms['description']);
 
+       if (get_company_pref('use_dimension'))
+               dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
+
+       if (get_company_pref('use_dimension') == 2)
+               dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
+
        table_section(3, "33%");
 
        set_global_supplier($_POST['supplier_id']);
@@ -199,11 +199,12 @@ function invoice_totals(&$supp_trans)
 function display_gl_controls(&$supp_trans, $k)
 {
        $accs = get_supplier_accounts($supp_trans->supplier_id);
-       $_POST['gl_code'] = $accs['purchase_account'] ? 
-               $accs['purchase_account'] : get_company_pref('default_cogs_act');
+    if (!isset($_POST['gl_code']))
+               $_POST['gl_code'] = $accs['purchase_account'] ? 
+                       $accs['purchase_account'] : get_company_pref('default_cogs_act');
 
        alt_table_row_color($k);
-       echo gl_all_accounts_list('gl_code', null, true, true);
+       echo gl_all_accounts_list('gl_code', null, false, true);
        $dim = get_company_pref('use_dimension');
        if ($dim >= 1)
                dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
@@ -316,7 +317,8 @@ function display_gl_items(&$supp_trans, $mode=0)
                        {
                                delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"),
                                          _('Remove line from document'));
-                               label_cell("");
+                edit_button_cell("Edit" . $entered_gl_code->Counter, _("Edit"),
+                      _('Edit line from document'));
                        }       
                        end_row();
                        if ($mode > 1) {
@@ -385,7 +387,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                        alt_table_row_color($k);
 
                        $n = $myrow["id"];
-                       label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]));
+                       label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'");
                        hidden('qty_recd'.$n, $myrow["qty_recd"]);
                hidden('item_code'.$n, $myrow["item_code"]);
                hidden('item_description'.$n, $myrow["description"]);
@@ -393,7 +395,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                hidden('order_price'.$n, $myrow['unit_price']);
                hidden('std_cost_unit'.$n, $myrow['std_cost_unit']);
                hidden('po_detail_item'.$n, $myrow['po_detail_item']);
-               label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
+               label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'");
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
             label_cell(sql2date($myrow["delivery_date"]));
@@ -568,7 +570,7 @@ function display_grn_items(&$supp_trans, $mode=0)
        if ($mode == 1)
        {
                $ret = display_grn_items_for_selection($supp_trans, $k);
-       $colspan = 10;
+       $colspan = 9;
        }
        else
                $colspan = 5;