[MERGE] forward port branch 9.0 up to 2c5ef3b
This commit is contained in:
@@ -898,6 +898,8 @@ class AccountMoveLine(models.Model):
|
|||||||
vals['date'] = self._context.get('date_p') or time.strftime('%Y-%m-%d')
|
vals['date'] = self._context.get('date_p') or time.strftime('%Y-%m-%d')
|
||||||
if 'name' not in vals:
|
if 'name' not in vals:
|
||||||
vals['name'] = self._context.get('comment') or _('Write-Off')
|
vals['name'] = self._context.get('comment') or _('Write-Off')
|
||||||
|
if 'analytic_account_id' not in vals:
|
||||||
|
vals['analytic_account_id'] = self.env.context.get('analytic_id', False)
|
||||||
#compute the writeoff amount if not given
|
#compute the writeoff amount if not given
|
||||||
if 'credit' not in vals and 'debit' not in vals:
|
if 'credit' not in vals and 'debit' not in vals:
|
||||||
amount = sum([r.amount_residual for r in self])
|
amount = sum([r.amount_residual for r in self])
|
||||||
|
|||||||
@@ -1087,7 +1087,7 @@ class MailThread(models.AbstractModel):
|
|||||||
decode_header(message, 'Cc'),
|
decode_header(message, 'Cc'),
|
||||||
decode_header(message, 'Resent-To'),
|
decode_header(message, 'Resent-To'),
|
||||||
decode_header(message, 'Resent-Cc')])
|
decode_header(message, 'Resent-Cc')])
|
||||||
local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)]
|
local_parts = [e.split('@')[0].lower() for e in tools.email_split(rcpt_tos)]
|
||||||
if local_parts:
|
if local_parts:
|
||||||
aliases = Alias.search([('alias_name', 'in', local_parts)])
|
aliases = Alias.search([('alias_name', 'in', local_parts)])
|
||||||
if aliases:
|
if aliases:
|
||||||
|
|||||||
Reference in New Issue
Block a user