[MERGE] forward port of branch saas-5 up to b1c0bc0

diff --cc addons/product/product.py
index fd4e308,db86047..17088c7
--- 1/addons/product/product.py
--- 2/addons/product/product.py
+++ b/addons/product/product.py
@@@ -532,8 -538,7 +538,7 @@@ class product_template(osv.osv)
              help="Small-sized image of the product. It is automatically "\
                   "resized as a 64x64px image, with aspect ratio preserved. "\
                   "Use this field anywhere a small image is required."),
 -
 +        'packaging_ids' : fields.one2many('product.packaging', 'product_tmpl_id', 'Logistical Units',
-             help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
          'seller_ids': fields.one2many('product.supplierinfo', 'product_tmpl_id', 'Supplier'),
          'seller_delay': fields.related('seller_ids','delay', type='integer', string='Supplier Lead Time',
              help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/website_sale/views/templates.xml
Simple merge