[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101018082435-1f53b9030yh07yek

addons/product/product.py

@@ -732,3 +732,21 @@ class pricelist_partnerinfo(osv.osv):
 pricelist_partnerinfo()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    def _get_group(self, cr, uid, context):
+        result = super(res_users, self)._get_group(cr, uid, context)
+        dataobj = self.pool.get('ir.model.data')
+        try:
+            dummy,group_id = dataobj.get_object_reference(cr, 1, 'product', 'group_product_manager')
+            result.append(group_id)
+        except ValueError:
+            # If these groups does not exists anymore
+            pass
+        return result
+
+    _defaults = {
+        'groups_id': _get_group,
+    }
+
+res_users()