From e58a82c2b37b3a7dcdd0a29d0208d26d6d97d01b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 17 Nov 2011 09:28:10 +0100
Subject: [PATCH] [IMP] hr_timesheet & project bugfixes

bzr revid: fp@tinyerp.com-20111117082810-zzwsg5c2e3l83epz
---
 addons/hr_timesheet/hr_timesheet_data.xml | 8 +++++---
 addons/project/project.py                 | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 5dc95cf9ddc..e9aa56d4646 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -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>
diff --git a/addons/project/project.py b/addons/project/project.py
index 5ab7af9de79..14524a0bd05 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -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