From fe615f402fec35995515d187a866a8e17a06443e Mon Sep 17 00:00:00 2001
From: JordiMForgeFlow <jordi.masvidal@forgeflow.com>
Date: Wed, 10 Aug 2022 12:23:35 +0200
Subject: [PATCH 01/24] [IMP] account_multicurrency_revaluation: filter
 accounts by company

---
 .../wizard/print_currency_unrealized_report.py               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
index 38a5976faae..8aad0d815cf 100644
--- a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
+++ b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
@@ -20,7 +20,10 @@ class UnrealizedCurrencyReportPrinter(models.TransientModel):
 
     def _default_account_ids(self):
         account_model = self.env["account.account"]
-        account_ids = account_model.search([("currency_revaluation", "=", True)]).ids
+        company = self.env.company
+        account_ids = account_model.search(
+            [("currency_revaluation", "=", True), ("company_id", "=", company.id)]
+        ).ids
         return [(6, 0, account_ids)]
 
     def print_report(self):

From 1a83703b9eca950d38433cfccb4ba7b945a50bec Mon Sep 17 00:00:00 2001
From: JordiMForgeFlow <jordi.masvidal@forgeflow.com>
Date: Wed, 10 Aug 2022 13:53:44 +0200
Subject: [PATCH 02/24] [IMP] account_multicurrency_revaluation: use active
 company instead of user company

---
 .../report/unrealized_currency_gain_loss.xml                | 5 +++--
 .../tests/test_account_account.py                           | 2 +-
 .../tests/test_currency_revaluation.py                      | 1 +
 .../wizard/wizard_currency_revaluation.py                   | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
index 01e95c48033..8cac18636e0 100644
--- a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
+++ b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template id="curr_unrealized_report">
+        <t t-set="company" t-value="env.company" />
         <t t-call="web.html_container">
             <t t-call="web.external_layout">
                 <div class="page">
@@ -13,10 +14,10 @@
                         <div class="act_as_row">
                             <div class="act_as_cell">Currency Gain and Loss</div>
                             <div class="act_as_cell">
-                                <span t-field="user.company_id.name" />
+                                <span t-field="company.name" />
                             </div>
                             <div class="act_as_cell">
-                                <span t-field="user.company_id.currency_id.name" />
+                                <span t-field="company.currency_id.name" />
                             </div>
                         </div>
                     </div>
diff --git a/account_multicurrency_revaluation/tests/test_account_account.py b/account_multicurrency_revaluation/tests/test_account_account.py
index 8a218db7608..625e0adcda4 100644
--- a/account_multicurrency_revaluation/tests/test_account_account.py
+++ b/account_multicurrency_revaluation/tests/test_account_account.py
@@ -16,7 +16,7 @@ def setUpClass(cls):
         cls.account_type_liquidity = cls.env.ref("account.data_account_type_liquidity")
         cls.company = cls.env.ref("account_multicurrency_revaluation.res_company_reval")
         cls.env.user.write({"company_ids": [(4, cls.company.id, False)]})
-        cls.env.user.company_id = cls.company
+        cls.env.company = cls.company
 
     def test_currency_revaluation_field(self):
         with common.Form(self.AccountAccount, view="account.view_account_form") as form:
diff --git a/account_multicurrency_revaluation/tests/test_currency_revaluation.py b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
index 49993bcbc36..bbadb139489 100644
--- a/account_multicurrency_revaluation/tests/test_currency_revaluation.py
+++ b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
@@ -53,6 +53,7 @@ def setUpClass(cls):
         cls.partner.company_id = cls.company.id
         cls.partner.property_account_payable_id = payable_acc.id
         cls.partner.property_account_receivable_id = cls.receivable_acc.id
+        cls.env.company = cls.company
 
     def test_defaults(self):
         # TODO: This causes that the environment to be reset and screw up tests,
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 331f921d638..1801a614a2f 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -16,7 +16,7 @@ def _get_default_revaluation_date(self):
 
     @api.model
     def _get_default_journal_id(self):
-        return self.env.user.company_id.currency_reval_journal_id
+        return self.env.company.currency_reval_journal_id
 
     @api.model
     def _get_default_label(self):
@@ -149,7 +149,7 @@ def _write_adjust_balance(
     ):
         if partner_id is None:
             partner_id = False
-        company = form.journal_id.company_id or self.env.user.company_id
+        company = form.journal_id.company_id or self.env.company
         created_ids = []
 
         amount_vs_zero = currency.compare_amounts(amount, 0.0)
@@ -247,7 +247,7 @@ def revaluate_currency(self):
         Account = self.env["account.account"]
         Currency = self.env["res.currency"]
 
-        company = self.journal_id.company_id or self.env.user.company_id
+        company = self.journal_id.company_id or self.env.company
         if not self._validate_company_revaluation_configuration(company):
             raise exceptions.UserError(
                 _(

From e46cba5b47d9474b83ca855623c74d217002230b Mon Sep 17 00:00:00 2001
From: JordiMForgeFlow <jordi.masvidal@forgeflow.com>
Date: Thu, 11 Aug 2022 12:44:22 +0200
Subject: [PATCH 03/24] [FIX] account_multicurrency_revaluation: fix report
 layout and field label

---
 .../model/account.py                          |   2 +-
 .../report/unrealized_currency_gain_loss.xml  | 155 +++++++++---------
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 18ac4b93643..209436a7bc4 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -164,5 +164,5 @@ class AccountMove(models.Model):
     _inherit = "account.move"
 
     revaluation_to_reverse = fields.Boolean(
-        string="revaluation to reverse", default=False
+        string="Revaluation to reverse", default=False
     )
diff --git a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
index 8cac18636e0..dc59e273321 100644
--- a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
+++ b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
@@ -57,88 +57,95 @@
                                         style="width: 100px;"
                                     >Gain(+)/Loss(-) YTD</div>
                                 </div>
-                                <t t-foreach="sh_acc.ordered_lines" t-as="line">
-                                    <div class="act_as_row lines">
-                                        <div class="act_as_cell">
-                                            <span t-esc="line.get('name') or '--'" />
-                                        </div>
-                                        <div
-                                            class="act_as_cell amount"
-                                            style="width: 100px;"
-                                        >
-                                            <span
-                                                t-esc="line.get('gl_foreign_balance') or 0.0"
-                                            />
-                                        </div>
-                                        <div class="act_as_cell" style="width: 50px;">
-                                            <span
-                                                t-esc="line.get('curr_name') or '--'"
-                                            />
-                                        </div>
-                                        <div
-                                            class="act_as_cell amount"
-                                            style="width: 80px;"
-                                        >
-                                            <span
-                                                t-esc="line.get('gl_currency_rate') or 0.0"
-                                            />
-                                        </div>
-                                        <div
-                                            class="act_as_cell amount"
-                                            style="width: 150px;"
-                                        >
-                                            <span
-                                                t-esc="line.get('gl_revaluated_balance') or 0.0"
-                                            />
-                                        </div>
-                                        <div
-                                            class="act_as_cell amount"
-                                            style="width: 100px;"
-                                        >
-                                            <t t-if="line.get('gl_balance')">
-                                                <span t-esc="line.get('gl_balance')" />
-                                            </t>
-                                            <t t-if="not line.get('gl_balance')">0.0</t>
-                                        </div>
-                                        <div
-                                            class="act_as_cell amount"
-                                            style="width: 100px;"
-                                        >
-                                            <span
-                                                t-esc="line.get('gl_ytd_balance') or 0.0"
-                                            />
-                                        </div>
-                                    </div>
-                                </t>
-                                <div class="act_as_row lines labels">
+                            </div>
+                            <t t-foreach="sh_acc.ordered_lines" t-as="line">
+                                <div class="act_as_row lines">
                                     <div class="act_as_cell">
-                                        <b>TOTAL</b>
+                                        <span t-esc="line.get('name') or '--'" />
                                     </div>
-                                    <div class="act_as_cell" />
-                                    <div class="act_as_cell" />
-                                    <div class="act_as_cell" />
-                                    <div class="act_as_cell amount">
-                                        <b>
-                                            <span
-                                                t-esc="sh_acc.gl_revaluated_balance_total or 0.0"
-                                            />
-                                        </b>
+                                    <div
+                                        class="act_as_cell amount"
+                                        style="width: 100px;"
+                                    >
+                                        <span
+                                            t-esc="line.get('gl_foreign_balance') or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
                                     </div>
-                                    <div class="act_as_cell amount">
-                                        <b>
-                                            <span
-                                                t-esc="sh_acc.gl_balance_total or 0.0"
-                                            />
-                                        </b>
+                                    <div class="act_as_cell" style="width: 50px;">
+                                        <span t-esc="line.get('curr_name') or '--'" />
+                                    </div>
+                                    <div
+                                        class="act_as_cell amount"
+                                        style="width: 80px;"
+                                    >
+                                        <span
+                                            t-esc="line.get('gl_currency_rate') or 0.0"
+                                        />
                                     </div>
-                                    <div class="act_as_cell amount">
-                                        <b>
+                                    <div
+                                        class="act_as_cell amount"
+                                        style="width: 150px;"
+                                    >
+                                        <span
+                                            t-esc="line.get('gl_revaluated_balance') or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </div>
+                                    <div
+                                        class="act_as_cell amount"
+                                        style="width: 100px;"
+                                    >
+                                        <t t-if="line.get('gl_balance')">
                                             <span
-                                                t-esc="sh_acc.gl_ytd_balance_total or 0.0"
+                                                t-esc="line.get('gl_balance')"
+                                                t-options="{'widget': 'float', 'precision': 2}"
                                             />
-                                        </b>
+                                        </t>
+                                        <t t-if="not line.get('gl_balance')">0.0</t>
+                                    </div>
+                                    <div
+                                        class="act_as_cell amount"
+                                        style="width: 100px;"
+                                    >
+                                        <span
+                                            t-esc="line.get('gl_ytd_balance') or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
                                     </div>
                                 </div>
+                            </t>
+                            <div class="act_as_row lines labels">
+                                <div class="act_as_cell">
+                                    <b>TOTAL</b>
+                                </div>
+                                <div class="act_as_cell" />
+                                <div class="act_as_cell" />
+                                <div class="act_as_cell" />
+                                <div class="act_as_cell amount">
+                                    <b>
+                                        <span
+                                            t-esc="sh_acc.gl_revaluated_balance_total or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </b>
+                                </div>
+                                <div class="act_as_cell amount">
+                                    <b>
+                                        <span
+                                            t-esc="sh_acc.gl_balance_total or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </b>
+                                </div>
+                                <div class="act_as_cell amount">
+                                    <b>
+                                        <span
+                                            t-esc="sh_acc.gl_ytd_balance_total or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </b>
+                                </div>
                             </div>
                         </div>
                     </t>

From 5baff8df7b3ce7c5ee3948393bcff29e215fc86b Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 16:25:23 +0200
Subject: [PATCH 04/24] [IMP]account_multicurrency_revaluation: Start
 Revaluation Period

---
 .../model/account.py                          | 21 ++++++++++++++++---
 .../wizard/wizard_currency_revaluation.py     | 17 ++++++++++++++-
 .../wizard_currency_revaluation_view.xml      |  3 ++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 209436a7bc4..1ff57e7673d 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -55,7 +55,7 @@ def _onchange_user_type_id(self):
             if rec.user_type_id.id in revaluation_accounts:
                 rec.currency_revaluation = True
 
-    def _revaluation_query(self, revaluation_date):
+    def _revaluation_query(self, start_date, revaluation_date):
         tables, where_clause, where_clause_params = self.env[
             "account.move.line"
         ]._query_get()
@@ -95,6 +95,9 @@ def _revaluation_query(self, revaluation_date):
             aml.balance < 0
             AND aprc.debit_move_id = amlcf.id
             AND amlcf.date < %s
+            """
+            + (("AND amlcf.date >= %s") if start_date else "")
+            + """
         )
     LEFT JOIN account_partial_reconcile aprd
         ON (aml.balance > 0 AND aml.id = aprd.debit_move_id)
@@ -103,10 +106,16 @@ def _revaluation_query(self, revaluation_date):
             aml.balance > 0
             AND aprd.credit_move_id = amldf.id
             AND amldf.date < %s
+            """
+            + (("AND amldf.date >= %s") if start_date else "")
+            + """
         )
     WHERE
         aml.account_id IN %s
         AND aml.date <= %s
+        """
+            + (("AND aml.date >= %s") if start_date else "")
+            + """
         AND aml.currency_id IS NOT NULL
         """
             + where_clause
@@ -139,10 +148,16 @@ def _revaluation_query(self, revaluation_date):
             revaluation_date,
             *where_clause_params,
         ]
+        if start_date:
+            # Insert values after all the revaluations date parameters
+            params.insert(1, start_date)
+            params.insert(3, start_date)
+            params.insert(6, start_date)
+
         return query, params
 
-    def compute_revaluations(self, revaluation_date):
-        query, params = self._revaluation_query(revaluation_date)
+    def compute_revaluations(self, start_date, revaluation_date):
+        query, params = self._revaluation_query(start_date, revaluation_date)
         self.env.cr.execute(query, params)
         lines = self.env.cr.dictfetchall()
 
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 1801a614a2f..a8b9e39eaaf 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -14,6 +14,14 @@ class WizardCurrencyRevaluation(models.TransientModel):
     def _get_default_revaluation_date(self):
         return fields.Date.today()
 
+    @api.model
+    def _get_default_start_revaluation_date(self):
+        """
+        The default date will be the first date of the month as the most typical case
+        will be calculating for the lines within a month.
+        """
+        return fields.Date.today().replace(day=1)
+
     @api.model
     def _get_default_journal_id(self):
         return self.env.company.currency_reval_journal_id
@@ -26,6 +34,10 @@ def _get_default_label(self):
         required=True,
         default=lambda self: self._get_default_revaluation_date(),
     )
+    start_date = fields.Date(
+        string="Start Revaluation Period",
+        default=lambda self: self._get_default_start_revaluation_date(),
+    )
     journal_id = fields.Many2one(
         comodel_name="account.journal",
         string="Journal",
@@ -278,7 +290,10 @@ def revaluate_currency(self):
                 )
             )
 
-        revaluations = account_ids.compute_revaluations(self.revaluation_date)
+        revaluations = account_ids.compute_revaluations(
+            self.start_date, self.revaluation_date
+        )
+
         for account_id, by_account in revaluations.items():
             account = Account.browse(account_id)
             if account.internal_type == "liquidity" and (
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
index 268b3ff32b8..29dfda0c6aa 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
@@ -14,6 +14,7 @@
 
                 <group>
                     <group>
+                        <field name="start_date" />
                         <field name="revaluation_date" />
                         <field name="journal_id" />
                     </group>
@@ -45,7 +46,7 @@
         id="action_view_account_currency_revaluation_wizard"
         model="ir.actions.act_window"
     >
-        <field name="name">Currency revaluation</field>
+        <field name="name">Currency Revaluation</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">wizard.currency.revaluation</field>
         <field name="view_mode">form</field>

From 891d50351e57f8dc8d68c6694bef5e2a671d701d Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 16:29:53 +0200
Subject: [PATCH 05/24] [IMP]account_multicurrency_revaluation: Filter out non
 company accounts

---
 .../model/res_company.py                      | 37 ++++++++++++++++---
 .../model/res_config.py                       | 37 ++++++++++++++++---
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/account_multicurrency_revaluation/model/res_company.py b/account_multicurrency_revaluation/model/res_company.py
index 40bb6626c6c..b99254661d1 100644
--- a/account_multicurrency_revaluation/model/res_company.py
+++ b/account_multicurrency_revaluation/model/res_company.py
@@ -1,4 +1,5 @@
 # Copyright 2012-2018 Camptocamp SA
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
@@ -10,12 +11,20 @@ class ResCompany(models.Model):
     revaluation_loss_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Revaluation loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     revaluation_gain_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Revaluation gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     revaluation_analytic_account_id = fields.Many2one(
         comodel_name="account.analytic.account", string="Revaluation Analytic account"
@@ -23,22 +32,38 @@ class ResCompany(models.Model):
     provision_bs_loss_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Provision B.S. loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     provision_bs_gain_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Provision B.S. gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     provision_pl_loss_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Provision P&L loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     provision_pl_gain_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Provision P&L gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
     )
     provision_pl_analytic_account_id = fields.Many2one(
         comodel_name="account.analytic.account", string="Provision P&L Analytic account"
diff --git a/account_multicurrency_revaluation/model/res_config.py b/account_multicurrency_revaluation/model/res_config.py
index 0b4adf30e7c..d7d3300f1d5 100644
--- a/account_multicurrency_revaluation/model/res_config.py
+++ b/account_multicurrency_revaluation/model/res_config.py
@@ -1,4 +1,5 @@
 # Copyright 2012-2018 Camptocamp SA
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
@@ -11,14 +12,22 @@ class AccountConfigSettings(models.TransientModel):
         related="company_id.revaluation_loss_account_id",
         comodel_name="account.account",
         string="Revaluation loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     revaluation_gain_account_id = fields.Many2one(
         related="company_id.revaluation_gain_account_id",
         comodel_name="account.account",
         string="Revaluation gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     revaluation_analytic_account_id = fields.Many2one(
@@ -31,28 +40,44 @@ class AccountConfigSettings(models.TransientModel):
         related="company_id.provision_bs_loss_account_id",
         comodel_name="account.account",
         string="Provision B.S. loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     provision_bs_gain_account_id = fields.Many2one(
         related="company_id.provision_bs_gain_account_id",
         comodel_name="account.account",
         string="Provision B.S. gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     provision_pl_loss_account_id = fields.Many2one(
         related="company_id.provision_pl_loss_account_id",
         comodel_name="account.account",
         string="Provision P&L loss account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     provision_pl_gain_account_id = fields.Many2one(
         related="company_id.provision_pl_gain_account_id",
         comodel_name="account.account",
         string="Provision P&L gain account",
-        domain=[("internal_type", "=", "other")],
+        domain=lambda self: [
+            ("company_id", "in", self.env.company.id),
+            ("internal_type", "=", "other"),
+            ("deprecated", "=", False),
+        ],
         readonly=False,
     )
     provision_pl_analytic_account_id = fields.Many2one(

From d47fcd8a773dfa0efede2172faa2f0d8f24f0884 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 16:34:50 +0200
Subject: [PATCH 06/24] [IMP]account_multicurrency_revaluation: Start and End
 Date on report & Include Only Posted Entries

---
 .../report/currency_unrealized_report.py      | 76 ++++++++++++-------
 .../print_currency_unrealized_report.py       | 39 +++++++++-
 .../print_currency_unrealized_report_view.xml |  5 ++
 3 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/account_multicurrency_revaluation/report/currency_unrealized_report.py b/account_multicurrency_revaluation/report/currency_unrealized_report.py
index 039c311e9d1..af41dabc8b8 100644
--- a/account_multicurrency_revaluation/report/currency_unrealized_report.py
+++ b/account_multicurrency_revaluation/report/currency_unrealized_report.py
@@ -1,4 +1,5 @@
 # Copyright 2012-2018 Camptocamp SA
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import api, models
@@ -30,32 +31,52 @@ def __init__(self, account):
     def __contains__(self, key):
         return hasattr(self, key)
 
-    def get_lines(self):
+    def get_lines(self, start_date, end_date, only_include_posted_entries):
         """Get all line account move line that are need on report for current
         account.
         """
-        sql = """SELECT res_partner.name,
-                   account_move_line.date,
-                   account_move_line.gl_foreign_balance,
-                   account_move_line.gl_currency_rate,
-                   account_move_line.gl_revaluated_balance,
-                   account_move_line.gl_balance,
-                   account_move_line.gl_revaluated_balance -
-                   account_move_line.gl_balance as gl_ytd_balance,
-                   res_currency.name as curr_name
-                 FROM account_move_line
-                   LEFT join res_partner on
-                     (account_move_line.partner_id = res_partner.id)
-                   LEFT join account_move on
-                     (account_move_line.move_id = account_move.id)
-                   LEFT join res_currency on
-                     (account_move_line.currency_id = res_currency.id)
-                 WHERE account_move_line.account_id = %s
-                   AND account_move_line.gl_balance is not null
-                 ORDER BY res_partner.name,
-                   account_move_line.gl_foreign_balance,
-                   account_move_line.date"""
-        self.cursor.execute(sql, [self.account_id])
+        sql = (
+            """
+              SELECT rp.name,
+              aml.date,
+              aml.gl_foreign_balance,
+              aml.gl_currency_rate,
+              aml.gl_revaluated_balance,
+              aml.gl_balance,
+              aml.gl_revaluated_balance -
+              aml.gl_balance as gl_ytd_balance,
+              rc.name as curr_name
+              FROM account_move_line aml
+              LEFT JOIN res_partner rp ON
+                (aml.partner_id = rp.id)
+              LEFT JOIN account_move am ON
+                (aml.move_id = am.id)
+              LEFT JOIN res_currency rc ON
+                (aml.currency_id = rc.id)
+              WHERE aml.account_id = %s
+                AND aml.gl_balance IS NOT NULL
+                AND aml.gl_balance != 0
+                AND am.state IN %s
+                """
+            + (("AND aml.date >= %s") if start_date else "")
+            + """
+                """
+            + (("AND aml.date <= %s") if end_date else "")
+            + """
+              ORDER BY rp.name,
+                aml.gl_foreign_balance,
+                aml.date ASC
+              """
+        )
+        params = [self.account_id]
+        states = ["posted"]
+        states += not only_include_posted_entries and ["draft"] or []
+        params.append(tuple(states))
+        if start_date:
+            params.append(start_date)
+        if end_date:
+            params.append(end_date)
+        self.cursor.execute(sql, params=params)
         self.ordered_lines = self.cursor.dictfetchall()
         return self.ordered_lines
 
@@ -76,12 +97,15 @@ class CurrencyUnrealizedReport(models.AbstractModel):
     @api.model
     def _get_report_values(self, docids, data=None):
         shell_accounts = {}
+        start_date = data.get("start_date", False)
+        end_date = data.get("end_date", False)
+        only_include_posted_entries = data.get("only_include_posted_entries", False)
+        account_ids = data.get("account_ids", False)
         docs = self.env["account.account"]
-        data = data if data is not None else {}
-        accounts = docs.browse(docids)
+        accounts = docs.browse(account_ids)
         for account in accounts:
             acc = ShellAccount(account)
-            acc.get_lines()
+            acc.get_lines(start_date, end_date, only_include_posted_entries)
             if acc.ordered_lines:
                 docs |= account
                 shell_accounts[account.id] = acc
diff --git a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
index 8aad0d815cf..4370882e316 100644
--- a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
+++ b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
@@ -1,10 +1,11 @@
 # Copyright 2012-2018 Camptocamp SA
 # Copyright 2020 CorporateHub (https://corporatehub.eu)
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 
-from odoo import _, fields, models
-from odoo.exceptions import ValidationError
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError, ValidationError
 
 
 class UnrealizedCurrencyReportPrinter(models.TransientModel):
@@ -17,6 +18,19 @@ class UnrealizedCurrencyReportPrinter(models.TransientModel):
         domain=[("currency_revaluation", "=", True)],
         default=lambda self: self._default_account_ids(),
     )
+    start_date = fields.Date(
+        help="The report will print from this Date, all the revaluated entries"
+        "created from this date. The default value will be the first day of the month.",
+        default=lambda self: self._default_start_date(),
+    )
+    end_date = fields.Date(
+        help="The report will print till this Date. The default value will be today.",
+        required=True,
+        default=lambda self: self._default_end_date(),
+    )
+    only_include_posted_entries = fields.Boolean(
+        default=False,
+    )
 
     def _default_account_ids(self):
         account_model = self.env["account.account"]
@@ -26,16 +40,33 @@ def _default_account_ids(self):
         ).ids
         return [(6, 0, account_ids)]
 
+    @api.onchange("start_date", "end_date")
+    def _onchange_dates(self):
+        self.ensure_one()
+        if self.start_date and self.end_date and self.start_date > self.end_date:
+            raise UserError(_("The Start Date cannot be higher than the End Date."))
+
+    def _default_start_date(self):
+        return fields.Date.today().replace(day=1)
+
+    def _default_end_date(self):
+        return fields.Date.today()
+
     def print_report(self):
         """
         Show the report
         """
         if self.account_ids:
-            docids = self.account_ids.ids
+            data = {
+                "start_date": self.start_date,
+                "end_date": self.end_date,
+                "only_include_posted_entries": self.only_include_posted_entries,
+                "account_ids": self.account_ids.ids,
+            }
             # report_action config should be false, otherwise it will call
             # configuration wizard that works weirdly
             return self.env.ref(
                 "account_multicurrency_revaluation.action_report_currency_unrealized"
-            ).report_action(docids, config=False)
+            ).report_action(docids=[], data=data, config=False)
         else:
             raise ValidationError(_("Please, select the accounts!"))
diff --git a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml
index 61e5f728884..b37005d4124 100644
--- a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml
+++ b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report_view.xml
@@ -6,6 +6,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form name="Print Currency Revaluation Report">
+                <group>
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="only_include_posted_entries" />
+                </group>
                 <group>
                     <field name="account_ids" />
                 </group>

From c98d8a87d66356292c2f604da6a3b2d956c84629 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 16:37:52 +0200
Subject: [PATCH 07/24] [IMP]account_multicurrency_revaluation: Revaluation
 Date on Report

---
 .../report/unrealized_currency_gain_loss.xml              | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
index dc59e273321..56b87a1f627 100644
--- a/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
+++ b/account_multicurrency_revaluation/report/unrealized_currency_gain_loss.xml
@@ -32,6 +32,9 @@
                             <div class="act_as_thead">
                                 <div class="act_as_row labels">
                                     <div class="act_as_cell first_column">Partner</div>
+                                    <div
+                                        class="act_as_cell first_column"
+                                    >Revaluation Date</div>
                                     <div
                                         class="act_as_cell first_column amount"
                                         style="width: 100px;"
@@ -63,6 +66,9 @@
                                     <div class="act_as_cell">
                                         <span t-esc="line.get('name') or '--'" />
                                     </div>
+                                    <div class="act_as_cell">
+                                        <span t-esc="line.get('date')" />
+                                    </div>
                                     <div
                                         class="act_as_cell amount"
                                         style="width: 100px;"
@@ -81,6 +87,7 @@
                                     >
                                         <span
                                             t-esc="line.get('gl_currency_rate') or 0.0"
+                                            t-options="{'widget': 'float', 'precision': 3}"
                                         />
                                     </div>
                                     <div
@@ -122,6 +129,7 @@
                                 <div class="act_as_cell" />
                                 <div class="act_as_cell" />
                                 <div class="act_as_cell" />
+                                <div class="act_as_cell" />
                                 <div class="act_as_cell amount">
                                     <b>
                                         <span

From dbde5b4e4c50952b5078053ff47f8a1de5be4a1f Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 16:39:19 +0200
Subject: [PATCH 08/24] [IMP]account_multicurrency_revaluation: Other
 improvements

---
 .../model/account.py                          | 29 +++++++++++++++++--
 .../readme/CONTRIBUTORS.rst                   |  9 ++++--
 .../wizard/wizard_currency_revaluation.py     |  9 +++---
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 1ff57e7673d..777afe444e4 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -1,8 +1,10 @@
 # Copyright 2012-2018 Camptocamp SA
 # Copyright 2020 CorporateHub (https://corporatehub.eu)
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 
 
 class AccountAccountLine(models.Model):
@@ -18,7 +20,7 @@ class AccountAccount(models.Model):
     _inherit = "account.account"
 
     currency_revaluation = fields.Boolean(
-        string="Allow currency revaluation",
+        string="Allow Currency Revaluation",
     )
 
     _sql_mapping = {
@@ -36,11 +38,34 @@ def init(self):
             [
                 ("user_type_id.id", "in", self._get_revaluation_account_types()),
                 ("currency_revaluation", "=", False),
+                ("user_type_id.include_initial_balance", "=", True),
             ]
         )
         accounts.write({"currency_revaluation": True})
         return res
 
+    def write(self, vals):
+        if (
+            "currency_revaluation" in vals
+            and vals.get("currency_revaluation", False)
+            and any(
+                [not x for x in self.mapped("user_type_id.include_initial_balance")]
+            )
+        ):
+            raise UserError(
+                _(
+                    "There is an account that you are editing not having the Bring "
+                    "Balance Forward set, the currency revaluation cannot be applied "
+                    "on these accounts: \n\t - %s"
+                )
+                % "\n\t - ".join(
+                    self.filtered(
+                        lambda x: not x.user_type_id.include_initial_balance
+                    ).mapped("name")
+                )
+            )
+        return super(AccountAccount, self).write(vals)
+
     def _get_revaluation_account_types(self):
         return [
             self.env.ref("account.data_account_type_receivable").id,
diff --git a/account_multicurrency_revaluation/readme/CONTRIBUTORS.rst b/account_multicurrency_revaluation/readme/CONTRIBUTORS.rst
index 00f4ac6ed66..ae797701383 100644
--- a/account_multicurrency_revaluation/readme/CONTRIBUTORS.rst
+++ b/account_multicurrency_revaluation/readme/CONTRIBUTORS.rst
@@ -4,19 +4,22 @@
 * Guewen Baconnier @ Camptocamp
 * Joel Grand-Guillaume
 * Kinner Vachhani
-* Matt Choplin choplin.mat@gmail.com
+* Matt Choplin <choplin.mat@gmail.com>
 * Matthieu Dietrich
 * moylop260
 * Stéphane Bidoul
 * Vincent Renaville
 * Yannick Vaucher
 * Akim Juillerat
-* `CorporateHub <https://corporatehub.eu/>`__
+* `CorporateHub <https://corporatehub.eu/>`_:
 
   * Alexey Pelykh <alexey.pelykh@corphub.eu>
 * `Tecnativa <https://www.tecnativa.com>`_:
 
   * Pedro M. Baeza
   * Ernesto Tejeda
-
 * Phuc (Tran Thanh) <phuc@trobz.com>
+* `ForgeFlow <https://www.forgeflow.com>`_:
+
+  * Jordi Masvidal
+  * Guillem Casassas
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index a8b9e39eaaf..f2757f90690 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -1,5 +1,6 @@
 # Copyright 2012-2018 Camptocamp SA
 # Copyright 2020 CorporateHub (https://corporatehub.eu)
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
@@ -98,7 +99,7 @@ def _create_move_and_lines(
         )
 
         if analytic_debit_acc_id:
-            credit_line.update({"analytic_account_id": analytic_debit_acc_id})
+            debit_line.update({"analytic_account_id": analytic_debit_acc_id})
 
         credit_line.update(
             {"debit": 0.0, "credit": amount, "account_id": credit_account_id}
@@ -275,7 +276,7 @@ def revaluate_currency(self):
         # - deferral method of account type is not None
         account_ids = Account.search(
             [
-                ("user_type_id.include_initial_balance", "=", "True"),
+                ("user_type_id.include_initial_balance", "=", True),
                 ("currency_revaluation", "=", True),
                 ("company_id", "=", company.id),
             ]
@@ -300,7 +301,7 @@ def revaluate_currency(self):
                 not account.currency_id
                 or account.currency_id == account.company_id.currency_id
             ):
-                # NOTE: There's no point of revaluating anying on bank account
+                # NOTE: There's no point of revaluating anything on bank account
                 # if bank account currency matches company currency.
                 continue
 
@@ -360,7 +361,7 @@ def revaluate_currency(self):
         if created_ids:
             return {
                 "domain": [("id", "in", created_ids)],
-                "name": _("Created revaluation lines"),
+                "name": _("Created Revaluation Lines"),
                 "view_mode": "tree,form",
                 "auto_search": True,
                 "res_model": "account.move.line",

From d1d9094b0369d52c402812f23ae26cdfd24adb2b Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 5 Oct 2022 17:03:34 +0200
Subject: [PATCH 09/24] [IMP]account_multicurrency_revaluation: Readonly False
 for settings

---
 account_multicurrency_revaluation/model/res_config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/account_multicurrency_revaluation/model/res_config.py b/account_multicurrency_revaluation/model/res_config.py
index d7d3300f1d5..a8fe49c9b95 100644
--- a/account_multicurrency_revaluation/model/res_config.py
+++ b/account_multicurrency_revaluation/model/res_config.py
@@ -98,6 +98,7 @@ class AccountConfigSettings(models.TransientModel):
         related="company_id.reversable_revaluations",
         string="Reversable Revaluations",
         help="Revaluations entries will be created " 'as "To Be Reversed".',
+        readonly=False,
     )
     auto_post_entries = fields.Boolean(
         related="company_id.auto_post_entries",

From a75dba68bddf57677d8b21b6ece6dcba36af4c95 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 25 Oct 2022 14:16:00 +0200
Subject: [PATCH 10/24] [IMP]account_multicurrency_revaluation: Improve company
 and related fields

---
 .../model/res_company.py                      | 20 +++---
 .../model/res_config.py                       | 69 +++----------------
 2 files changed, 23 insertions(+), 66 deletions(-)

diff --git a/account_multicurrency_revaluation/model/res_company.py b/account_multicurrency_revaluation/model/res_company.py
index b99254661d1..2fae42bc78a 100644
--- a/account_multicurrency_revaluation/model/res_company.py
+++ b/account_multicurrency_revaluation/model/res_company.py
@@ -12,7 +12,7 @@ class ResCompany(models.Model):
         comodel_name="account.account",
         string="Revaluation loss account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
@@ -21,19 +21,21 @@ class ResCompany(models.Model):
         comodel_name="account.account",
         string="Revaluation gain account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
     )
     revaluation_analytic_account_id = fields.Many2one(
-        comodel_name="account.analytic.account", string="Revaluation Analytic account"
+        comodel_name="account.analytic.account",
+        string="Revaluation Analytic account",
+        domain=lambda self: [("company_id", "=", self.env.company.id)],
     )
     provision_bs_loss_account_id = fields.Many2one(
         comodel_name="account.account",
         string="Provision B.S. loss account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
@@ -42,7 +44,7 @@ class ResCompany(models.Model):
         comodel_name="account.account",
         string="Provision B.S. gain account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
@@ -51,7 +53,7 @@ class ResCompany(models.Model):
         comodel_name="account.account",
         string="Provision P&L loss account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
@@ -60,7 +62,7 @@ class ResCompany(models.Model):
         comodel_name="account.account",
         string="Provision P&L gain account",
         domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
+            ("company_id", "=", self.env.company.id),
             ("internal_type", "=", "other"),
             ("deprecated", "=", False),
         ],
@@ -74,7 +76,9 @@ class ResCompany(models.Model):
         domain=[("type", "=", "general")],
     )
     reversable_revaluations = fields.Boolean(
-        help="Revaluations entries will be created " 'as "To Be Reversed".',
+        string="Flag Revaluation Entries",
+        help="If marked, the entries created in the process will be flagged "
+        "to be able to filter them out later.",
         default=True,
     )
     auto_post_entries = fields.Boolean(
diff --git a/account_multicurrency_revaluation/model/res_config.py b/account_multicurrency_revaluation/model/res_config.py
index a8fe49c9b95..3bbe7945133 100644
--- a/account_multicurrency_revaluation/model/res_config.py
+++ b/account_multicurrency_revaluation/model/res_config.py
@@ -9,101 +9,54 @@ class AccountConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     revaluation_loss_account_id = fields.Many2one(
-        related="company_id.revaluation_loss_account_id",
         comodel_name="account.account",
-        string="Revaluation loss account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.revaluation_loss_account_id",
         readonly=False,
     )
     revaluation_gain_account_id = fields.Many2one(
-        related="company_id.revaluation_gain_account_id",
         comodel_name="account.account",
-        string="Revaluation gain account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.revaluation_gain_account_id",
         readonly=False,
     )
     revaluation_analytic_account_id = fields.Many2one(
-        related="company_id.revaluation_analytic_account_id",
         comodel_name="account.analytic.account",
-        string="Revaluation Analytic account",
+        related="company_id.revaluation_analytic_account_id",
         readonly=False,
     )
     provision_bs_loss_account_id = fields.Many2one(
-        related="company_id.provision_bs_loss_account_id",
         comodel_name="account.account",
-        string="Provision B.S. loss account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.provision_bs_loss_account_id",
         readonly=False,
     )
     provision_bs_gain_account_id = fields.Many2one(
-        related="company_id.provision_bs_gain_account_id",
         comodel_name="account.account",
-        string="Provision B.S. gain account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.provision_bs_gain_account_id",
         readonly=False,
     )
     provision_pl_loss_account_id = fields.Many2one(
-        related="company_id.provision_pl_loss_account_id",
         comodel_name="account.account",
-        string="Provision P&L loss account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.provision_pl_loss_account_id",
         readonly=False,
     )
     provision_pl_gain_account_id = fields.Many2one(
-        related="company_id.provision_pl_gain_account_id",
         comodel_name="account.account",
-        string="Provision P&L gain account",
-        domain=lambda self: [
-            ("company_id", "in", self.env.company.id),
-            ("internal_type", "=", "other"),
-            ("deprecated", "=", False),
-        ],
+        related="company_id.provision_pl_gain_account_id",
         readonly=False,
     )
     provision_pl_analytic_account_id = fields.Many2one(
-        related="company_id.provision_pl_analytic_account_id",
         comodel_name="account.analytic.account",
-        string="Provision P&L Analytic account",
+        related="company_id.provision_pl_analytic_account_id",
         readonly=False,
     )
     default_currency_reval_journal_id = fields.Many2one(
-        related="company_id.currency_reval_journal_id",
         comodel_name="account.journal",
-        string="Currency gain & loss Default Journal",
-        domain=[("type", "=", "general")],
+        related="company_id.currency_reval_journal_id",
         default_model="res.company",
         readonly=False,
     )
     reversable_revaluations = fields.Boolean(
-        related="company_id.reversable_revaluations",
-        string="Reversable Revaluations",
-        help="Revaluations entries will be created " 'as "To Be Reversed".',
-        readonly=False,
+        related="company_id.reversable_revaluations", readonly=False,
     )
     auto_post_entries = fields.Boolean(
-        related="company_id.auto_post_entries",
-        string="Auto Post Created Entries",
-        help="If marked, the entries created in the process will be"
-        "posted automatically.",
-        readonly=False,
+        related="company_id.auto_post_entries", readonly=False,
     )

From 52b86da8b7d3054261c39c14a988afe34201460b Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 25 Oct 2022 14:43:53 +0200
Subject: [PATCH 11/24] [IMP]account_multicurrency_revaluation: Only include
 posted entries in the revaluation

---
 .../model/account.py                              | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 777afe444e4..831e3889e4f 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -87,7 +87,6 @@ def _revaluation_query(self, start_date, revaluation_date):
         mapping = [
             ('"account_move_line".', "aml."),
             ('"account_move_line"', "account_move_line aml"),
-            ('"account_move_line__move_id"', "am"),
             ("LEFT JOIN", "\n    LEFT JOIN"),
             (")) AND", "))\n" + " " * 12 + "AND"),
         ]
@@ -111,6 +110,7 @@ def _revaluation_query(self, start_date, revaluation_date):
     FROM """
             + tables
             + """
+    LEFT JOIN account_move am ON aml.move_id = am.id
     INNER JOIN account_account acc ON aml.account_id = acc.id
     INNER JOIN account_account_type aat ON acc.user_type_id = aat.id
     LEFT JOIN account_partial_reconcile aprc
@@ -120,9 +120,6 @@ def _revaluation_query(self, start_date, revaluation_date):
             aml.balance < 0
             AND aprc.debit_move_id = amlcf.id
             AND amlcf.date < %s
-            """
-            + (("AND amlcf.date >= %s") if start_date else "")
-            + """
         )
     LEFT JOIN account_partial_reconcile aprd
         ON (aml.balance > 0 AND aml.id = aprd.debit_move_id)
@@ -131,9 +128,6 @@ def _revaluation_query(self, start_date, revaluation_date):
             aml.balance > 0
             AND aprd.credit_move_id = amldf.id
             AND amldf.date < %s
-            """
-            + (("AND amldf.date >= %s") if start_date else "")
-            + """
         )
     WHERE
         aml.account_id IN %s
@@ -142,6 +136,7 @@ def _revaluation_query(self, start_date, revaluation_date):
             + (("AND aml.date >= %s") if start_date else "")
             + """
         AND aml.currency_id IS NOT NULL
+        AND am.state = 'posted'
         """
             + where_clause
             + """
@@ -174,10 +169,8 @@ def _revaluation_query(self, start_date, revaluation_date):
             *where_clause_params,
         ]
         if start_date:
-            # Insert values after all the revaluations date parameters
-            params.insert(1, start_date)
-            params.insert(3, start_date)
-            params.insert(6, start_date)
+            # Insert the value after the revaluation date parameter
+            params.insert(4, start_date)
 
         return query, params
 

From 7fa4c4a1eb766e63c1ea798e757db19c3c85ddd2 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 25 Oct 2022 14:45:22 +0200
Subject: [PATCH 12/24] [IMP]account_multicurrency_revaluation: Replace flaged
 accounts for field

---
 .../wizard/wizard_currency_revaluation.py     | 30 ++++++++++++-------
 .../wizard_currency_revaluation_view.xml      | 11 +++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index f2757f90690..7e937658238 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -31,6 +31,18 @@ def _get_default_journal_id(self):
     def _get_default_label(self):
         return "%(currency)s %(account)s %(rate)s currency revaluation"
 
+    @api.model
+    @api.depends("journal_id")
+    def _get_default_revaluation_account_ids(self):
+        company = self.journal_id.company_id or self.env.company
+        return self.env["account.account"].search(
+            [
+                ("user_type_id.include_initial_balance", "=", True),
+                ("currency_revaluation", "=", True),
+                ("company_id", "=", company.id),
+            ]
+        )
+
     revaluation_date = fields.Date(
         required=True,
         default=lambda self: self._get_default_revaluation_date(),
@@ -56,6 +68,13 @@ def _get_default_label(self):
         required=True,
         default=lambda self: self._get_default_label(),
     )
+    revaluation_account_ids = fields.Many2many(
+        comodel_name="account.account",
+        string="Revaluation Accounts",
+        help="Accounts that will be revaluated",
+        required=True,
+        default=lambda self: self._get_default_revaluation_account_ids(),
+    )
 
     def _create_move_and_lines(
         self,
@@ -271,16 +290,7 @@ def revaluate_currency(self):
                 )
             )
 
-        # Search for accounts Balance Sheet to be revaluated
-        # on those criteria
-        # - deferral method of account type is not None
-        account_ids = Account.search(
-            [
-                ("user_type_id.include_initial_balance", "=", True),
-                ("currency_revaluation", "=", True),
-                ("company_id", "=", company.id),
-            ]
-        )
+        account_ids = self.revaluation_account_ids
 
         if not account_ids:
             raise exceptions.UserError(
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
index 29dfda0c6aa..e5356709f65 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
@@ -30,6 +30,17 @@
                     >%%(account_name)s : Account name for which the revaluation is applied"</div>
                     <div>%%(rate)s : Value of rate applied during revaluation</div>
                 </group>
+                <span
+                    name="info-2"
+                    style="font-weight: bold;"
+                >These are all the accounts that will be revaluated upon clicking the Validate button. Initialized as the Accounts having the flag Allow Currency Revaluation set, but then manually changed if needed.
+                </span>
+                <group>
+                    <field
+                        name="revaluation_account_ids"
+                        options="{'no_create':True, 'no_edit':True, 'no_open':True}"
+                    />
+                </group>
                 <footer>
                     <button
                         name="revaluate_currency"

From 72dbbcc8388fd8532f257f95c71a248d43ebbb5d Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 25 Oct 2022 15:15:13 +0200
Subject: [PATCH 13/24] [IMP]account_multicurrency_revaluation: adapt tests

---
 .../tests/test_currency_revaluation.py        | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/account_multicurrency_revaluation/tests/test_currency_revaluation.py b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
index bbadb139489..694398e1d3f 100644
--- a/account_multicurrency_revaluation/tests/test_currency_revaluation.py
+++ b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
@@ -91,7 +91,7 @@ def test_revaluation(self):
             Currency Reval 1.25    0.00   40.00     0.00
         """
         self.delete_journal_data()
-        self.update_company(reversable_revaluations=False, with_analytic=True)
+        self.update_company(with_analytic=True)
         usd_currency = self.env.ref("base.USD")
         rates = {
             (self.today - timedelta(days=30)): 4.00,
@@ -116,7 +116,7 @@ def test_revaluation(self):
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         result = self.wizard_execute(self.today - timedelta(days=7))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -124,7 +124,7 @@ def test_revaluation(self):
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         result = self.wizard_execute(self.today - timedelta(days=1))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -161,7 +161,7 @@ def test_revaluation_loss(self):
             Currency Reval 1.25    0.00   40.00     0.00
         """
         self.delete_journal_data()
-        self.update_company(reversable_revaluations=False, with_analytic=True)
+        self.update_company(with_analytic=True)
         usd_currency = self.env.ref("base.USD")
         rates = {
             (self.today - timedelta(days=30)): 1.25,
@@ -186,7 +186,7 @@ def test_revaluation_loss(self):
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         result = self.wizard_execute(self.today - timedelta(days=7))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -195,7 +195,7 @@ def test_revaluation_loss(self):
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         result = self.wizard_execute(self.today - timedelta(days=1))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -247,7 +247,6 @@ def test_revaluation_payment(self):
         self.create_rates(rates, eur_currency)
         self.create_rates({fields.Date.to_date("2001-01-01"): 1}, usd_currency)
         values = {
-            "reversable_revaluations": False,
             "currency_id": usd_currency.id,
         }
         self.company.write(values)
@@ -257,7 +256,7 @@ def test_revaluation_payment(self):
         )
         invoice.action_post()
         result = self.wizard_execute(self.today - timedelta(days=70))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -298,7 +297,7 @@ def test_revaluation_payment(self):
         payment.action_post()
 
         result = self.wizard_execute(self.today - timedelta(days=70))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
@@ -325,7 +324,6 @@ def test_revaluation_bank_account(self):
         }
         self.create_rates(rates, eur_currency)
         values = {
-            "reversable_revaluations": False,
             "currency_id": usd_currency.id,
         }
         self.company.write(values)
@@ -450,7 +448,7 @@ def test_revaluation_bank_account(self):
         self.assertEqual(sum(bank_account_lines.mapped("amount_currency")), 125.0)
 
         result = self.wizard_execute(self.today - timedelta(days=60))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
 
         new_bank_account_lines = self.env["account.move.line"].search(
             [("account_id", "=", bank_account.id)]
@@ -477,7 +475,6 @@ def test_revaluation_bank_account_same_currency(self):
         }
         self.create_rates(rates, eur_currency)
         values = {
-            "reversable_revaluations": False,
             "currency_id": usd_currency.id,
         }
         self.company.write(values)
@@ -645,7 +642,6 @@ def test_revaluation_reverse(self):
         }
         self.create_rates(rates, eur_currency)
         values = {
-            "reversable_revaluations": True,
             "currency_id": usd_currency.id,
         }
         self.company.write(values)
@@ -773,7 +769,7 @@ def test_revaluation_reverse(self):
         self.assertEqual(sum(bank_account_lines.mapped("amount_currency")), 125.0)
 
         result = self.wizard_execute(self.today - timedelta(days=60))
-        self.assertEqual(result.get("name"), "Created revaluation lines")
+        self.assertEqual(result.get("name"), "Created Revaluation Lines")
 
         new_bank_account_lines = self.env["account.move.line"].search(
             [("account_id", "=", bank_account.id)]
@@ -844,8 +840,10 @@ def wizard_execute(self, date):
         wiz = self.env["wizard.currency.revaluation"].create(
             {
                 "revaluation_date": date,
+                "start_date": False,
                 "journal_id": self.reval_journal.id,
                 "label": "[%(account)s] [%(currency)s] wiz_test",
+                "revaluation_account_ids": [self.receivable_acc.id],
             }
         )
         return wiz.revaluate_currency()

From 343231ad8435adb5c3b20c43f29d870e0ce3ec94 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Fri, 4 Nov 2022 12:05:26 +0100
Subject: [PATCH 14/24] [IMP]account_multicurrency_revaluation Adapt helps to
 suggestions and adapt method declarartion to improve the experience of
 users/developers.

---
 account_multicurrency_revaluation/model/account.py          | 6 +++---
 account_multicurrency_revaluation/model/res_company.py      | 6 +++---
 .../wizard/print_currency_unrealized_report.py              | 2 +-
 .../wizard/wizard_currency_revaluation.py                   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 831e3889e4f..8a83659fa81 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -80,7 +80,7 @@ def _onchange_user_type_id(self):
             if rec.user_type_id.id in revaluation_accounts:
                 rec.currency_revaluation = True
 
-    def _revaluation_query(self, start_date, revaluation_date):
+    def _revaluation_query(self, revaluation_date, start_date=None):
         tables, where_clause, where_clause_params = self.env[
             "account.move.line"
         ]._query_get()
@@ -174,8 +174,8 @@ def _revaluation_query(self, start_date, revaluation_date):
 
         return query, params
 
-    def compute_revaluations(self, start_date, revaluation_date):
-        query, params = self._revaluation_query(start_date, revaluation_date)
+    def compute_revaluations(self, revaluation_date, start_date=None):
+        query, params = self._revaluation_query(revaluation_date, start_date)
         self.env.cr.execute(query, params)
         lines = self.env.cr.dictfetchall()
 
diff --git a/account_multicurrency_revaluation/model/res_company.py b/account_multicurrency_revaluation/model/res_company.py
index 2fae42bc78a..bda8ff0d5c2 100644
--- a/account_multicurrency_revaluation/model/res_company.py
+++ b/account_multicurrency_revaluation/model/res_company.py
@@ -77,14 +77,14 @@ class ResCompany(models.Model):
     )
     reversable_revaluations = fields.Boolean(
         string="Flag Revaluation Entries",
-        help="If marked, the entries created in the process will be flagged "
-        "to be able to filter them out later.",
+        help="If marked, the entries created in the process will be flagged"
+        " to be able to filter them out later.",
         default=True,
     )
     auto_post_entries = fields.Boolean(
         string="Auto Post Created Entries",
         help="If marked, the entries created in the process will be"
-        "posted automatically.",
+        " posted automatically.",
         default=True,
         readonly=False,
     )
diff --git a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
index 4370882e316..6be9128eb3f 100644
--- a/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
+++ b/account_multicurrency_revaluation/wizard/print_currency_unrealized_report.py
@@ -20,7 +20,7 @@ class UnrealizedCurrencyReportPrinter(models.TransientModel):
     )
     start_date = fields.Date(
         help="The report will print from this Date, all the revaluated entries"
-        "created from this date. The default value will be the first day of the month.",
+        " created from this date. The default value will be the first day of the month",
         default=lambda self: self._default_start_date(),
     )
     end_date = fields.Date(
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 7e937658238..b92842d6baf 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -62,7 +62,7 @@ def _get_default_revaluation_account_ids(self):
     label = fields.Char(
         string="Entry description",
         size=100,
-        help="This label will be inserted in entries description. "
+        help="This label will be inserted in entries description."
         "You can use %(account)s, %(account_name)s, %(currency)s and "
         "%(rate)s keywords.",
         required=True,
@@ -71,7 +71,7 @@ def _get_default_revaluation_account_ids(self):
     revaluation_account_ids = fields.Many2many(
         comodel_name="account.account",
         string="Revaluation Accounts",
-        help="Accounts that will be revaluated",
+        help="Accounts that will be revaluated.",
         required=True,
         default=lambda self: self._get_default_revaluation_account_ids(),
     )
@@ -302,7 +302,7 @@ def revaluate_currency(self):
             )
 
         revaluations = account_ids.compute_revaluations(
-            self.start_date, self.revaluation_date
+            self.revaluation_date, self.start_date
         )
 
         for account_id, by_account in revaluations.items():

From 8ddc0e5da14a19bc88138f1a8ca0647e5832bebb Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 16 Nov 2022 17:27:51 +0100
Subject: [PATCH 15/24] [IMP]account_multicurrency_revaluation: Remove currency
 in line Removed as it may lead to problems just because the entry may have
 the currency from the company, and the lines having a different currency.
 Then we will not be able to post the entry.

---
 .../wizard/wizard_currency_revaluation.py                        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index b92842d6baf..4e94c3bc4fb 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -100,7 +100,6 @@ def _create_move_and_lines(
         base_line = {
             "name": label,
             "partner_id": partner_id,
-            "currency_id": currency_id,
             "amount_currency": 0.0,
             "date": form.revaluation_date,
         }

From a7d66cc5ec7e881d4e98b42b742cbd16f0888430 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 16 Nov 2022 17:29:30 +0100
Subject: [PATCH 16/24] [IMP]account_multicurrency_revaluation: Reverse moves
 Wizard to be able to create the reverse moves given an start date and end
 date. All revaluated entries during the period will be included and upon the
 validation, the reverse moves will be created. Also you can determine a
 posting date which will be the date assigned to all reverse moves created.

---
 .../__manifest__.py                           |  1 +
 .../model/account.py                          |  2 +
 .../wizard/__init__.py                        |  1 +
 .../wizard_reverse_currency_revaluation.py    | 88 +++++++++++++++++++
 ...zard_reverse_currency_revaluation_view.xml | 67 ++++++++++++++
 5 files changed, 159 insertions(+)
 create mode 100644 account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
 create mode 100644 account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml

diff --git a/account_multicurrency_revaluation/__manifest__.py b/account_multicurrency_revaluation/__manifest__.py
index 757122241ec..812c79cc907 100644
--- a/account_multicurrency_revaluation/__manifest__.py
+++ b/account_multicurrency_revaluation/__manifest__.py
@@ -19,6 +19,7 @@
         "views/account_move_views.xml",
         "wizard/print_currency_unrealized_report_view.xml",
         "wizard/wizard_currency_revaluation_view.xml",
+        "wizard/wizard_reverse_currency_revaluation_view.xml",
         "report/report.xml",
         "report/unrealized_currency_gain_loss.xml",
     ],
diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 8a83659fa81..480188b756d 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -199,3 +199,5 @@ class AccountMove(models.Model):
     revaluation_to_reverse = fields.Boolean(
         string="Revaluation to reverse", default=False
     )
+
+    revaluation_reversed = fields.Boolean(string="Revaluation reversed", default=False)
diff --git a/account_multicurrency_revaluation/wizard/__init__.py b/account_multicurrency_revaluation/wizard/__init__.py
index 8498c325844..a9bdfb3161b 100644
--- a/account_multicurrency_revaluation/wizard/__init__.py
+++ b/account_multicurrency_revaluation/wizard/__init__.py
@@ -1,2 +1,3 @@
 from . import wizard_currency_revaluation
 from . import print_currency_unrealized_report
+from . import wizard_reverse_currency_revaluation
diff --git a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
new file mode 100644
index 00000000000..0b8d356cf9d
--- /dev/null
+++ b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
@@ -0,0 +1,88 @@
+# Copyright 2022 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, exceptions, fields, models
+
+
+class WizardCurrencyRevaluation(models.TransientModel):
+    _name = "wizard.reverse.currency.revaluation"
+    _description = "Reverse Currency Revaluation Wizard"
+
+    @api.model
+    def _get_default_journal_id(self):
+        return self.env.company.currency_reval_journal_id
+
+    revaluation_interval_start_date = fields.Date(
+        string="Revaluation Start Date",
+        help="All entries revaluated on or after this date will be taken into account.",
+    )
+    revaluation_interval_end_date = fields.Date(
+        string="Revaluation End Date",
+        help="All entries revaluated on or before this date will be taken into account.",
+    )
+
+    reverse_posting_date = fields.Date(
+        string="Posting Date",
+        help="Date that will be assigned to the reverse entries created.",
+    )
+
+    journal_id = fields.Many2one(
+        comodel_name="account.journal",
+        string="Journal",
+        domain=[("type", "=", "general")],
+        help="You can set the default journal in company settings.",
+        required=True,
+        default=lambda self: self._get_default_journal_id(),
+    )
+
+    entries_to_reverse_ids = fields.Many2many(
+        comodel_name="account.move",
+        string="Entries to reverse",
+        help="The revaluated entries that will be reversed.",
+    )
+
+    @api.onchange("revaluation_interval_start_date", "revaluation_interval_end_date")
+    def onchange_revaluation_interval_dates(self):
+        self.ensure_one()
+        account_move_model = self.env["account.move"]
+        company_id = self.journal_id.company_id.id or self.env.company.id
+        domain = [
+            ("revaluation_to_reverse", "=", True),
+            ("state", "=", "posted"),
+            ("company_id", "=", company_id),
+        ]
+        if self.revaluation_interval_start_date:
+            domain += [("date", ">=", self.revaluation_interval_start_date)]
+        if self.revaluation_interval_end_date:
+            domain += [("date", "<=", self.revaluation_interval_end_date)]
+        entries = account_move_model.search(domain)
+        final_entries = account_move_model
+        for entry in entries:
+            reverse_entry = account_move_model.search(
+                [("reversed_entry_id", "=", entry.id)], limit=1
+            )
+            if not reverse_entry:
+                final_entries += entry
+        self.entries_to_reverse_ids = final_entries
+
+    def reverse_revaluate_currency(self):
+        created_entries = self.entries_to_reverse_ids._reverse_moves()
+        vals = {"revaluation_reversed": True, "revaluation_to_reverse": False}
+        if self.reverse_posting_date:
+            vals.update({"date": self.reverse_posting_date})
+        created_entries.write(vals)
+        if self.journal_id.company_id.auto_post_entries:
+            created_entries.post()
+        if created_entries:
+            return {
+                "domain": [("id", "in", created_entries.ids)],
+                "name": _("Reverse Revaluation Entries"),
+                "view_mode": "tree,form",
+                "auto_search": True,
+                "res_model": "account.move",
+                "view_id": False,
+                "search_view_id": False,
+                "type": "ir.actions.act_window",
+            }
+        else:
+            raise exceptions.Warning(_("No accounting entry has been posted."))
diff --git a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml
new file mode 100644
index 00000000000..acdcf1ae3b9
--- /dev/null
+++ b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_account_reverse_currency_revaluation_wizard" model="ir.ui.view">
+        <field name="name">Reverse Currency Revaluation</field>
+        <field name="model">wizard.reverse.currency.revaluation</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Reverse Currency Revaluation">
+                <span
+                    name="info"
+                    style="font-weight: bold;"
+                >For all revaluated entries created during the period defined, a reverse entry will be created in the system. These entries will have the invoice date as the date defined here as well. If there is no reverse posting date, for each entry, the invoice date will be the first day of the next month of the entry date.
+                </span>
+                <span
+                    name="info-2"
+                    style="font-weight: bold;"
+                >The revaluation date of an entry that got revaluated is the date that the process that created the entry run.
+                </span>
+                <group>
+                    <group>
+                        <field name="revaluation_interval_start_date" />
+                        <field name="revaluation_interval_end_date" />
+                        <field name="reverse_posting_date" />
+                        <field name="journal_id" />
+                    </group>
+                </group>
+                <group>
+                    <field name="entries_to_reverse_ids">
+                        <tree create="0" delete="0">
+                            <field name="name" />
+                            <field name="company_id" />
+                            <field name="date" />
+                            <field name="amount_total_signed" />
+                            <field name="state" />
+                        </tree>
+                    </field>
+                </group>
+                <footer>
+                    <button
+                        name="reverse_revaluate_currency"
+                        type="object"
+                        string="_Validate"
+                        class="oe_highlight"
+                    />
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record
+        id="action_view_account_reverse_currency_revaluation_wizard"
+        model="ir.actions.act_window"
+    >
+        <field name="name">Reverse Currency Revaluation</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">wizard.reverse.currency.revaluation</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+    <menuitem
+        action="action_view_account_reverse_currency_revaluation_wizard"
+        id="menu_view_reverse_account_currency_revaluation_wizard"
+        parent="account_multicurrency_revaluation.menu_view_account_currency_revaluation_closing"
+        groups="group_revaluation_additional"
+        sequence="20"
+    />
+</odoo>

From c5e6fa8c574240005ba0227908d74965b7f542cb Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Thu, 17 Nov 2022 17:27:28 +0100
Subject: [PATCH 17/24] [IMP]account_multicurrency_revaluation: Always flag
 revaluated entries Remove the setting that allowed the user to possibly flag
 the revaluated entries created during the main process. Always flag them
 instead to be used later in the reverse wizard.

---
 .../model/res_company.py                      |  6 -----
 .../model/res_config.py                       |  3 ---
 .../views/account_move_views.xml              |  7 +++++-
 .../views/res_config_view.xml                 | 18 ---------------
 .../wizard/wizard_currency_revaluation.py     | 22 ++-----------------
 .../wizard_reverse_currency_revaluation.py    |  8 +++++--
 6 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/account_multicurrency_revaluation/model/res_company.py b/account_multicurrency_revaluation/model/res_company.py
index bda8ff0d5c2..aae40b26fdb 100644
--- a/account_multicurrency_revaluation/model/res_company.py
+++ b/account_multicurrency_revaluation/model/res_company.py
@@ -75,12 +75,6 @@ class ResCompany(models.Model):
         string="Currency gain & loss Default Journal",
         domain=[("type", "=", "general")],
     )
-    reversable_revaluations = fields.Boolean(
-        string="Flag Revaluation Entries",
-        help="If marked, the entries created in the process will be flagged"
-        " to be able to filter them out later.",
-        default=True,
-    )
     auto_post_entries = fields.Boolean(
         string="Auto Post Created Entries",
         help="If marked, the entries created in the process will be"
diff --git a/account_multicurrency_revaluation/model/res_config.py b/account_multicurrency_revaluation/model/res_config.py
index 3bbe7945133..1a2bf7072b5 100644
--- a/account_multicurrency_revaluation/model/res_config.py
+++ b/account_multicurrency_revaluation/model/res_config.py
@@ -54,9 +54,6 @@ class AccountConfigSettings(models.TransientModel):
         default_model="res.company",
         readonly=False,
     )
-    reversable_revaluations = fields.Boolean(
-        related="company_id.reversable_revaluations", readonly=False,
-    )
     auto_post_entries = fields.Boolean(
         related="company_id.auto_post_entries", readonly=False,
     )
diff --git a/account_multicurrency_revaluation/views/account_move_views.xml b/account_multicurrency_revaluation/views/account_move_views.xml
index 138189d7e78..234b598478e 100644
--- a/account_multicurrency_revaluation/views/account_move_views.xml
+++ b/account_multicurrency_revaluation/views/account_move_views.xml
@@ -18,10 +18,15 @@
         <field name="arch" type="xml">
             <filter name="posted" position="after">
                 <filter
-                    string="Revaluation to reverse"
+                    string="Revaluation To Reverse"
                     name="revaluation_to_reverse"
                     domain="[('revaluation_to_reverse', '=', True)]"
                 />
+                <filter
+                    string="Revaluation Reversed"
+                    name="revaluation_reversed"
+                    domain="[('revaluation_reversed', '=', True)]"
+                />
             </filter>
         </field>
     </record>
diff --git a/account_multicurrency_revaluation/views/res_config_view.xml b/account_multicurrency_revaluation/views/res_config_view.xml
index 40ac7007996..fbb984621f2 100644
--- a/account_multicurrency_revaluation/views/res_config_view.xml
+++ b/account_multicurrency_revaluation/views/res_config_view.xml
@@ -29,24 +29,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_left_pane">
-                            <field name="reversable_revaluations" />
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <div class="content-group">
-                                <label for="reversable_revaluations" />
-                                <span
-                                    class="fa fa-lg fa-building-o"
-                                    title="Values set here are company-specific."
-                                    groups="base.group_multi_company"
-                                />
-                                <div class="text-muted">
-                                    Revaluations entries will be created as 'To Be Reversed'.
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div
                     class="row mt16 o_settings_container"
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 4e94c3bc4fb..5d26dcc96c3 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -74,6 +74,7 @@ def _get_default_revaluation_account_ids(self):
         help="Accounts that will be revaluated.",
         required=True,
         default=lambda self: self._get_default_revaluation_account_ids(),
+        domain=lambda self: [("company_id", "=", self.env.company.id)],
     )
 
     def _create_move_and_lines(
@@ -93,9 +94,8 @@ def _create_move_and_lines(
         base_move = {
             "journal_id": form.journal_id.id,
             "date": form.revaluation_date,
+            "revaluation_to_reverse": True,
         }
-        if form.journal_id.company_id.reversable_revaluations:
-            base_move["revaluation_to_reverse"] = True
 
         base_line = {
             "name": label,
@@ -349,24 +349,6 @@ def revaluate_currency(self):
                     )
                     created_ids.extend(new_ids)
 
-        # In case revaluation date is before today, it's safe to run reversing
-        # w/o waiting tomorrow, since otherwise it would cause confusion when
-        # revaluating historical entries for multiple years within one day.
-        if (
-            self.journal_id.company_id.reversable_revaluations
-            and self.revaluation_date < fields.Date.context_today(self)
-        ):
-            reversing_moves = self.env["account.move"].search(
-                [
-                    ("journal_id", "in", self.mapped("journal_id.id")),
-                    ("state", "=", "posted"),
-                    ("revaluation_to_reverse", "=", True),
-                    ("reversed_entry_id", "=", False),
-                ],
-                limit=1,
-            )
-            reversing_moves._reverse_moves()
-
         if created_ids:
             return {
                 "domain": [("id", "in", created_ids)],
diff --git a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
index 0b8d356cf9d..9d92b6c27c2 100644
--- a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
@@ -66,13 +66,17 @@ def onchange_revaluation_interval_dates(self):
         self.entries_to_reverse_ids = final_entries
 
     def reverse_revaluate_currency(self):
-        created_entries = self.entries_to_reverse_ids._reverse_moves()
+        entries = self.entries_to_reverse_ids
+        created_entries = entries._reverse_moves()
         vals = {"revaluation_reversed": True, "revaluation_to_reverse": False}
         if self.reverse_posting_date:
             vals.update({"date": self.reverse_posting_date})
         created_entries.write(vals)
         if self.journal_id.company_id.auto_post_entries:
-            created_entries.post()
+            for entry in created_entries:
+                entry.post()
+        # Mark entries reversed as not to be reversed anymore
+        entries.write({"revaluation_to_reverse": False})
         if created_entries:
             return {
                 "domain": [("id", "in", created_entries.ids)],

From c06157e76e37f38d6d93150ef848a6203c86475d Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Fri, 18 Nov 2022 12:28:49 +0100
Subject: [PATCH 18/24] [IMP]account_multicurrency_revaluation: Small
 improvements Make both fields readonly as they will be only used in the logic
 and to filter, the user will not modify them. Also, limit entries appearing
 in reverse wizard.

---
 account_multicurrency_revaluation/model/account.py          | 6 ++++--
 .../wizard/wizard_reverse_currency_revaluation.py           | 2 +-
 .../wizard/wizard_reverse_currency_revaluation_view.xml     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 480188b756d..3baa31d704b 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -197,7 +197,9 @@ class AccountMove(models.Model):
     _inherit = "account.move"
 
     revaluation_to_reverse = fields.Boolean(
-        string="Revaluation to reverse", default=False
+        string="Revaluation to reverse", default=False, readonly=True
     )
 
-    revaluation_reversed = fields.Boolean(string="Revaluation reversed", default=False)
+    revaluation_reversed = fields.Boolean(
+        string="Revaluation reversed", default=False, readonly=True
+    )
diff --git a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
index 9d92b6c27c2..0d3c007fbbd 100644
--- a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation.py
@@ -22,7 +22,7 @@ def _get_default_journal_id(self):
     )
 
     reverse_posting_date = fields.Date(
-        string="Posting Date",
+        string="Reverse Entries Accounting Date",
         help="Date that will be assigned to the reverse entries created.",
     )
 
diff --git a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml
index acdcf1ae3b9..6cb0bda4851 100644
--- a/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml
+++ b/account_multicurrency_revaluation/wizard/wizard_reverse_currency_revaluation_view.xml
@@ -26,7 +26,7 @@
                 </group>
                 <group>
                     <field name="entries_to_reverse_ids">
-                        <tree create="0" delete="0">
+                        <tree create="0" delete="0" limit="10">
                             <field name="name" />
                             <field name="company_id" />
                             <field name="date" />

From d53d69d4f98e5c127f0c88f6ccfa3a816bdc6027 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Wed, 23 Nov 2022 11:30:35 +0100
Subject: [PATCH 19/24] [IMP]account_multicurrency_revaluation: Line origin
 Adds the origin line from where the revaluated line is created. Also,
 improves the query to get the open items.

---
 .../__manifest__.py                           |  1 +
 .../model/account.py                          | 17 +++++--
 .../views/account_move_line_views.xml         | 46 +++++++++++++++++++
 .../wizard/wizard_currency_revaluation.py     | 14 ++++++
 4 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 account_multicurrency_revaluation/views/account_move_line_views.xml

diff --git a/account_multicurrency_revaluation/__manifest__.py b/account_multicurrency_revaluation/__manifest__.py
index 812c79cc907..5c569364168 100644
--- a/account_multicurrency_revaluation/__manifest__.py
+++ b/account_multicurrency_revaluation/__manifest__.py
@@ -17,6 +17,7 @@
         "security/ir.model.access.csv",
         "views/account_view.xml",
         "views/account_move_views.xml",
+        "views/account_move_line_views.xml",
         "wizard/print_currency_unrealized_report_view.xml",
         "wizard/wizard_currency_revaluation_view.xml",
         "wizard/wizard_reverse_currency_revaluation_view.xml",
diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 3baa31d704b..6cb787aed92 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -106,7 +106,8 @@ def _revaluation_query(self, revaluation_date, start_date=None):
         aml.currency_id,
         aml.debit,
         aml.credit,
-        aml.amount_currency
+        aml.amount_currency,
+        aml.id as origin_aml_id
     FROM """
             + tables
             + """
@@ -137,18 +138,19 @@ def _revaluation_query(self, revaluation_date, start_date=None):
             + """
         AND aml.currency_id IS NOT NULL
         AND am.state = 'posted'
+        AND aml.balance <> 0
         """
             + where_clause
             + """
     GROUP BY
         aat.type,
-        aml.id
+        origin_aml_id
     HAVING
-        aml.full_reconcile_id IS NULL
-        OR (MAX(amldf.id) IS NULL AND MAX(amlcf.id) IS NULL)
+        aml.amount_residual_currency <> 0
 )
 SELECT
     account_id as id,
+    origin_aml_id,
     partner_id,
     currency_id,"""
             + ", ".join(self._sql_mapping.values())
@@ -156,6 +158,7 @@ def _revaluation_query(self, revaluation_date, start_date=None):
 FROM amount
 GROUP BY
     account_id,
+    origin_aml_id,
     currency_id,
     partner_id
 ORDER BY account_id, partner_id, currency_id"""
@@ -203,3 +206,9 @@ class AccountMove(models.Model):
     revaluation_reversed = fields.Boolean(
         string="Revaluation reversed", default=False, readonly=True
     )
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    revaluation_origin_line_id = fields.Many2one(comodel_name="account.move.line")
diff --git a/account_multicurrency_revaluation/views/account_move_line_views.xml b/account_multicurrency_revaluation/views/account_move_line_views.xml
new file mode 100644
index 00000000000..1ba5111a38c
--- /dev/null
+++ b/account_multicurrency_revaluation/views/account_move_line_views.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_move_line_form" model="ir.ui.view">
+        <field
+            name="name"
+        >account.move.line.form - account_multicurrency_revaluation</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_form" />
+        <field
+            name="groups_id"
+            eval="[(6,0,[ref('account_multicurrency_revaluation.group_revaluation_additional')])]"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='analytic_account_id']/.." position="after">
+                <group
+                    string="Currency Revaluation"
+                    name="currency_revaluation"
+                    attrs="{'invisible': [('revaluation_origin_line_id', '=', False)]}"
+                >
+                    <field name="revaluation_origin_line_id" />
+                </group>
+            </xpath>
+        </field>
+    </record>
+    <record id="view_account_move_line_filter" model="ir.ui.view">
+        <field
+            name="name"
+        >account.move.line.search - account_multicurrency_revaluation</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_account_move_line_filter" />
+        <field
+            name="groups_id"
+            eval="[(6,0,[ref('account_multicurrency_revaluation.group_revaluation_additional')])]"
+        />
+        <field name="arch" type="xml">
+            <filter name="receivable" position="after">
+                <separator />
+                <filter
+                    name="origin_revaluation"
+                    string="Currency Revaluation Items"
+                    domain="[('revaluation_origin_line_id', '!=', False)]"
+                />
+            </filter>
+        </field>
+    </record>
+</odoo>
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 5d26dcc96c3..f257bbd431e 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -89,6 +89,7 @@ def _create_move_and_lines(
         currency_id,
         analytic_debit_acc_id=False,
         analytic_credit_acc_id=False,
+        debit=False,
     ):
 
         base_move = {
@@ -108,10 +109,20 @@ def _create_move_and_lines(
         base_line["gl_balance"] = sums.get("balance", 0.0)
         base_line["gl_revaluated_balance"] = sums.get("revaluated_balance", 0.0)
         base_line["gl_currency_rate"] = sums.get("currency_rate", 0.0)
+        revaluation_origin_line_id = sums.get("origin_aml_id", False)
 
         debit_line = base_line.copy()
         credit_line = base_line.copy()
 
+        if debit:
+            debit_line.update(
+                {"revaluation_origin_line_id": revaluation_origin_line_id}
+            )
+        else:
+            credit_line.update(
+                {"revaluation_origin_line_id": revaluation_origin_line_id}
+            )
+
         debit_line.update(
             {"debit": amount, "credit": 0.0, "account_id": debit_account_id}
         )
@@ -125,6 +136,7 @@ def _create_move_and_lines(
 
         if analytic_credit_acc_id:
             credit_line.update({"analytic_account_id": analytic_credit_acc_id})
+
         base_move["line_ids"] = [(0, 0, debit_line), (0, 0, credit_line)]
         created_move = self.env["account.move"].create(base_move)
         if self.journal_id.company_id.auto_post_entries:
@@ -196,6 +208,7 @@ def _write_adjust_balance(
                     partner_id,
                     currency.id,
                     analytic_credit_acc_id=(company.revaluation_analytic_account_id.id),
+                    debit=True,
                 )
                 created_ids.extend(line_ids)
 
@@ -215,6 +228,7 @@ def _write_adjust_balance(
                     analytic_credit_acc_id=(
                         company.provision_pl_analytic_account_id.id
                     ),
+                    debit=True,
                 )
                 created_ids.extend(line_ids)
         elif amount_vs_zero == -1:

From 883628ecf6a7310faa9285fc0af4804c8d82d16e Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Thu, 24 Nov 2022 17:08:51 +0100
Subject: [PATCH 20/24] [FIX]account_multicurrency_revaluation: Use all open
 items Before, the lines were overwriten, so if there were multiple lines for
 the same account, partner and currency, the last open item was the only one
 used. Now the amounts are acumulated into one line.

---
 .../model/account.py                          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 6cb787aed92..32cfa87a035 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -192,9 +192,27 @@ def compute_revaluations(self, revaluation_date, start_date=None):
             data.setdefault(account_id, {})
             data[account_id].setdefault(partner_id, {})
             data[account_id][partner_id].setdefault(currency_id, {})
-            data[account_id][partner_id][currency_id] = line
+            existing_line = data[account_id][partner_id][currency_id]
+            if existing_line:
+                data[account_id][partner_id][
+                    currency_id
+                ] = self._merge_currency_revaluation_lines(existing_line, line)
+            else:
+                # Convert origin account move lines to list as there can be multiple
+                line["origin_aml_id"] = [line["origin_aml_id"]]
+                data[account_id][partner_id][currency_id] = line
         return data
 
+    @api.model
+    def _merge_currency_revaluation_lines(self, first_line, second_line):
+        resulting_line = first_line
+        resulting_line["origin_aml_id"].append(second_line["origin_aml_id"])
+        resulting_line["balance"] += second_line["balance"]
+        resulting_line["debit"] += second_line["debit"]
+        resulting_line["credit"] += second_line["credit"]
+        resulting_line["foreign_balance"] += second_line["foreign_balance"]
+        return resulting_line
+
 
 class AccountMove(models.Model):
     _inherit = "account.move"

From 23cdfba9c8c8153394d50d09e97ba3a57c8e4f92 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Thu, 24 Nov 2022 17:10:34 +0100
Subject: [PATCH 21/24] [IMP]account_multicurrency_revaluation Two-sided
 relation between lines created and original ones

---
 .../model/account.py                          | 66 +++++++++++++++++--
 .../views/account_move_line_views.xml         | 38 ++++++++---
 .../wizard/wizard_currency_revaluation.py     |  6 +-
 3 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 32cfa87a035..8196c8e908a 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -15,6 +15,66 @@ class AccountAccountLine(models.Model):
     gl_revaluated_balance = fields.Float(string="Revaluated Amount")
     gl_currency_rate = fields.Float(string="Currency rate")
 
+    revaluation_created_line_id = fields.Many2one(
+        comodel_name="account.move.line",
+        string="Revaluation Created Line",
+        readonly=True,
+    )
+
+    revaluation_origin_line_ids = fields.One2many(
+        comodel_name="account.move.line",
+        inverse_name="revaluation_created_line_id",
+        string="Revaluation Origin Lines",
+        readonly=True,
+    )
+    revaluation_origin_line_count = fields.Integer(
+        compute="_compute_revaluation_origin_line_count"
+    )
+
+    def _compute_revaluation_origin_line_count(self):
+        for line in self:
+            line.revaluation_origin_line_count = len(line.revaluation_origin_line_ids)
+
+    def action_view_revaluation_origin_lines(self):
+        self.ensure_one()
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "account.action_account_moves_all"
+        )
+        action["context"] = {}
+        if len(self.revaluation_origin_line_ids) > 1:
+            action["domain"] = [("id", "in", self.revaluation_origin_line_ids.ids)]
+        elif self.revaluation_origin_line_ids:
+            form_view = [(self.env.ref("account.view_move_line_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
+            else:
+                action["views"] = form_view
+            action["res_id"] = self.revaluation_origin_line_ids.id
+        else:
+            action = {"type": "ir.actions.act_window_close"}
+        return action
+
+    def action_view_revaluation_created_line(self):
+        self.ensure_one()
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "account.action_account_moves_all"
+        )
+        action["context"] = {}
+        if self.revaluation_created_line_id:
+            form_view = [(self.env.ref("account.view_move_line_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
+            else:
+                action["views"] = form_view
+            action["res_id"] = self.revaluation_created_line_id.id
+        else:
+            action = {"type": "ir.actions.act_window_close"}
+        return action
+
 
 class AccountAccount(models.Model):
     _inherit = "account.account"
@@ -224,9 +284,3 @@ class AccountMove(models.Model):
     revaluation_reversed = fields.Boolean(
         string="Revaluation reversed", default=False, readonly=True
     )
-
-
-class AccountMoveLine(models.Model):
-    _inherit = "account.move.line"
-
-    revaluation_origin_line_id = fields.Many2one(comodel_name="account.move.line")
diff --git a/account_multicurrency_revaluation/views/account_move_line_views.xml b/account_multicurrency_revaluation/views/account_move_line_views.xml
index 1ba5111a38c..fe6d9b4cf21 100644
--- a/account_multicurrency_revaluation/views/account_move_line_views.xml
+++ b/account_multicurrency_revaluation/views/account_move_line_views.xml
@@ -11,15 +11,33 @@
             eval="[(6,0,[ref('account_multicurrency_revaluation.group_revaluation_additional')])]"
         />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='analytic_account_id']/.." position="after">
-                <group
-                    string="Currency Revaluation"
-                    name="currency_revaluation"
-                    attrs="{'invisible': [('revaluation_origin_line_id', '=', False)]}"
-                >
-                    <field name="revaluation_origin_line_id" />
-                </group>
-            </xpath>
+            <field name="company_id" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <field name="revaluation_origin_line_ids" invisible="True" />
+                    <field name="revaluation_created_line_id" invisible="True" />
+                    <button
+                        name="action_view_revaluation_origin_lines"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-list"
+                        attrs="{'invisible': [('revaluation_origin_line_count', '=', 0)]}"
+                    >
+                        <field
+                            name="revaluation_origin_line_count"
+                            widget="statinfo"
+                            string="Revaluation Origin Lines"
+                        />
+                    </button>
+                    <button
+                        name="action_view_revaluation_created_line"
+                        string="Revaluation Created Line"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-external-link"
+                        attrs="{'invisible': [('revaluation_created_line_id', '=', False)]}"
+                    />
+                </div>
+            </field>
         </field>
     </record>
     <record id="view_account_move_line_filter" model="ir.ui.view">
@@ -38,7 +56,7 @@
                 <filter
                     name="origin_revaluation"
                     string="Currency Revaluation Items"
-                    domain="[('revaluation_origin_line_id', '!=', False)]"
+                    domain="[('revaluation_origin_line_ids', '!=', False)]"
                 />
             </filter>
         </field>
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index f257bbd431e..43227a5b29e 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -109,18 +109,18 @@ def _create_move_and_lines(
         base_line["gl_balance"] = sums.get("balance", 0.0)
         base_line["gl_revaluated_balance"] = sums.get("revaluated_balance", 0.0)
         base_line["gl_currency_rate"] = sums.get("currency_rate", 0.0)
-        revaluation_origin_line_id = sums.get("origin_aml_id", False)
+        revaluation_origin_line_ids = sums.get("origin_aml_id", False)
 
         debit_line = base_line.copy()
         credit_line = base_line.copy()
 
         if debit:
             debit_line.update(
-                {"revaluation_origin_line_id": revaluation_origin_line_id}
+                {"revaluation_origin_line_ids": [(6, 0, revaluation_origin_line_ids)]}
             )
         else:
             credit_line.update(
-                {"revaluation_origin_line_id": revaluation_origin_line_id}
+                {"revaluation_origin_line_ids": [(6, 0, revaluation_origin_line_ids)]}
             )
 
         debit_line.update(

From b2bd8748ceda7890f1ba11f2a9ef61452269d966 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Fri, 2 Dec 2022 17:07:09 +0100
Subject: [PATCH 22/24] [IMP]account_multicurrency_revaluation: Adjust values
 if partial reconciled items If the origin line that will be revaluated has
 partially reconciled items, adjust the values to the real ones.

---
 .../model/account.py                          | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/account_multicurrency_revaluation/model/account.py b/account_multicurrency_revaluation/model/account.py
index 8196c8e908a..67e097be46d 100644
--- a/account_multicurrency_revaluation/model/account.py
+++ b/account_multicurrency_revaluation/model/account.py
@@ -244,14 +244,37 @@ def compute_revaluations(self, revaluation_date, start_date=None):
 
         data = {}
         for line in lines:
-            account_id, currency_id, partner_id = (
+            account_id, currency_id, partner_id, origin_aml_id = (
                 line["id"],
                 line["currency_id"],
                 line["partner_id"],
+                line["origin_aml_id"],
             )
             data.setdefault(account_id, {})
             data[account_id].setdefault(partner_id, {})
             data[account_id][partner_id].setdefault(currency_id, {})
+            # If partially reconciled, we need to adjust the balance according to
+            # the partially reconciled items on the current line.
+            origin_aml = self.env["account.move.line"].browse(origin_aml_id)
+            if origin_aml.matched_debit_ids | origin_aml.matched_credit_ids:
+                debit_move_ids = origin_aml.matched_debit_ids.mapped("debit_move_id")
+                credit_move_ids = origin_aml.matched_credit_ids.mapped("credit_move_id")
+                total_debit = line["debit"] + sum(debit_move_ids.mapped("debit"))
+                total_credit = line["credit"] + sum(credit_move_ids.mapped("credit"))
+                total_balance = total_debit - total_credit
+                total_balance_currency = (
+                    line["foreign_balance"]
+                    + sum(debit_move_ids.mapped("amount_currency"))
+                    + sum(credit_move_ids.mapped("amount_currency"))
+                )
+                line.update(
+                    {
+                        "debit": round(total_debit, 2),
+                        "credit": round(total_credit, 2),
+                        "balance": round(total_balance, 2),
+                        "foreign_balance": round(total_balance_currency, 2),
+                    }
+                )
             existing_line = data[account_id][partner_id][currency_id]
             if existing_line:
                 data[account_id][partner_id][

From 9882a5c90e71d503345622529430db6201eec22a Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Mon, 19 Dec 2022 16:58:29 +0100
Subject: [PATCH 23/24] [IMP]account_multicurrency_revaluation: add style to
 div

---
 account_multicurrency_revaluation/model/res_config.py     | 3 ++-
 .../wizard/wizard_currency_revaluation_view.xml           | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/account_multicurrency_revaluation/model/res_config.py b/account_multicurrency_revaluation/model/res_config.py
index 1a2bf7072b5..d8566b6f514 100644
--- a/account_multicurrency_revaluation/model/res_config.py
+++ b/account_multicurrency_revaluation/model/res_config.py
@@ -55,5 +55,6 @@ class AccountConfigSettings(models.TransientModel):
         readonly=False,
     )
     auto_post_entries = fields.Boolean(
-        related="company_id.auto_post_entries", readonly=False,
+        related="company_id.auto_post_entries",
+        readonly=False,
     )
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
index e5356709f65..74773e78639 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation_view.xml
@@ -6,12 +6,16 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Currency Revaluation" version="7.0">
-                <div class="alert alert-primary" role="alert">
+                <div
+                    class="alert alert-primary"
+                    role="alert"
+                    name="info"
+                    style="font-weight: bold;"
+                >
                 Odoo will generate exchange rate difference entries for each account set as 'Allow Currency revaluation'.
                 If the account type is payable or receivable : 1 entry will be generated per account/currency/partner.
                 For other account types : 1 entry will be generated per account/currency.
                 </div>
-
                 <group>
                     <group>
                         <field name="start_date" />

From f897df4b81939b3ac7ec9c334b2509975859ad92 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 14 Mar 2023 11:55:41 +0100
Subject: [PATCH 24/24] [FIX]account_multicurrency_revaluation: Fix tests

---
 .../tests/test_currency_revaluation.py        | 46 ++++++++-----------
 .../wizard/wizard_currency_revaluation.py     |  1 +
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/account_multicurrency_revaluation/tests/test_currency_revaluation.py b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
index 694398e1d3f..4db01d455c9 100644
--- a/account_multicurrency_revaluation/tests/test_currency_revaluation.py
+++ b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
@@ -128,21 +128,21 @@ def test_revaluation(self):
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
-        self.assertEqual(sum(reval_move_lines.mapped("debit")), 200.00)
-        self.assertEqual(sum(reval_move_lines.mapped("credit")), 40.00)
+        self.assertEqual(sum(reval_move_lines.mapped("debit")), 295.00)
+        self.assertEqual(sum(reval_move_lines.mapped("credit")), 0.00)
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         wizard = self.env["unrealized.report.printer"]
         wiz = wizard.create({})
         result = wiz.print_report()
-        account_ids = result.get("context").get("active_ids")
+        account_ids = result.get("data").get("account_ids")
         report = (
             self.env["account.move.line"]
             .search([("account_id", "in", account_ids)])
             .filtered(lambda l: l.account_id.code == "accrec")
         )
-        self.assertEqual(sum(report.mapped("debit")), 200)
-        self.assertEqual(sum(report.mapped("credit")), 40)
+        self.assertEqual(sum(report.mapped("debit")), 295)
+        self.assertEqual(sum(report.mapped("credit")), 0)
         self.assertEqual(sum(report.mapped("amount_currency")), 200)
 
     def test_revaluation_loss(self):
@@ -200,20 +200,20 @@ def test_revaluation_loss(self):
             [("account_id", "=", self.receivable_acc.id)]
         )
         self.assertEqual(sum(reval_move_lines.mapped("debit")), 180.00)
-        self.assertEqual(sum(reval_move_lines.mapped("credit")), 130.00)
+        self.assertEqual(sum(reval_move_lines.mapped("credit")), 230.00)
         self.assertEqual(sum(reval_move_lines.mapped("amount_currency")), 200.00)
 
         wizard = self.env["unrealized.report.printer"]
         wiz = wizard.create({})
         result = wiz.print_report()
-        account_ids = result.get("context").get("active_ids")
+        account_ids = result.get("data").get("account_ids")
         report = (
             self.env["account.move.line"]
             .search([("account_id", "in", account_ids)])
             .filtered(lambda l: l.account_id.code == "accrec")
         )
         self.assertEqual(sum(report.mapped("debit")), 180)
-        self.assertEqual(sum(report.mapped("credit")), 130)
+        self.assertEqual(sum(report.mapped("credit")), 230)
         self.assertEqual(sum(report.mapped("amount_currency")), 200)
 
     def test_revaluation_payment(self):
@@ -301,18 +301,10 @@ def test_revaluation_payment(self):
         reval_move_lines = self.env["account.move.line"].search(
             [("account_id", "=", self.receivable_acc.id)]
         )
-        self.assertAlmostEqual(sum(reval_move_lines.mapped("debit")), 7466.67)
-        self.assertAlmostEqual(sum(reval_move_lines.mapped("credit")), 6666.67)
+        self.assertAlmostEqual(sum(reval_move_lines.mapped("debit")), 6666.67)
+        self.assertAlmostEqual(sum(reval_move_lines.mapped("credit")), 8533.34)
         self.assertAlmostEqual(sum(reval_move_lines.mapped("amount_currency")), 1000.00)
 
-        receivable_lines = len(reval_move_lines)
-        with self.assertRaises(exceptions.UserError):
-            self.wizard_execute(self.today - timedelta(days=70))
-        reval_move_lines = self.env["account.move.line"].search(
-            [("account_id", "=", self.receivable_acc.id)]
-        )
-        self.assertEqual(len(reval_move_lines), receivable_lines)
-
     def test_revaluation_bank_account(self):
         self.delete_journal_data()
         usd_currency = self.env.ref("base.USD")
@@ -455,13 +447,13 @@ def test_revaluation_bank_account(self):
         )
         revaluation_line = new_bank_account_lines - bank_account_lines
         self.assertEqual(len(revaluation_line), 1)
-        self.assertEqual(revaluation_line.debit, 0.0)
-        self.assertEqual(revaluation_line.credit, 48.33)
+        self.assertEqual(revaluation_line.debit, 5.0)
+        self.assertEqual(revaluation_line.credit, 0.0)
         self.assertEqual(revaluation_line.amount_currency, 0.0)
 
         bank_account_lines |= revaluation_line
-        self.assertEqual(sum(bank_account_lines.mapped("debit")), 173.33)
-        self.assertEqual(sum(bank_account_lines.mapped("credit")), 73.33)
+        self.assertEqual(sum(bank_account_lines.mapped("debit")), 178.33)
+        self.assertEqual(sum(bank_account_lines.mapped("credit")), 25.0)
         self.assertEqual(sum(bank_account_lines.mapped("amount_currency")), 125.0)
 
     def test_revaluation_bank_account_same_currency(self):
@@ -775,9 +767,9 @@ def test_revaluation_reverse(self):
             [("account_id", "=", bank_account.id)]
         )
         revaluation_lines = new_bank_account_lines - bank_account_lines
-        self.assertEqual(len(revaluation_lines), 2)
-        self.assertEqual(sum(revaluation_lines.mapped("debit")), 48.33)
-        self.assertEqual(sum(revaluation_lines.mapped("credit")), 48.33)
+        self.assertEqual(len(revaluation_lines), 1)
+        self.assertEqual(sum(revaluation_lines.mapped("debit")), 5.0)
+        self.assertEqual(sum(revaluation_lines.mapped("credit")), 0.0)
         self.assertEqual(sum(revaluation_lines.mapped("amount_currency")), 0.0)
 
     def create_rates(self, rates_by_date, currency, purge=False):
@@ -843,7 +835,9 @@ def wizard_execute(self, date):
                 "start_date": False,
                 "journal_id": self.reval_journal.id,
                 "label": "[%(account)s] [%(currency)s] wiz_test",
-                "revaluation_account_ids": [self.receivable_acc.id],
+                "revaluation_account_ids": self.env["wizard.currency.revaluation"]
+                ._get_default_revaluation_account_ids()
+                .ids,
             }
         )
         return wiz.revaluate_currency()
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
index 43227a5b29e..b9cb7da9bcb 100644
--- a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
+++ b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -101,6 +101,7 @@ def _create_move_and_lines(
         base_line = {
             "name": label,
             "partner_id": partner_id,
+            "currency_id": currency_id,
             "amount_currency": 0.0,
             "date": form.revaluation_date,
         }