diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 75fb624e4d8..484bd7f520a 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -37,7 +37,7 @@ class account_configuration(osv.osv_memory):
             """),
             'tax_value': fields.float('Value'),
     }
-    
+
     _defaults = {
             'tax_policy': 'global_on_order',
     }
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index fa92752ecdd..a86c2aabf4f 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -41,13 +41,13 @@ class crm_configuration(osv.osv_memory):
         'is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
         'user' : fields.char('Username', size=256),
         'password' : fields.char('Password', size=1024),
-        'module_import_sugarcrm' : fields.boolean("Import data from sugarCRM?",
+        'module_import_sugarcrm' : fields.boolean("SugarCRM Import",
                                     help="""Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees, Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.
                                     It installs import_sugarcrm module.
                                     """),
-        'module_import_google' : fields.boolean("Import Contacts & Meetings from Google",
+        'module_import_google' : fields.boolean("Google Import",
                                     help="""
-                                    Import google contact in partner address and add google calendar events details in Meeting
+                                    Import google contact in partner address and add google calendar events details in Meeting.
                                     It installs import_google module.
                                     """),
         'module_wiki_sale_faq' : fields.boolean("Install a sales FAQ?",
@@ -65,7 +65,7 @@ class crm_configuration(osv.osv_memory):
                                     """),
         'module_google_map' : fields.boolean("Google maps on customer",
                                     help="""
-                                    This allows yopu to locate customer on Google Map
+                                    This allows yopu to locate customer on Google Map.
                                     It installs google_map module.
                                     """),
         'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a1857748b9d..6aca544a295 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -50,7 +50,7 @@
                     <field name="name"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
-                    <field name="uom_id" string="UoM"/>
+                    <field name="uom_id" string="UoM" groups="base.group_sale_uom_per_product"/>
                     <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
@@ -87,7 +87,7 @@
                     </group>
                     <group colspan="1" col="1">
                         <field name="product_image" widget='image' nolabel="1"/>
-                    </group> 
+                    </group>
                    </group>
 
                     <notebook colspan="4">
@@ -125,11 +125,11 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="base.group_sale_uom_per_product"/>
                                 <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
+                            <group colspan="2" col="2" name="uos" groups="base.group_sale_uom_per_product">
                                 <separator string="Second UoM" colspan="2"/>
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>
@@ -440,7 +440,7 @@
             <field name="view_id" ref="product_uom_tree_view"/>
             <field name="help">Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category.</field>
         </record>
-        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
+        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65" groups="base.group_sale_uom_per_product"/>
         <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
@@ -674,11 +674,11 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="UOM" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="base.group_sale_uom_per_product"/>
                                 <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
+                            <group colspan="2" col="2" name="uos" groups="base.group_sale_uom_per_product">
                                 <separator string="Second UoM" colspan="2"/>
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>
diff --git a/addons/product/res_config.py b/addons/product/res_config.py
index 7e549b5fb1c..654d31d9d8c 100644
--- a/addons/product/res_config.py
+++ b/addons/product/res_config.py
@@ -35,5 +35,5 @@ class product_groups_configuration(osv.osv_memory):
                                                     It assigns the "UOM per product" group to all employees.
                                                     """),
 }
-    
+
 product_groups_configuration()
\ No newline at end of file
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 4fba712c00a..a4cebc9b3d3 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -18,17 +18,15 @@
         <field name="name">Product Variant</field>
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
-    
+
     <record id="base.group_sale_pricelist_per_customer" model="res.groups">
         <field name="name">Sales Pricelists</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="base.group_sale_uom_per_product" model="res.groups">
         <field name="name">Product UOM</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
-    
+
     <record id="base.group_user" model="res.groups">
         <field name="implied_ids" eval="[(6,0,[ref('base.group_sale_pricelist_per_customer'),
         ref('base.group_sale_uom_per_product')])]"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 9e66becdf8e..0e009e94fea 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -69,19 +69,22 @@ class sale_configuration(osv.osv_memory):
         'module_analytic_user_function' : fields.boolean("User function by contracts",
                                     help="""This allows you to define what is the default function of a specific user on a given account
                                     This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available.
-                                    It Installs analytic_user_function module"""),
+                                    It Installs analytic_user_function module."""),
         'module_analytic_journal_billing_rate' : fields.boolean("Billing rates by contracts",
                                     help=""" This allows you to define what is the default invoicing rate for a specific journal on a given account.
                                     It installs analytic_journal_billing_rate module.
-                                    """),
+                                    """)
     }
     
     def get_default_installed_modules(self, cr, uid, ids, context=None):
         installed_modules = super(sale_configuration, self).get_default_installed_modules(cr, uid, ids, context=context)
         if installed_modules.get('module_project_mrp') and installed_modules.get('module_project_timesheet'):
             installed_modules['task_work'] = True
+            prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id
+            uom_id = self.pool.get('product.product').browse(cr, uid, prod_id).uom_id.id
+            defaults.update({'time_unit': uom_id})
         return installed_modules
-    
+
     def get_default_sale_configs(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 315433447ac..b902e8f5307 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -22,22 +22,18 @@
 
     <record id="base.group_sale_delivery_address" model="res.groups">
         <field name="name">Addresses in Sale Orders</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="base.group_sale_disc_per_sale_order_line" model="res.groups">
         <field name="name">Discount on lines</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="base.group_sale_taxes_global_on_order" model="res.groups">
         <field name="name">Sales Taxes Global on Order</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
-    
+
     <record id="base.group_sale_taxes_on_order_line" model="res.groups">
         <field name="name">Sales Taxes on Order Lines</field>
-        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="base.group_user" model="res.groups">