[MERGE] forward port branch 9.0 up to af7eb04f

addons/mrp/report/bom_cost.py

@@ -27,7 +27,7 @@ class MrpBomCost(models.AbstractModel):
                 total = 0.0
                 for bom_line in result:
                     line_product = self.env['product.product'].browse(bom_line['product_id'])
-                    price_uom = self.env['product.uom']._compute_qty(line_product.uom_id.id, line_product.standard_price, bom_line['product_uom'])
+                    price_uom = self.env['product.uom']._compute_price(line_product.uom_id.id, line_product.standard_price, bom_line['product_uom'])
                     line = {
                         'product_id': line_product,
                         'product_uom_qty': bom_line['product_qty'],
@@ -45,4 +45,4 @@ class MrpBomCost(models.AbstractModel):
     def render_html(self, data=None):
         boms = self.env['mrp.bom'].browse(self.ids)
         res = self.get_lines(boms)
-        return self.env['report'].render('mrp.mrp_bom_cost', {'lines': res})
\ No newline at end of file
+        return self.env['report'].render('mrp.mrp_bom_cost', {'lines': res})

addons/website/static/src/js/website.snippets.animation.js

@@ -128,8 +128,9 @@ animation.registry.media_video = animation.Class.extend({
         if (!this.$target.has('.media_iframe_video_size').length) {
             var editor = '<div class="css_editable_mode_display">&nbsp;</div>';
             var size = '<div class="media_iframe_video_size">&nbsp;</div>';
-            this.$target.html(editor+size+'<iframe src="'+_.escape(this.$target.data("src"))+'" frameborder="0" allowfullscreen="allowfullscreen"></iframe>');
+            this.$target.html(editor+size);
         }
+        this.$target.html(this.$target.html()+'<iframe src="'+_.escape(this.$target.data("src"))+'" frameborder="0" allowfullscreen="allowfullscreen"></iframe>');
     },
 });
 

openerp/addons/base/module/module.py

@@ -561,7 +561,7 @@ class module(osv.osv):
         return dict(ACTION_DICT, name=_('Uninstall'))
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'installed'})
+        self.write(cr, uid, ids, {'state': 'installed'}, context=context)
         return True
 
     def button_immediate_upgrade(self, cr, uid, ids, context=None):
@@ -604,7 +604,7 @@ class module(osv.osv):
         return dict(ACTION_DICT, name=_('Apply Schedule Upgrade'))
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'installed'})
+        self.write(cr, uid, ids, {'state': 'installed'}, context=context)
         return True
 
     @staticmethod