audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #365 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2021-02-05 06:45:32 +00:00
parent 2ead2c0bea 81993220da
commit ac110bf819
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
account_reconciliation_widget/models/reconciliation_widget.py
View File

@@ -1030,9 +1030,9 @@ class AccountReconciliation(models.AbstractModel):
data = { data = {
"id": st_line.id, "id": st_line.id,
"ref": st_line.ref, "ref": st_line.ref,
# FIXME: where to fill? "narration": st_line.narration or "",
# 'note': st_line.note or "",
"name": st_line.name, "name": st_line.name,
"payment_ref": st_line.payment_ref,
"date": format_date(self.env, st_line.date), "date": format_date(self.env, st_line.date),
"amount": amount, "amount": amount,
"amount_str": amount_str, # Amount in the statement line currency "amount_str": amount_str, # Amount in the statement line currency

10
account_reconciliation_widget/static/src/xml/account_reconciliation.xml
View File

@@ -149,8 +149,8 @@
/></td> /></td>
<td class="cell_due_date"><t t-esc="state.st_line.date" /></td> <td class="cell_due_date"><t t-esc="state.st_line.date" /></td>
<td class="cell_label"><t <td class="cell_label"><t
t-if="state.st_line.name" t-if="state.st_line.payment_ref"
t-esc="state.st_line.name" t-esc="state.st_line.payment_ref"
/> <t t-if="state.st_line.amount_currency_str"> (<t /> <t t-if="state.st_line.amount_currency_str"> (<t
t-esc="state.st_line.amount_currency_str" t-esc="state.st_line.amount_currency_str"
/>)</t></td> />)</t></td>
@@ -562,15 +562,15 @@
<tr t-if="state.st_line.ref"><td>Transaction</td><td><t <tr t-if="state.st_line.ref"><td>Transaction</td><td><t
t-esc="state.st_line.ref" t-esc="state.st_line.ref"
/></td></tr> /></td></tr>
<tr><td>Description</td><td><t t-esc="state.st_line.name" /></td></tr> <tr><td>Description</td><td><t t-esc="state.st_line.payment_ref" /></td></tr>
<tr><td>Amount</td><td><t t-raw="state.st_line.amount_str" /><t <tr><td>Amount</td><td><t t-raw="state.st_line.amount_str" /><t
t-if="state.st_line.amount_currency_str" t-if="state.st_line.amount_currency_str"
> (<t t-esc="state.st_line.amount_currency_str" />)</t></td></tr> > (<t t-esc="state.st_line.amount_currency_str" />)</t></td></tr>
<tr><td>Account</td><td><t t-esc="state.st_line.account_code" /> <t <tr><td>Account</td><td><t t-esc="state.st_line.account_code" /> <t
t-esc="state.st_line.account_name" t-esc="state.st_line.account_name"
/></td></tr> /></td></tr>
<tr t-if="state.st_line.note"><td>Note</td><td style="white-space: pre;"><t <tr t-if="state.st_line.narration"><td>Note</td><td style="white-space: pre;"><t
t-esc="state.st_line.note" t-esc="state.st_line.narration"
/></td></tr> /></td></tr>
</table> </table>
</t> </t>