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

[IMP] hr_timesheet & project bugfixes 

bzr revid: fp@tinyerp.com-20111117082810-zzwsg5c2e3l83epz
This commit is contained in:
Fabien Pinckaers 2011-11-17 09:28:10 +01:00
parent e7c3f35903
commit e58a82c2b3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/hr_timesheet/hr_timesheet_data.xml
View File

@ -2,9 +2,6 @@
<openerp>
<data>
<record id="hr.employee" model="hr.employee">
<field name="product_id" ref="product.product_consultant"/>
</record>
<record id="analytic_journal" model="account.analytic.journal">
<field name="code">TS</field>
@ -12,5 +9,10 @@
<field name="type">general</field>
</record>
<record id="hr.employee" model="hr.employee">
<field name="product_id" ref="product.product_consultant"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
</data>
</openerp>

2
addons/project/project.py
View File

@ -78,7 +78,7 @@ class project(osv.osv):
return {'value':{'contact_id': False}}
addr = partner_obj.address_get(cr, uid, [part], ['contact'])
val = {'contact_id': addr['contact']}
if pricelist_id in self._columns:
if 'pricelist_id' in self.fields_get(cr, uid, context=context):
pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
val['pricelist_id'] = pricelist_id