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

[MERGE]: Merged ssu branch 

bzr revid: atp@tinyerp.com-20121107172408-bdck026rez35vy32
This commit is contained in:
Atul Patel (OpenERP) 2012-11-07 22:54:08 +05:30
parent f4d83e6b12 584f5216ce
commit cf5325c3b3
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/hr_expense/hr_expense.py
View File

@ -236,16 +236,6 @@ class product_product(osv.osv):
'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."),
}
def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
if not hr_expense_ok:
return {}
data_obj = self.pool.get('ir.model.data')
cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
categ_id = data_obj.browse(cr, uid, cat_id).res_id
res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }}
return res
product_product()
class hr_expense_line(osv.osv):

2
addons/hr_expense/hr_expense_view.xml
View File

@ -195,7 +195,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<div name="options" position="inside">
<field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
<field name="hr_expense_ok"/>
<label for="hr_expense_ok"/>
</div>
</field>