[MERGE] forward port branch 9.0 up to 97fc813a1a

This commit is contained in:
Christophe Simonis
2018-03-28 18:58:10 +02:00
2 changed files with 1 additions and 2 deletions
+1 -1
View File
@@ -1240,7 +1240,7 @@ class AccountMoveLine(models.Model):
raise UserError(_('You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n%s.') % err_msg)
if line.move_id.id not in move_ids:
move_ids.add(line.move_id.id)
self.env['account.move'].browse(list(move_ids))._check_lock_date()
self.env['account.move'].browse(list(move_ids))._check_lock_date()
return True
####################################################
-1
View File
@@ -198,7 +198,6 @@ class ProductProduct(models.Model):
]
return []
@api.model
def _get_anglo_saxon_price_unit(self, uom=False):
price = self.standard_price
if not self or not uom or self.uom_id.id == uom.id: