diff --git a/README.md b/README.md index eaff6f1ca5..51cad74b2d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ addon | version | maintainers | summary [account_move_base_import](account_move_base_import/) | 16.0.1.0.1 | | Journal Entry base import [account_move_line_reconcile_manual](account_move_line_reconcile_manual/) | 16.0.1.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Manually reconcile Journal Items [account_move_reconcile_forbid_cancel](account_move_reconcile_forbid_cancel/) | 16.0.1.0.0 | | Account Move Reconcile Forbid Cancel -[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.1 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting +[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.2 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting [account_statement_base](account_statement_base/) | 16.0.1.3.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements [base_transaction_id](base_transaction_id/) | 16.0.1.0.0 | | Base transaction ID for financial institutes diff --git a/account_reconcile_oca/README.rst b/account_reconcile_oca/README.rst index 81e4a70530..f8aacab004 100644 --- a/account_reconcile_oca/README.rst +++ b/account_reconcile_oca/README.rst @@ -7,7 +7,7 @@ Account Reconcile Oca !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:fe83bb5c5b4f7177efe4393a302d378f4e1a0770e16257cc7cd256ce68384e81 + !! source digest: sha256:fb0fd744eefd0185149b04302d378a12ae62c7db864b2230c6d71149eda92e79 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_reconcile_oca/__manifest__.py b/account_reconcile_oca/__manifest__.py index 3e0708fe0f..a80b84d6b6 100644 --- a/account_reconcile_oca/__manifest__.py +++ b/account_reconcile_oca/__manifest__.py @@ -5,7 +5,7 @@ "name": "Account Reconcile Oca", "summary": """ Reconcile addons for Odoo CE accounting""", - "version": "16.0.1.2.1", + "version": "16.0.1.2.2", "license": "AGPL-3", "author": "CreuBlanca,Odoo Community Association (OCA)", "maintainers": ["etobella"], diff --git a/account_reconcile_oca/i18n/account_reconcile_oca.pot b/account_reconcile_oca/i18n/account_reconcile_oca.pot index 5afe2577d8..97bef7497e 100644 --- a/account_reconcile_oca/i18n/account_reconcile_oca.pot +++ b/account_reconcile_oca/i18n/account_reconcile_oca.pot @@ -116,7 +116,6 @@ msgstr "" #. module: account_reconcile_oca #: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view -#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view msgid "Clean" msgstr "" @@ -298,6 +297,11 @@ msgstr "" msgid "Manual Amount" msgstr "" +#. module: account_reconcile_oca +#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id +msgid "Manual Currency" +msgstr "" + #. module: account_reconcile_oca #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__manual_delete #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_delete @@ -368,6 +372,11 @@ msgstr "" msgid "Name" msgstr "" +#. module: account_reconcile_oca +#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view +msgid "Narration" +msgstr "" + #. module: account_reconcile_oca #. odoo-python #: code:addons/account_reconcile_oca/models/account_bank_statement_line.py:0 @@ -462,7 +471,7 @@ msgstr "" #. module: account_reconcile_oca #: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view -msgid "Reset" +msgid "Reset reconciliation" msgstr "" #. module: account_reconcile_oca @@ -512,6 +521,11 @@ msgstr "" msgid "Undefined" msgstr "" +#. module: account_reconcile_oca +#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view +msgid "Unreconcile" +msgstr "" + #. module: account_reconcile_oca #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__user_id msgid "User" diff --git a/account_reconcile_oca/models/account_bank_statement_line.py b/account_reconcile_oca/models/account_bank_statement_line.py index f1da7eecdf..eb82e5476c 100644 --- a/account_reconcile_oca/models/account_bank_statement_line.py +++ b/account_reconcile_oca/models/account_bank_statement_line.py @@ -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 @@ def _onchange_manual_reconcile_reference(self): "manual_move_type": False, "manual_kind": False, "manual_original_amount": False, + "manual_currency_id": False, "analytic_distribution": False, } ) @@ -247,6 +253,7 @@ def _onchange_manual_reconcile_reference(self): 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] diff --git a/account_reconcile_oca/static/description/index.html b/account_reconcile_oca/static/description/index.html index e8368d03b2..ef29427a2e 100644 --- a/account_reconcile_oca/static/description/index.html +++ b/account_reconcile_oca/static/description/index.html @@ -367,7 +367,7 @@
This addon allows to reconcile bank statements and account marked as reconcile.
diff --git a/account_reconcile_oca/views/account_bank_statement_line.xml b/account_reconcile_oca/views/account_bank_statement_line.xml index b6881006cd..985b1a96cb 100644 --- a/account_reconcile_oca/views/account_bank_statement_line.xml +++ b/account_reconcile_oca/views/account_bank_statement_line.xml @@ -143,7 +143,7 @@ @@ -255,6 +255,7 @@ string="Amount" attrs="{'readonly': ['|', ('manual_reference', '=', False), ('is_reconciled', '=', True)]}" /> +