[MERGE]:with latest addons

bzr revid: ksa@tinyerp.com-20111010085618-kbc3r13vqajoq0un

1 files changed, 5 insertions, 5 deletions

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index ca3e9ef80c7..030a45db393 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -24,7 +24,7 @@ from tools.translate import _
 
 class analytic_user_funct_grid(osv.osv):
 
-    _name="analytic_user_funct_grid"
+    _name="analytic.user.funct.grid"
     _description= "Relation table between users and products on a analytic account"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
@@ -39,7 +39,7 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'user_product_ids': fields.one2many('analytic_user_funct_grid', 'account_id', 'Users/Products Rel.'),
+        'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
 account_analytic_account()
@@ -54,7 +54,7 @@ class hr_analytic_timesheet(osv.osv):
     # Take the first found... if nothing found => return False
     def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
 
-        temp=self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
+        temp=self.pool.get('analytic.user.funct.grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
         account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
         if temp:
             return temp
@@ -81,7 +81,7 @@ class hr_analytic_timesheet(osv.osv):
             return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
         else:
             #get the old values from super and add the value from the new relation analytic_user_funct_grid
-            r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
+            r = self.pool.get('analytic.user.funct.grid').browse(cr, uid, temp)[0]
             res.setdefault('value',{})
             res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)['value']
             res['value']['product_id'] = r.product_id.id
@@ -119,7 +119,7 @@ class hr_analytic_timesheet(osv.osv):
             temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
             if temp:
                 #add the value from the new relation analytic_user_funct_grid
-                r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
+                r = self.pool.get('analytic.user.funct.grid').browse(cr, uid, temp)[0]
                 res['value']['product_id'] = r.product_id.id
 
                 #the change of product has to impact the amount, uom and general_account_id