Improvements as per feedback
This commit is contained in:
parent
85584004f0
commit
319b4c4110
@ -419,13 +419,22 @@ class AccountSpread(models.Model):
|
|||||||
for spread in self:
|
for spread in self:
|
||||||
spread_mls = spread.line_ids.mapped('move_id.line_ids')
|
spread_mls = spread.line_ids.mapped('move_id.line_ids')
|
||||||
spread_mls.remove_move_reconcile()
|
spread_mls.remove_move_reconcile()
|
||||||
inv_link = '<a href=# data-oe-model=account.invoice ' \
|
spread._message_post_unlink_invoice_line()
|
||||||
'data-oe-id=%d>%s</a>' % (spread.invoice_id.id, _("Invoice"))
|
|
||||||
msg_body = _("Unlinked invoice line '%s' (view %s).") % (
|
|
||||||
spread.invoice_line_id.name, inv_link)
|
|
||||||
spread.message_post(body=msg_body)
|
|
||||||
spread.write({'invoice_line_ids': [(5, 0, 0)]})
|
spread.write({'invoice_line_ids': [(5, 0, 0)]})
|
||||||
|
|
||||||
|
def _message_post_unlink_invoice_line(self):
|
||||||
|
self.ensure_one()
|
||||||
|
inv_link = '<a href=# data-oe-model=account.invoice ' \
|
||||||
|
'data-oe-id=%d>%s</a>' % (self.invoice_id.id, _("Invoice"))
|
||||||
|
msg_body = _("Unlinked invoice line '%s' (view %s).") % (
|
||||||
|
self.invoice_line_id.name, inv_link)
|
||||||
|
self.message_post(body=msg_body)
|
||||||
|
spread_link = '<a href=# data-oe-model=account.spread ' \
|
||||||
|
'data-oe-id=%d>%s</a>' % (self.id, _("Spread Board"))
|
||||||
|
msg_body = _("Unlinked '%s' (invoice line %s).") % (
|
||||||
|
spread_link, self.invoice_line_id.name)
|
||||||
|
self.invoice_id.message_post(body=msg_body)
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
def unlink(self):
|
def unlink(self):
|
||||||
for spread in self:
|
for spread in self:
|
||||||
@ -437,7 +446,7 @@ class AccountSpread(models.Model):
|
|||||||
lambda x: x.move_id.state == 'posted')
|
lambda x: x.move_id.state == 'posted')
|
||||||
if posted_line_ids:
|
if posted_line_ids:
|
||||||
raise ValidationError(
|
raise ValidationError(
|
||||||
_('Cannot delete spread(s): there are some '
|
_('Cannot delete spread(s): there are '
|
||||||
'posted Journal Entries.'))
|
'posted Journal Entries.'))
|
||||||
return super().unlink()
|
return super().unlink()
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ class AccountInvoiceSpreadLine(models.Model):
|
|||||||
})]
|
})]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'name': self.spread_id and self.spread_id.name or "/",
|
'name': self.name or "/",
|
||||||
'ref': self.name,
|
'ref': self.name,
|
||||||
'date': spread_date,
|
'date': spread_date,
|
||||||
'journal_id': spread.journal_id.id,
|
'journal_id': spread.journal_id.id,
|
||||||
|
Loading…
Reference in New Issue
Block a user