Merge PR #573 into 10.0

Signed-off-by dreispt
This commit is contained in:
OCA-git-bot
2021-07-03 14:27:22 +00:00
2 changed files with 8 additions and 1 deletions

View File

@@ -21,6 +21,7 @@ class AccountPaymentOrderReport(models.AbstractModel):
'data': data,
'env': self.env,
'get_bank_account_name': self.get_bank_account_name,
'get_invoice_ref': self.get_invoice_ref,
'formatLang': formatLang,
}
return self.env['report'].render(
@@ -46,3 +47,9 @@ class AccountPaymentOrderReport(models.AbstractModel):
return name
else:
return False
@api.model
def get_invoice_ref(self, line):
value = (line.move_line_id.invoice_id.number or
line.move_line_id.move_id.name)
return value or ''

View File

@@ -76,7 +76,7 @@
<span t-esc="get_bank_account_name(line.partner_bank_id)"/>
</td>
<td class="text-center">
<span t-raw="'%s &lt;br&gt;' % line.move_line_id.invoice_id.number or line.move_line_id.move_id.name or ''"/>
<span t-esc="get_invoice_ref(line)"/>
</td>
<td class="text-center">
<span t-field="line.date"/>