Syncing from upstream OCA/account-reconcile (16.0)

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
 

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

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"],

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"

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,13 +245,15 @@ def _onchange_manual_reconcile_reference(self):
                             "manual_move_type": False,
                             "manual_kind": False,
                             "manual_original_amount": False,
+                            "manual_currency_id": False,
                             "analytic_distribution": False,
                         }
                     )
                     continue
                 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]

account_reconcile_oca/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Account Reconcile Oca</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:fe83bb5c5b4f7177efe4393a302d378f4e1a0770e16257cc7cd256ce68384e81
+!! source digest: sha256:fb0fd744eefd0185149b04302d378a12ae62c7db864b2230c6d71149eda92e79
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_reconcile_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon allows to reconcile bank statements and account marked as <cite>reconcile</cite>.</p>

account_reconcile_oca/views/account_bank_statement_line.xml

@@ -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>