Merge lp:~openerp-dev/openobject-addons/trunk-bug-733143-rpa into lp:openobject-addons

[Rucha (Open ERP)]

Fix: https://bugs.launchpad.net/openobject-addons/+bug/733143

[OpenERP buildbot (openerp-buildbot)]

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
point_of_sale/test/point_of_sale_test.yml: 'item_id'
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

[OpenERP buildbot (openerp-buildbot)]

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2011-03-09 16:05:32 +0000
+++ product/pricelist.py	2011-03-15 08:51:05 +0000
@@ -284,6 +284,7 @@
                         price = False
 
                 if price:
+                    results['item_id'] = res['id']
                     if 'uom' in context and not uom_price_already_computed:
                         product = products_dict[product_id]
                         uom = product.uos_id or product.uom_id
@@ -299,7 +300,7 @@
     def price_get(self, cr, uid, ids, prod_id, qty, partner=None, context=None):
         res_multi = self.price_get_multi(cr, uid, pricelist_ids=ids, products_by_qty_by_partner=[(prod_id, qty, partner)], context=context)
         res = res_multi[prod_id]
-        res.update({'item_id': {ids[-1]: ids[-1]}})
+        res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}})
         return res
 
     def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None):