Merge lp:~pedro.baeza/ocb-addons/6.1-bug-1061494 into lp:ocb-addons/6.1

[Pedro Manuel Baeza]

Fix commited to main branch that has not yet been realeased. Refer to:

https://bugs.launchpad.net/ocb-addons/+bug/1061494

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review, no test)

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks!

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'warning/warning.py'
--- warning/warning.py	2012-09-06 10:32:09 +0000
+++ warning/warning.py	2013-11-07 12:57:38 +0000
@@ -231,7 +231,7 @@
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
     def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
@@ -250,7 +250,7 @@
             warning['message'] = message
 
         result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order, fiscal_position)
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']