diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index e445e3f7bc8..4da3a447e38 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1323,9 +1323,9 @@ class account_invoice_line(osv.osv):
raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
if not product:
if type in ('in_invoice', 'in_refund'):
- return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
+ return {'value': {}, 'domain':{'product_uom':[]}}
else:
- return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
+ return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
fpos_obj = self.pool.get('account.fiscal.position')
fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
@@ -1378,7 +1378,6 @@ class account_invoice_line(osv.osv):
if res2:
domain = {'uos_id':[('category_id','=',res2 )]}
- result['categ_id'] = res.categ_id.id
res_final = {'value':result, 'domain':domain}
if not company_id or not currency_id:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 675174d8f10..1c1784e961d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -155,7 +155,7 @@ class crm_case_categ(osv.osv):
"""Finds id for case object"""
object_id = context and context.get('object_id', False) or False
ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
- return ids and ids[0]
+ return ids and ids[0] or False
_defaults = {
'object_id' : _find_object_id
@@ -241,6 +241,8 @@ class crm_base(object):
address = self.pool.get('res.partner.address').browse(cr, uid, add)
data['value'] = {'email_from': address and address.email or False ,
'phone': address and address.phone or False}
+ if 'phone' not in self._columns:
+ del data['value']['phone']
return data
def onchange_partner_id(self, cr, uid, ids, part, email=False):
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
index 7b4ba82b243..ae6eae2f43e 100644
--- a/addons/hr/test/test_hr.yml
+++ b/addons/hr/test/test_hr.yml
@@ -1,13 +1,13 @@
-
In order to test hr module in OpenERP, I will create new Employee, Department and Job Position.
-
- I create "R&D Department" in Department form.
+ I create "RD Department" in Department form.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D'
-
- Now, I create a new employee “Mark Johnson”, and select department as “R&D Department”.
+ Now, I create a new employee “Mark Johnson”, and select department as “RD Department”.
-
!record {model: hr.employee, id: hr_employee_mark}:
address_home_id: base.res_partner_address_1
diff --git a/addons/product/product.py b/addons/product/product.py
index 882a77e6f12..ecf1761318e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -334,7 +334,7 @@ class product_template(osv.osv):
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
if uom_id:
return {'value': {'uom_po_id': uom_id}}
- return False
+ return {}
def write(self, cr, uid, ids, vals, context=None):
if 'uom_po_id' in vals:
diff --git a/addons/project/project.py b/addons/project/project.py
index 1fc83771005..5ab7af9de79 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -75,11 +75,14 @@ class project(osv.osv):
def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
partner_obj = self.pool.get('res.partner')
if not part:
- return {'value':{'contact_id': False, 'pricelist_id': False}}
+ return {'value':{'contact_id': False}}
addr = partner_obj.address_get(cr, uid, [part], ['contact'])
- 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
- return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
+ val = {'contact_id': addr['contact']}
+ if pricelist_id in self._columns:
+ 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
+ return {'value': val}
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
res = {}.fromkeys(ids, 0.0)
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 588a69fdd71..7592d24a145 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -241,7 +241,6 @@
Training and Presentation
- 2011-09-21