Merged latest changes from stable branch.

[fa-stable.git] / sales / manage / sales_groups.php

diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php
index 0005aed55f47e3c925bf2837b3c2a3295763f870..60482ba34001523cc29c75221f8988be193db40a 100644 (file)
--- a/sales/manage/sales_groups.php
+++ b/sales/manage/sales_groups.php
@@ -27,7 +27,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        if (strlen($_POST['description']) == 0) 
        {
                $input_error = 1;
-               display_error(_("The area description cannot be empty."));
+               display_error(_("The sales group description cannot be empty."));
                set_focus('description');
        }
 
@@ -65,7 +65,7 @@ if ($Mode == 'Delete')
        {
                delete_sales_group($selected_id);
                display_notification(_('Selected sales group has been deleted'));
-       } //end if Delete area
+       } //end if Delete group
        $Mode = 'RESET';
 } 
 
@@ -82,7 +82,7 @@ $result = get_sales_groups(check_value('show_inactive'));
 
 start_form();
 start_table(TABLESTYLE, "width=30%");
-$th = array(_("Group Name"), "", "");
+$th = array(_("ID"), _("Group Name"), "", "");
 inactive_control_column($th);
 
 table_header($th);
@@ -93,6 +93,7 @@ while ($myrow = db_fetch($result))
        
        alt_table_row_color($k);
                
+       label_cell($myrow["id"]);
        label_cell($myrow["description"]);
        inactive_control_cell($myrow["id"], $myrow["inactive"], 'groups', 'id');
        edit_button_cell("Edit".$myrow["id"], _("Edit"));
@@ -110,12 +111,13 @@ start_table(TABLESTYLE2);
 if ($selected_id != -1) 
 {
        if ($Mode == 'Edit') {
-               //editing an existing area
+               //editing an existing group
                $myrow = get_sales_group($selected_id);
 
                $_POST['description']  = $myrow["description"];
        }
        hidden("selected_id", $selected_id);
+       label_row(_("ID"), $myrow["id"]);
 } 
 
 text_row_ex(_("Group Name:"), 'description', 30);