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 #587 into 16.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-09-11 21:12:18 +00:00
parent b10603a471 df141e48fd
commit 94e1034b7d
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
account_reconcile_oca/models/account_bank_statement_line.py
View File

@@ -66,7 +66,12 @@ class AccountBankStatementLine(models.Model):
domain=[("rule_type", "=", "writeoff_button")],
)
manual_name = fields.Char(store=False, default=False, prefetch=False)
manual_amount = fields.Monetary(store=False, default=False, prefetch=False)
manual_amount = fields.Monetary(
store=False, default=False, prefetch=False, currency_field="manual_currency_id"
)
manual_currency_id = fields.Many2one(
"res.currency", readonly=True, store=False, prefetch=False
)
manual_original_amount = fields.Monetary(
default=False, store=False, prefetch=False, readonly=True
)
@@ -240,6 +245,7 @@ class AccountBankStatementLine(models.Model):
"manual_move_type": False,
"manual_kind": False,
"manual_original_amount": False,
"manual_currency_id": False,
"analytic_distribution": False,
}
)
@@ -247,6 +253,7 @@ class AccountBankStatementLine(models.Model):
else:
self.manual_account_id = line["account_id"][0]
self.manual_amount = line["amount"]
self.manual_currency_id = line["currency_id"]
self.manual_name = line["name"]
self.manual_partner_id = (
line.get("partner_id") and line["partner_id"][0]

9
account_reconcile_oca/views/account_bank_statement_line.xml
View File

@@ -143,7 +143,7 @@
<button
name="unreconcile_bank_line"
type="object"
string="Reset"
string="Unreconcile"
accesskey="r"
class="btn btn-warning"
attrs="{'invisible': [('is_reconciled', '=', False)]}"
@@ -152,7 +152,7 @@
<button
name="clean_reconcile"
type="object"
string="Clean"
string="Reset reconciliation"
class="btn btn-secondary"
attrs="{'invisible': [('is_reconciled', '=', True)]}"
/>
@@ -255,6 +255,7 @@
string="Amount"
attrs="{'readonly': ['|', ('manual_reference', '=', False), ('is_reconciled', '=', True)]}"
/>
<field name="manual_currency_id" invisible="1" />
<field name="manual_original_amount" invisible="1" />
<field name="manual_move_type" invisible="1" />
<label
@@ -287,6 +288,10 @@
</group>
</group>
</page>
<page name="narration" string="Narration">
<field name="payment_ref" />
<field name="narration" />
</page>
<page name="chatter" string="Chatter">
<field name="move_id" widget="account_reconcile_oca_chatter" />
</page>