diff --git a/purchase_manual_currency/README.rst b/purchase_manual_currency/README.rst
index d975270ef47..98c2936c205 100644
--- a/purchase_manual_currency/README.rst
+++ b/purchase_manual_currency/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ==========================
 Purchase - Manual Currency
 ==========================
@@ -17,7 +13,7 @@ Purchase - Manual Currency
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github
diff --git a/purchase_manual_currency/__manifest__.py b/purchase_manual_currency/__manifest__.py
index 0553bc09dd8..f989a529ebe 100644
--- a/purchase_manual_currency/__manifest__.py
+++ b/purchase_manual_currency/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Purchase - Manual Currency",
-    "version": "18.0.1.0.0",
+    "version": "18.0.2.0.0",
     "category": "Purchase Management",
     "summary": "Allows to manual currency of Purchase",
     "author": "Ecosoft, Odoo Community Association (OCA)",
diff --git a/purchase_manual_currency/migrations/18.0.2.0.0/post-migration.py b/purchase_manual_currency/migrations/18.0.2.0.0/post-migration.py
new file mode 100644
index 00000000000..707a0b9e45a
--- /dev/null
+++ b/purchase_manual_currency/migrations/18.0.2.0.0/post-migration.py
@@ -0,0 +1,11 @@
+# Copyright 2026 Ecosoft Co., Ltd (https://ecosoft.co.th/)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # Recompute
+    orders = env["purchase.order"].search([("manual_currency", "=", True)])
+    orders._amount_all()
diff --git a/purchase_manual_currency/migrations/18.0.2.0.0/pre-migration.py b/purchase_manual_currency/migrations/18.0.2.0.0/pre-migration.py
new file mode 100644
index 00000000000..d2c6d1078df
--- /dev/null
+++ b/purchase_manual_currency/migrations/18.0.2.0.0/pre-migration.py
@@ -0,0 +1,16 @@
+# Copyright 2026 Ecosoft Co., Ltd (https://ecosoft.co.th/)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.logged_query(
+        env.cr,
+        """
+        UPDATE purchase_order
+        SET currency_rate = manual_currency_rate
+        WHERE manual_currency = TRUE
+        """,
+    )
diff --git a/purchase_manual_currency/models/purchase.py b/purchase_manual_currency/models/purchase.py
index 8e179fe6be7..513d55284f5 100644
--- a/purchase_manual_currency/models/purchase.py
+++ b/purchase_manual_currency/models/purchase.py
@@ -1,9 +1,7 @@
 # Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from lxml import etree
-
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
 
@@ -11,64 +9,21 @@ class PurchaseOrder(models.Model):
     _inherit = "purchase.order"
 
     manual_currency = fields.Boolean()
-    is_manual = fields.Boolean(compute="_compute_currency")
     type_currency = fields.Selection(
         selection=lambda self: self._get_label_currency_name(),
         default=lambda self: self._get_label_currency_name()[0][0],
     )
-    manual_currency_rate = fields.Float(
-        digits="Manual Currency",
-        tracking=True,
-        help="Set new currency rate to apply on the invoice\n."
-        "This rate will be taken in order to convert amounts between the "
-        "currency on the purchase order and last currency",
-    )
     company_currency_id = fields.Many2one(
         comodel_name="res.currency",
         related="company_id.currency_id",
         string="Company Currency",
     )
-    total_company_currency = fields.Monetary(
-        compute="_compute_total_company_currency",
-        store=True,
-        currency_field="company_currency_id",
-    )
-    currency_diff = fields.Boolean(
-        compute="_compute_currency_diff",
-        store=True,
-    )
-
-    @api.depends("currency_id")
-    def _compute_currency_diff(self):
-        for rec in self:
-            rec.currency_diff = rec.company_currency_id != rec.currency_id
-
-    @api.depends("order_line.subtotal_company_currency")
-    def _compute_total_company_currency(self):
-        """Convert total currency to company currency"""
-        for rec in self:
-            # check manual currency
-            if rec.manual_currency:
-                rate = (
-                    rec.manual_currency_rate
-                    if rec.type_currency == "inverse_company_rate"
-                    else (1.0 / rec.manual_currency_rate)
-                )
-                rec.total_company_currency = rec.amount_total * rate
-            # default rate currency
-            else:
-                rec.total_company_currency = rec.currency_id._convert(
-                    rec.amount_total,
-                    rec.company_currency_id,
-                    rec.company_id,
-                    fields.Date.today(),
-                )
 
     def _get_label_currency_name(self):
         """Get label related currency"""
         names = {
             "company_currency_name": (
-                self.env["res.company"].browse(self._context.get("company_id"))
+                self.env["res.company"].browse(self.env.context.get("company_id"))
                 or self.env.company
             ).currency_id.name,
             "rate_currency_name": "Currency",
@@ -76,60 +31,42 @@ def _get_label_currency_name(self):
         return [
             [
                 "company_rate",
-                _("%(rate_currency_name)s per 1 %(company_currency_name)s", **names),
+                self.env._(
+                    "%(rate_currency_name)s per 1 %(company_currency_name)s", **names
+                ),
             ],
             [
                 "inverse_company_rate",
-                _("%(company_currency_name)s per 1 %(rate_currency_name)s", **names),
+                self.env._(
+                    "%(company_currency_name)s per 1 %(rate_currency_name)s", **names
+                ),
             ],
         ]
 
-    @api.onchange("manual_currency", "type_currency", "currency_id", "date_order")
-    def _onchange_currency_change_rate(self):
-        today = fields.Date.today()
-        company_currency = self.env.company.currency_id
-        amount_currency = company_currency._get_conversion_rate(
-            company_currency,
-            self.currency_id,
-            self.company_id,
-            self.date_order or today,
-        )
-        if self.type_currency == "inverse_company_rate":
-            amount_currency = 1.0 / amount_currency
-        self.manual_currency_rate = amount_currency
+    @api.depends(
+        "order_line.price_subtotal", "company_id", "currency_id", "currency_rate"
+    )
+    def _amount_all(self):
+        """Add currency_rate dependency to trigger recompute"""
+        return super()._amount_all()
 
-    @api.depends("currency_id")
-    def _compute_currency(self):
-        for rec in self:
-            rec.is_manual = rec.currency_id != rec.company_id.currency_id
+    @api.depends(
+        "currency_id", "date_order", "company_id", "manual_currency", "type_currency"
+    )
+    def _compute_currency_rate(self):
+        res = super()._compute_currency_rate()
+        for order in self:
+            if order.manual_currency and order.type_currency == "inverse_company_rate":
+                order.currency_rate = 1.0 / order.currency_rate
+        return res
 
     def action_refresh_currency(self):
         self.ensure_one()
         if self.state != "draft":
-            raise ValidationError(_("Rate currency can refresh state draft only."))
-        self._onchange_currency_change_rate()
-        return True
-
-    @api.model
-    def get_view(self, view_id=None, view_type="form", **options):
-        """Change string name to company currency"""
-        result = super().get_view(view_id=view_id, view_type=view_type, **options)
-        if view_type == "form":
-            company_currency_name = (
-                self.env["res.company"].browse(self._context.get("company_id"))
-                or self.env.company
-            ).currency_id.name
-            doc = etree.XML(result["arch"])
-            # Total company currency
-            node = doc.xpath("//field[@name='total_company_currency']")
-            if node:
-                node[0].set("string", f"Total ({company_currency_name})")
-            # Subtotal company currency
-            node = doc.xpath("//field[@name='subtotal_company_currency']")
-            if node:
-                node[0].set("string", f"Subtotal ({company_currency_name})")
-            result["arch"] = etree.tostring(doc, encoding="unicode")
-        return result
+            raise ValidationError(
+                self.env._("Rate currency can refresh state draft only.")
+            )
+        return self._compute_currency_rate()
 
     def action_view_invoice(self, invoices=False):
         result = super().action_view_invoice(invoices)
@@ -141,11 +78,13 @@ def action_view_invoice(self, invoices=False):
             purchases = inv.invoice_line_ids.mapped("purchase_order_id")
             if len(set(purchases.mapped("manual_currency"))) != 1:
                 raise UserError(
-                    _("In invoice cannot have a mixture of different manual currency.")
+                    self.env._(
+                        "In invoice cannot have a mixture of different manual currency."
+                    )
                 )
-            elif len(set(purchases.mapped("manual_currency_rate"))) != 1:
+            elif len(set(purchases.mapped("currency_rate"))) != 1:
                 raise UserError(
-                    _(
+                    self.env._(
                         "In invoice cannot have a mixture of different "
                         "manual currency rates in purchases."
                     )
@@ -159,7 +98,7 @@ def action_view_invoice(self, invoices=False):
                     {
                         "manual_currency": purchases[0].manual_currency,
                         "type_currency": purchases[0].type_currency,
-                        "manual_currency_rate": purchases[0].manual_currency_rate,
+                        "manual_currency_rate": purchases[0].currency_rate,
                     }
                 )
         return result
diff --git a/purchase_manual_currency/models/purchase_order_line.py b/purchase_manual_currency/models/purchase_order_line.py
index 256b476d6e5..5bac4556039 100644
--- a/purchase_manual_currency/models/purchase_order_line.py
+++ b/purchase_manual_currency/models/purchase_order_line.py
@@ -10,6 +10,7 @@ class PurchaseOrderLine(models.Model):
     company_currency_id = fields.Many2one(
         comodel_name="res.currency",
         related="order_id.company_currency_id",
+        store=True,
         string="Company Currency",
     )
     subtotal_company_currency = fields.Monetary(
@@ -21,28 +22,37 @@ class PurchaseOrderLine(models.Model):
 
     @api.depends(
         "price_subtotal",
-        "order_id.manual_currency_rate",
+        "order_id.currency_rate",
         "order_id.type_currency",
         "order_id.manual_currency",
     )
     def _compute_amount_company_currency(self):
-        for rec in self:
-            rec.subtotal_company_currency = rec.price_subtotal
-            # check multi-currency
-            if rec.company_currency_id != rec.currency_id:
-                # check manual currency
-                if rec.order_id.manual_currency:
-                    rate = (
-                        rec.order_id.manual_currency_rate
-                        if rec.order_id.type_currency == "inverse_company_rate"
-                        else (1.0 / rec.order_id.manual_currency_rate)
-                    )
-                    rec.subtotal_company_currency = rec.price_subtotal * rate
-                # default rate currency
-                else:
-                    rec.subtotal_company_currency = rec.currency_id._convert(
-                        rec.price_subtotal,
-                        rec.company_currency_id,
-                        rec.company_id,
-                        fields.Date.today(),
-                    )
+        for line in self:
+            line.subtotal_company_currency = line.price_subtotal
+            if line.company_currency_id != line.currency_id:
+                order = line.order_id
+                rate = (
+                    order.currency_rate
+                    if order.type_currency == "inverse_company_rate"
+                    else (1.0 / order.currency_rate)
+                )
+                line.subtotal_company_currency = line.price_subtotal * rate
+
+    def _prepare_base_line_for_taxes_computation(self):
+        self.ensure_one()
+        order = self.order_id
+        if order.manual_currency and order.type_currency == "inverse_company_rate":
+            # Convert Rate back to company_rate
+            rate = 1
+            if order.currency_rate:
+                rate = 1 / order.currency_rate
+            return self.env["account.tax"]._prepare_base_line_for_taxes_computation(
+                self,
+                tax_ids=self.taxes_id,
+                quantity=self.product_qty,
+                partner_id=self.order_id.partner_id,
+                currency_id=self.order_id.currency_id
+                or self.order_id.company_id.currency_id,
+                rate=rate,
+            )
+        return super()._prepare_base_line_for_taxes_computation()
diff --git a/purchase_manual_currency/static/description/index.html b/purchase_manual_currency/static/description/index.html
index 66dcdb1f219..b131da98e4d 100644
--- a/purchase_manual_currency/static/description/index.html
+++ b/purchase_manual_currency/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Purchase - Manual Currency</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="purchase-manual-currency">
+<h1 class="title">Purchase - Manual Currency</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="purchase-manual-currency">
-<h1>Purchase - Manual Currency</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:9923d9a009abd9bd6327ed125e7c569e16a3d9018dc02f92767694feb2603c31
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_manual_currency"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_manual_currency"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_manual_currency"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_manual_currency"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows users to update the currency manual of Purchase Order
 in draft state.</p>
 <p>Example, The company will make a deal with vendor before buy product
@@ -395,7 +390,7 @@ <h1>Purchase - Manual Currency</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>To use this module, the company have to access rights Multi Currencies.</p>
 <p>Step to used manual currency: #. Go to Invoicing &gt; Configuration &gt;
 Settings &gt; Currencies &gt; Multi-Currencies #. Go to Purchase &gt; Create new
@@ -403,7 +398,7 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 Manual Currency and specify your currency rate</p>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/purchase-workflow/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -411,15 +406,15 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <ul class="simple">
 <li>Ecosoft</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Saran Lim. &lt;<a class="reference external" href="mailto:saranl&#64;ecosoft.co.th">saranl&#64;ecosoft.co.th</a>&gt;</li>
 <li><a class="reference external" href="https://www.prothaitechnology.com:">Prothai</a>:<ul>
@@ -430,7 +425,7 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -443,6 +438,5 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/purchase_manual_currency/tests/test_purchase_manual_currency.py b/purchase_manual_currency/tests/test_purchase_manual_currency.py
index 1ff19b2678a..e3281003619 100644
--- a/purchase_manual_currency/tests/test_purchase_manual_currency.py
+++ b/purchase_manual_currency/tests/test_purchase_manual_currency.py
@@ -1,65 +1,186 @@
 # Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
+from odoo import Command
 from odoo.exceptions import ValidationError
 from odoo.tests import Form, TransactionCase
 
 
 class TestPurchaseManualCurrency(TransactionCase):
-    def setUp(self):
-        super().setUp()
-
-        self.currency_eur = self.env.ref("base.EUR")
-        self.currency_usd = self.env.ref("base.USD")
-        self.main_company = self.env.ref("base.main_company")
-        self.env.cr.execute(
-            """UPDATE res_company SET currency_id = %s
-            WHERE id = %s""",
-            (self.currency_eur.id, self.main_company.id),
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.main_currency = cls.env.ref("base.USD")
+        cls.eur = cls.env.ref("base.EUR")
+        cls.eur.write({"active": True})
+
+        cls.purchase_model = cls.env["purchase.order"]
+        cls.partner = cls.env.ref("base.res_partner_12")
+        cls.product = cls.env.ref("product.product_product_9")
+
+        # Fixed currency rate
+        cls.eur.rate_ids.unlink()
+        cls.env["res.currency.rate"].create(
+            {
+                "currency_id": cls.eur.id,
+                "rate": 5,
+                "create_date": "2010-01-01",
+                "write_date": "2010-01-01",
+            }
+        )
+
+    def test_01_purchase_main_currency(self):
+        """Case1: Use main currency"""
+
+        po = self.purchase_model.create(
+            {
+                "partner_id": self.partner.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "product_id": self.product.id,
+                            "product_qty": 1,
+                            "price_unit": 100,
+                        }
+                    )
+                ],
+            }
         )
-        self.purchase_order = self.env.ref("purchase.purchase_order_6").copy()
 
-    def test_01_purchase_manual_currency(self):
-        # Update purchase to company currency
-        self.purchase_order.currency_id = self.currency_eur
-        self.assertEqual(self.purchase_order.currency_id.name, "EUR")
+        self.assertEqual(po.currency_id.name, "USD")
         self.assertEqual(
-            self.purchase_order.order_line[0].price_subtotal,
-            self.purchase_order.order_line[0].subtotal_company_currency,
+            po.order_line.price_subtotal,
+            po.order_line.subtotal_company_currency,
         )
-        self.assertFalse(self.purchase_order.currency_diff)
+        self.assertEqual(po.currency_rate, 1)
+
+    def test_02_purchase_manual_currency_company_rate(self):
+        """Case2: Use manual currency with company rate"""
 
-        # Activate Multi Currency Group
-        multi_currency_group = self.env.ref("base.group_multi_currency")
-        self.env.user.groups_id |= multi_currency_group
+        po = self.purchase_model.create(
+            {
+                "partner_id": self.partner.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "product_id": self.product.id,
+                            "product_qty": 1,
+                            "price_unit": 100,
+                        }
+                    )
+                ],
+            }
+        )
 
-        # Change currency
-        self.assertEqual(self.purchase_order.manual_currency_rate, 0.0)
-        with Form(self.purchase_order) as p:
-            p.currency_id = self.currency_usd
+        self.assertEqual(po.currency_id.name, "USD")
+        with Form(po) as p:
+            p.currency_id = self.eur
             p.manual_currency = True
             p.type_currency = "company_rate"
-        # Manual currency rate will default following rate standard
-        self.assertNotEqual(self.purchase_order.manual_currency_rate, 0.0)
-        self.assertNotEqual(
-            self.purchase_order.order_line[0].price_subtotal,
-            self.purchase_order.order_line[0].subtotal_company_currency,
+        p.save()
+        self.assertEqual(po.currency_id.name, "EUR")
+        # Standard Currency
+        self.assertEqual(po.currency_rate, 5)
+        self.assertEqual(po.type_currency, "company_rate")
+
+        self.assertEqual(po.order_line.price_subtotal, 100)
+        self.assertEqual(po.order_line.subtotal_company_currency, 100 / 5)
+
+        # Rate for test is 5 EUR = 1 USD
+        # So, amount_total_cc = 100 / 5 = 20 USD
+        # amount_total = 100 EUR
+        self.assertEqual(po.amount_total_cc, 20.0)
+        self.assertEqual(po.amount_total, 100.0)
+
+        # Manual change currency rate to 2 EUR = 1 USD
+        with Form(po) as p:
+            p.currency_rate = 2
+        p.save()
+
+        self.assertEqual(po.currency_rate, 2)
+        self.assertEqual(po.type_currency, "company_rate")
+        # Rate for test is 2 EUR = 1 USD
+        # So, amount_total_cc = 100 / 2 = 50 USD
+        # amount_total = 100 EUR
+        self.assertEqual(
+            po.order_line.subtotal_company_currency, po.order_line.price_subtotal / 2
         )
-        company_rate = self.purchase_order.manual_currency_rate
-        # Check type curreny -> company currency (USD -> EUR)
-        with Form(self.purchase_order) as p:
+        self.assertEqual(po.amount_total_cc, 50.0)
+        self.assertEqual(po.amount_total, 100.0)
+
+        po.button_confirm()
+        self.assertEqual(po.state, "purchase")
+
+        with self.assertRaisesRegex(
+            ValidationError, "Rate currency can refresh state draft only."
+        ):
+            po.action_refresh_currency()
+        po.button_draft()
+        self.assertEqual(po.state, "draft")
+        po.action_refresh_currency()
+        self.assertEqual(po.currency_rate, 5)
+
+    def test_03_purchase_manual_currency_inverse_company_rate(self):
+        """Case2: Use manual currency with inverse_company rate"""
+
+        po = self.purchase_model.create(
+            {
+                "partner_id": self.partner.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "product_id": self.product.id,
+                            "product_qty": 1,
+                            "price_unit": 100,
+                        }
+                    )
+                ],
+            }
+        )
+
+        self.assertEqual(po.currency_id.name, "USD")
+        with Form(po) as p:
+            p.currency_id = self.eur
+            p.manual_currency = True
             p.type_currency = "inverse_company_rate"
+        p.save()
+        self.assertEqual(po.currency_id.name, "EUR")
+
+        # Inverse, Currency Rate is 1 EUR = 0.2 USD
+        self.assertEqual(po.currency_rate, 0.2)
+        self.assertEqual(po.type_currency, "inverse_company_rate")
+        # Rate for test is 1 EUR = 0.2 USD
+        # So, amount_total_cc = 100 * 0.2 = 20 USD
+        # amount_total = 100 EUR
+        self.assertEqual(po.order_line.price_subtotal, 100)
+        self.assertEqual(po.order_line.subtotal_company_currency, 100 * 0.2)
+        self.assertEqual(po.amount_total_cc, 20.0)
+        self.assertEqual(po.amount_total, 100.0)
+
+        # Manual change currency rate to 2 EUR = 1 USD
+        with Form(po) as p:
+            p.currency_rate = 2
+        p.save()
+
+        self.assertEqual(po.currency_rate, 2)
+        self.assertEqual(po.type_currency, "inverse_company_rate")
+        # Rate for test is 2 EUR = 1 USD
+        # So, amount_total_cc = 100 * 2 = 200 USD
+        # amount_total = 100 EUR
         self.assertEqual(
-            round(self.purchase_order.manual_currency_rate, 8),
-            round(1 / company_rate, 8),
+            po.order_line.subtotal_company_currency, po.order_line.price_subtotal * 2
         )
-        # Check function refresh
-        currency_rate = self.purchase_order.manual_currency_rate
-        self.purchase_order.manual_currency_rate += 5.0
-        self.assertNotEqual(self.purchase_order.manual_currency_rate, currency_rate)
-        self.purchase_order.action_refresh_currency()
-        self.assertAlmostEqual(self.purchase_order.manual_currency_rate, currency_rate)
-        self.purchase_order.button_confirm()
-        self.assertEqual(self.purchase_order.state, "purchase")
-        with self.assertRaises(ValidationError):
-            self.purchase_order.action_refresh_currency()
+        self.assertEqual(po.amount_total_cc, 200.0)
+        self.assertEqual(po.amount_total, 100.0)
+
+        po.button_confirm()
+        self.assertEqual(po.state, "purchase")
+
+        with self.assertRaisesRegex(
+            ValidationError, "Rate currency can refresh state draft only."
+        ):
+            po.action_refresh_currency()
+        po.button_draft()
+        self.assertEqual(po.state, "draft")
+        po.action_refresh_currency()
+        self.assertEqual(po.currency_rate, 0.2)
diff --git a/purchase_manual_currency/views/purchase_views.xml b/purchase_manual_currency/views/purchase_views.xml
index 3f3032361f5..5e40b628021 100644
--- a/purchase_manual_currency/views/purchase_views.xml
+++ b/purchase_manual_currency/views/purchase_views.xml
@@ -9,15 +9,19 @@
                 <label
                     for="manual_currency"
                     groups="base.group_multi_currency"
-                    invisible="not is_manual"
+                    invisible="currency_id == company_currency_id"
                 />
-                <div groups="base.group_multi_currency" invisible="not is_manual">
+                <div
+                    groups="base.group_multi_currency"
+                    invisible="currency_id == company_currency_id"
+                >
                     <field name="manual_currency" readonly="state != 'draft'" />
-                    <label for="manual_currency_rate" invisible='1' />
+                    <label for="currency_rate" invisible='1' />
                     <div class="o_row" invisible="not manual_currency">
                         <field
-                            name="manual_currency_rate"
+                            name="currency_rate"
                             readonly="state != 'draft'"
+                            digits="[12,12]"
                         />
                         <field
                             name="type_currency"
@@ -40,12 +44,13 @@
                 expr="//field[@name='order_line']//list/field[@name='price_subtotal']"
                 position="after"
             >
-                <field name="subtotal_company_currency" />
                 <field name="company_currency_id" column_invisible="1" />
-            </xpath>
-            <xpath expr="//field[@name='tax_totals']" position="before">
-                <field name="total_company_currency" invisible="not currency_diff" />
-                <field name="company_currency_id" invisible="1" />
+                <field
+                    name="subtotal_company_currency"
+                    column_invisible="parent.company_currency_id == parent.currency_id"
+                    optional="show"
+                    string="Amount (Company Currency)"
+                />
             </xpath>
         </field>
     </record>
diff --git a/purchase_stock_manual_currency/README.rst b/purchase_stock_manual_currency/README.rst
index fd0c2f057ad..0c28c3161ad 100644
--- a/purchase_stock_manual_currency/README.rst
+++ b/purchase_stock_manual_currency/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ==============================
 Purchase Stock Manual Currency
 ==============================
@@ -17,7 +13,7 @@ Purchase Stock Manual Currency
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github
diff --git a/purchase_stock_manual_currency/__manifest__.py b/purchase_stock_manual_currency/__manifest__.py
index c516b55015c..473a196d8a3 100644
--- a/purchase_stock_manual_currency/__manifest__.py
+++ b/purchase_stock_manual_currency/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Purchase Stock Manual Currency",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "category": "Purchase Management",
     "summary": "Extends manual currency from purchase to stock moves",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
diff --git a/purchase_stock_manual_currency/models/stock_move.py b/purchase_stock_manual_currency/models/stock_move.py
index ca000bdf50c..ba04df03dac 100644
--- a/purchase_stock_manual_currency/models/stock_move.py
+++ b/purchase_stock_manual_currency/models/stock_move.py
@@ -28,9 +28,9 @@ def _get_price_unit(self):
                 )
                 # Convert the price to the company currency, using the manual rate
                 rate = (
-                    p_order.manual_currency_rate
+                    p_order.currency_rate
                     if p_order.type_currency == "inverse_company_rate"
-                    else (1.0 / p_order.manual_currency_rate)
+                    else (1.0 / p_order.currency_rate)
                 )
                 converted_dict[lot] = price_po_curr * rate
             return converted_dict
diff --git a/purchase_stock_manual_currency/static/description/index.html b/purchase_stock_manual_currency/static/description/index.html
index 1271baf60c1..fa7d7b68f24 100644
--- a/purchase_stock_manual_currency/static/description/index.html
+++ b/purchase_stock_manual_currency/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Purchase Stock Manual Currency</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="purchase-stock-manual-currency">
+<h1 class="title">Purchase Stock Manual Currency</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="purchase-stock-manual-currency">
-<h1>Purchase Stock Manual Currency</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:bb2585fe3ad7862ccf15d892d07c6b6cceaab3cbcaefae0e739c3f32520bcb7b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_stock_manual_currency"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_stock_manual_currency"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_stock_manual_currency"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_stock_manual_currency"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module integrates purchase_manual_currency with purchase stock
 management, ensuring that manually set currency rates on purchase orders
 are applied to stock moves, stock valuation layers, and product costs.</p>
@@ -391,7 +386,7 @@ <h1>Purchase Stock Manual Currency</h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/purchase-workflow/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -399,21 +394,21 @@ <h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
 <ul class="simple">
 <li>ForgeFlow</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <ul class="simple">
 <li>Laura Cazorla &lt;<a class="reference external" href="mailto:laura.cazorla&#64;forgeflow.com">laura.cazorla&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -426,6 +421,5 @@ <h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/purchase_stock_manual_currency/tests/test_purchase_stock_manual_currency.py b/purchase_stock_manual_currency/tests/test_purchase_stock_manual_currency.py
index c4a19763f81..b085de8183b 100644
--- a/purchase_stock_manual_currency/tests/test_purchase_stock_manual_currency.py
+++ b/purchase_stock_manual_currency/tests/test_purchase_stock_manual_currency.py
@@ -115,10 +115,11 @@ def test_01_purchase_stock_manual_currency(self):
 
     def test_02_purchase_stock_manual_currency(self):
         self.p_order.manual_currency = True
-        self.p_order.manual_currency_rate = 2.0
         self.p_order.type_currency = "company_rate"
+        self.p_order.currency_rate = 2.0
         self.assertEqual(round(self.p_order.order_line.price_unit, 2), 8.0)
         self.assertEqual(round(self.p_order.order_line.price_subtotal, 2), 80.0)
+        self.assertEqual(self.p_order.currency_rate, 2.0)
         self.assertEqual(
             round(self.p_order.order_line.subtotal_company_currency, 2), 40.0
         )
@@ -150,7 +151,6 @@ def test_02_purchase_stock_manual_currency(self):
 
     def test_03_purchase_stock_manual_currency(self):
         self.p_order.currency_id = self.eur_currency
-        self.p_order._onchange_currency_change_rate()
         self.assertEqual(round(self.p_order.order_line.price_unit, 2), 8.0)
         self.assertEqual(round(self.p_order.order_line.price_subtotal, 2), 80.0)
         self.assertEqual(