[MERGE] Forward port of saas-14 to saas-15 up to e5ec5f5f612

This commit is contained in:
Martin Trigaux
2019-07-10 08:46:12 +02:00
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -260,7 +260,6 @@ class ResPartner(models.Model):
def _invoice_total(self):
account_invoice_report = self.env['account.invoice.report']
if not self.ids:
self.total_invoiced = 0.0
return True
user_currency_id = self.env.user.company_id.currency_id.id
+1 -1
View File
@@ -3923,7 +3923,7 @@ class BaseModel(object):
# mark missing records in cache with a failed value
exc = MissingError(
_("Record does not exist or has been deleted.")
+ '\n\n({} {}, {} {})'.format(_('Records:'), (self - existing).ids[:6], _('User:'), self._uid)
+ u'\n\n({} {}, {} {})'.format(_('Records:'), (self - existing).ids[:6], _('User:'), self._uid)
)
(self - existing)._cache.update(FailedValue(exc))
return existing