[MERGE] forward port branch 10.0 up to fb2df13ea8

addons/stock/models/stock_move.py

@@ -997,7 +997,7 @@ class StockMove(models.Model):
             'views': [(view.id, 'form')],
             'view_id': view.id,
             'target': 'new',
-            'res_id': self.id}
+            'res_id': self.picking_id.id}
     show_picking = action_show_picking
 
     # Quants management

addons/stock_account/models/product.py

@@ -201,8 +201,8 @@ class ProductProduct(models.Model):
     @api.model
     def _get_anglo_saxon_price_unit(self, uom=False):
         price = self.standard_price
-        if not uom or self.uom_id.id == uom.id:
-            return price
+        if not self or not uom or self.uom_id.id == uom.id:
+            return price or 0.0
         return self.uom_id._compute_price(price, uom)