[MERGE] stock, sale, sale_stock: several usability problem fixed.

lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale_stock/sale_stock.py
index af6bf16,8f37348..bc71402
--- 1/addons/sale_stock/sale_stock.py
--- 2/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@@ -289,7 -289,7 +289,7 @@@ class sale_order_line(osv.osv)
              res = self.product_id_change(cr, uid, ids, pricelist=pricelist,
                      product=product, qty=qty, uom=uom, partner_id=partner_id,
                      packaging=packaging, flag=False, context=context)
-             warning_msgs = res.get('warning') and res['warning']['message']
 -            warning_msgs = res.get('warning') and res['warning'].get('message', False) or ''
++            warning_msgs = res.get('warning') and res['warning'].get('message', '') or ''
  
          products = product_obj.browse(cr, uid, product, context=context)
          if not products.packaging: