odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

hr : analytic_user_function- bad object naming convention 

lp bug: https://launchpad.net/bugs/866048 fixed

bzr revid: bde@tinyerp.com-20111004115441-xl5pexqgakb6t9o8
This commit is contained in:
Bharat (OpenERP) 2011-10-04 17:24:41 +05:30
parent 0a85361db9
commit 0aaaa7a387
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/analytic_user_function/analytic_user_function.py
View File

@ -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

6
addons/analytic_user_function/analytic_user_function_view.xml
View File

@ -5,7 +5,7 @@
<!-- analytic_user_funct_grid views -->
<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
<field name="name">analytic_user_funct_grid.tree</field>
<field name="model">analytic_user_funct_grid</field>
<field name="model">analytic.user.funct.grid</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="User's Product for this Analytic Account" editable="bottom">
@ -17,7 +17,7 @@
<record model="ir.ui.view" id="analytic_user_funct_grid_form">
<field name="name">analytic_user_funct_grid.form</field>
<field name="model">analytic_user_funct_grid</field>
<field name="model">analytic.user.funct.grid</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User's Product for this Analytic Account">
@ -55,7 +55,7 @@
</xpath>
</field>
</record>
<!-- hr_timesheet_sheet.sheet inherited view -->
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1">
<field name="name">hr.timesheet.sheet.form.form</field>