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

[FIX] warning: fixed dependancies and product_id_change() method 

bzr revid: qdp-launchpad@openerp.com-20131022152958-2w7xpn0fox88m5w2
This commit is contained in:
Quentin (OpenERP) 2013-10-22 17:29:58 +02:00
parent 176c1dde30
commit 533d176df7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/warning/__openerp__.py
View File

@ -32,7 +32,7 @@ Warning messages can be displayed for objects like sale order, purchase order,
picking and invoice. The message is triggered by the form's onchange event. picking and invoice. The message is triggered by the form's onchange event.
""", """,
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'depends': ['base', 'sale', 'purchase'], 'depends': ['base', 'sale_stock', 'purchase'],
'data': ['warning_view.xml'], 'data': ['warning_view.xml'],
'demo': [], 'demo': [],
'installable': True, 'installable': True,

6
addons/warning/warning.py
View File

@ -170,8 +170,6 @@ class stock_picking(osv.osv):
return {'value': result.get('value',{}), 'warning':warning} return {'value': result.get('value',{}), 'warning':warning}
# FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816).
# It should be removed as soon as the bug is fixed
class stock_picking(osv.osv): class stock_picking(osv.osv):
_inherit = 'stock.picking' _inherit = 'stock.picking'
@ -218,7 +216,7 @@ class sale_order_line(osv.osv):
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
uom=False, qty_uos=0, uos=False, name='', partner_id=False, uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, lang=False, update_tax=True, date_order=False, packaging=False,
fiscal_position=False, flag=False, context=None): fiscal_position=False, flag=False, warehouse_id=False, context=None):
warning = {} warning = {}
if not product: if not product:
return {'value': {'th_weight' : 0, 'product_packaging': False, return {'value': {'th_weight' : 0, 'product_packaging': False,
@ -239,7 +237,7 @@ class sale_order_line(osv.osv):
result = super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty, result = super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
uom, qty_uos, uos, name, partner_id, uom, qty_uos, uos, name, partner_id,
lang, update_tax, date_order, packaging, fiscal_position, flag, context=context) lang, update_tax, date_order, packaging, fiscal_position, flag, warehouse_id=warehouse_id, context=context)
if result.get('warning',False): if result.get('warning',False):
warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title'] warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']