diff --git a/stock_account_valuation_discrepancy_adjust/README.rst b/stock_account_valuation_discrepancy_adjust/README.rst
index 55dc1bfef..5e4d85b4f 100644
--- a/stock_account_valuation_discrepancy_adjust/README.rst
+++ b/stock_account_valuation_discrepancy_adjust/README.rst
@@ -7,7 +7,7 @@ Account Valuation Discrepancy Adjust
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ddb15357af94cb938fe1e041085a9d72012c59eb4463feadc92e6af028789b2b
+   !! source digest: sha256:dd2d6fb4bffb4420e86213ebd3c3d2887293fb56a54b1f64dc428cde4ba31092
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
@@ -32,7 +32,9 @@ Wizard to show discrepancies between stock and accounting valuation, and possibi
 
 You should use this module if you have products where the inventory valuation is automated (this means that your inventory is connected with accounting). The report allows you to identify the products where the inventory value has a discrepancy with the accounting value for that same product, and to make an adjustment entry in your accounting to align the two values.
 
-In order to use the module, go to Inventory / Reporting / Products with Account Discrepancy, select the date where you are looking to find the discrepancy and run "Show report". Once run, select the entries that you want to adjust and run the action to adjust.
+This module adds an action the report in *Inventory / Reporting / Dual Inventory Valuation*. The action is accesible for Account Managers.
+
+The action allows to create accounting entries by product in order to match the accounting value to the stock value.
 
 .. IMPORTANT::
    This is an alpha version, the data model and design can change at any time without warning.
@@ -66,6 +68,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Christopher Ormaza <chris.ormaza@forgeflow.com>
+* Aaron Henriquez <aaron.henriquez@forgeflow.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/stock_account_valuation_discrepancy_adjust/__init__.py b/stock_account_valuation_discrepancy_adjust/__init__.py
index 3e6a9f76d..283b87bc0 100644
--- a/stock_account_valuation_discrepancy_adjust/__init__.py
+++ b/stock_account_valuation_discrepancy_adjust/__init__.py
@@ -1,5 +1,4 @@
 # Copyright 2021 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from . import models
 from . import wizards
diff --git a/stock_account_valuation_discrepancy_adjust/__manifest__.py b/stock_account_valuation_discrepancy_adjust/__manifest__.py
index 235f6da5e..20d04300a 100644
--- a/stock_account_valuation_discrepancy_adjust/__manifest__.py
+++ b/stock_account_valuation_discrepancy_adjust/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Account Valuation Discrepancy Adjust",
-    "version": "12.0.1.0.0",
+    "version": "16.0.1.0.0",
     "summary": "Implements Wizard for Adjust "
     "Discrepancies on Account Inventory Valuation",
     "category": "Warehouse Management",
@@ -13,9 +13,7 @@
     "depends": ["stock_account_valuation_report"],
     "data": [
         "security/ir.model.access.csv",
-        "wizards/wizard_stock_discrepancy_report_view.xml",
         "wizards/wizard_stock_discrepancy_adjustment_view.xml",
-        "views/product_discrepancy_view.xml",
     ],
     "demo": [],
     "installable": True,
diff --git a/stock_account_valuation_discrepancy_adjust/models/__init__.py b/stock_account_valuation_discrepancy_adjust/models/__init__.py
deleted file mode 100644
index 7eeb9d750..000000000
--- a/stock_account_valuation_discrepancy_adjust/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2021 ForgeFlow S.L.
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
-from . import product_discrepancy
diff --git a/stock_account_valuation_discrepancy_adjust/models/product_discrepancy.py b/stock_account_valuation_discrepancy_adjust/models/product_discrepancy.py
deleted file mode 100644
index dddbca4fc..000000000
--- a/stock_account_valuation_discrepancy_adjust/models/product_discrepancy.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 ForgeFlow S.L.
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-from odoo import fields, models
-
-
-class ProductDiscrepancy(models.TransientModel):
-
-    _name = "product.discrepancy"
-    _description = "Product Discrepancies"
-
-    product_id = fields.Many2one(
-        comodel_name="product.product",
-        string="Product",
-        required=True,
-        readonly=True,
-    )
-    categ_id = fields.Many2one(
-        comodel_name="product.category",
-        string="Category",
-        required=True,
-        readonly=True,
-    )
-    stock_value = fields.Float(string="Inventory Value", readonly=True)
-    account_value = fields.Float(string="Accounting Value", readonly=True)
-    qty_at_date = fields.Float(string="Inventory Quantity", readonly=True)
-    account_qty_at_date = fields.Float(string="Accounting Quantity", readonly=True)
-    valuation_discrepancy = fields.Float(string="Valuation discrepancy", readonly=True)
-    qty_discrepancy = fields.Float(string="Quantity discrepancy", readonly=True)
-
-    to_date_valuation = fields.Datetime(string="To Date Valuation", readonly=True)
diff --git a/stock_account_valuation_discrepancy_adjust/readme/CONTRIBUTORS.rst b/stock_account_valuation_discrepancy_adjust/readme/CONTRIBUTORS.rst
index b647a292e..dabecf981 100644
--- a/stock_account_valuation_discrepancy_adjust/readme/CONTRIBUTORS.rst
+++ b/stock_account_valuation_discrepancy_adjust/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Christopher Ormaza <chris.ormaza@forgeflow.com>
+* Aaron Henriquez <aaron.henriquez@forgeflow.com>
diff --git a/stock_account_valuation_discrepancy_adjust/readme/DESCRIPTION.rst b/stock_account_valuation_discrepancy_adjust/readme/DESCRIPTION.rst
index d4245f685..4849ddc6c 100644
--- a/stock_account_valuation_discrepancy_adjust/readme/DESCRIPTION.rst
+++ b/stock_account_valuation_discrepancy_adjust/readme/DESCRIPTION.rst
@@ -2,4 +2,6 @@ Wizard to show discrepancies between stock and accounting valuation, and possibi
 
 You should use this module if you have products where the inventory valuation is automated (this means that your inventory is connected with accounting). The report allows you to identify the products where the inventory value has a discrepancy with the accounting value for that same product, and to make an adjustment entry in your accounting to align the two values.
 
-In order to use the module, go to Inventory / Reporting / Products with Account Discrepancy, select the date where you are looking to find the discrepancy and run "Show report". Once run, select the entries that you want to adjust and run the action to adjust.
+This module adds an action the report in *Inventory / Reporting / Dual Inventory Valuation*. The action is accesible for Account Managers.
+
+The action allows to create accounting entries by product in order to match the accounting value to the stock value.
diff --git a/stock_account_valuation_discrepancy_adjust/security/ir.model.access.csv b/stock_account_valuation_discrepancy_adjust/security/ir.model.access.csv
index de2c88c7b..178682de7 100644
--- a/stock_account_valuation_discrepancy_adjust/security/ir.model.access.csv
+++ b/stock_account_valuation_discrepancy_adjust/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_product_discrepancy,access_product_discrepancy,model_product_discrepancy,,1,1,1,0
-access_wizard_stock_discrepancy_adjustment,access_wizard_stock_discrepancy_adjustment,model_wizard_stock_discrepancy_adjustment,,1,1,1,1
-access_wizard_stock_discrepancy_report,access_wizard_stock_discrepancy_report,model_wizard_stock_discrepancy_adjustment,,1,1,1,1
+access_wizard_stock_discrepancy_adjustment,access_wizard_stock_discrepancy_adjustment,model_wizard_stock_discrepancy_adjustment,account.group_account_manager,1,1,1,1
+access_wizard_stock_discrepancy_adjustment_line,access_wizard_stock_discrepancy_adjustment_line,model_wizard_stock_discrepancy_adjustment_line,account.group_account_manager,1,1,1,1
diff --git a/stock_account_valuation_discrepancy_adjust/static/description/index.html b/stock_account_valuation_discrepancy_adjust/static/description/index.html
index 4397f7100..676580b15 100644
--- a/stock_account_valuation_discrepancy_adjust/static/description/index.html
+++ b/stock_account_valuation_discrepancy_adjust/static/description/index.html
@@ -1,20 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Account Valuation Discrepancy Adjust</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
-See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,12 +367,13 @@ <h1 class="title">Account Valuation Discrepancy Adjust</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ddb15357af94cb938fe1e041085a9d72012c59eb4463feadc92e6af028789b2b
+!! source digest: sha256:dd2d6fb4bffb4420e86213ebd3c3d2887293fb56a54b1f64dc428cde4ba31092
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.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/stock-logistics-reporting/tree/16.0/stock_account_valuation_discrepancy_adjust"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-16-0/stock-logistics-reporting-16-0-stock_account_valuation_discrepancy_adjust"><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/stock-logistics-reporting&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/stock-logistics-reporting/tree/16.0/stock_account_valuation_discrepancy_adjust"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-16-0/stock-logistics-reporting-16-0-stock_account_valuation_discrepancy_adjust"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-reporting&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Wizard to show discrepancies between stock and accounting valuation, and possibility to make accounting adjustment.</p>
 <p>You should use this module if you have products where the inventory valuation is automated (this means that your inventory is connected with accounting). The report allows you to identify the products where the inventory value has a discrepancy with the accounting value for that same product, and to make an adjustment entry in your accounting to align the two values.</p>
-<p>In order to use the module, go to Inventory / Reporting / Products with Account Discrepancy, select the date where you are looking to find the discrepancy and run “Show report”. Once run, select the entries that you want to adjust and run the action to adjust.</p>
+<p>This module adds an action the report in <em>Inventory / Reporting / Dual Inventory Valuation</em>. The action is accesible for Account Managers.</p>
+<p>The action allows to create accounting entries by product in order to match the accounting value to the stock value.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
 <p class="last">This is an alpha version, the data model and design can change at any time without warning.
@@ -382,17 +383,17 @@ <h1 class="title">Account Valuation Discrepancy Adjust</h1>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/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
@@ -400,30 +401,29 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
 <ul class="simple">
 <li>ForgeFlow</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <ul class="simple">
 <li>Christopher Ormaza &lt;<a class="reference external" href="mailto:chris.ormaza&#64;forgeflow.com">chris.ormaza&#64;forgeflow.com</a>&gt;</li>
+<li>Aaron Henriquez &lt;<a class="reference external" href="mailto:aaron.henriquez&#64;forgeflow.com">aaron.henriquez&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id5">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" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external image-reference" href="https://github.com/ChrisOForgeFlow"><img alt="ChrisOForgeFlow" src="https://github.com/ChrisOForgeFlow.png?size=40px" /></a></p>
+<p><a class="reference external" href="https://github.com/ChrisOForgeFlow"><img alt="ChrisOForgeFlow" src="https://github.com/ChrisOForgeFlow.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/16.0/stock_account_valuation_discrepancy_adjust">OCA/stock-logistics-reporting</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
diff --git a/stock_account_valuation_discrepancy_adjust/wizards/__init__.py b/stock_account_valuation_discrepancy_adjust/wizards/__init__.py
index 44afc3ebe..e2cc63bda 100644
--- a/stock_account_valuation_discrepancy_adjust/wizards/__init__.py
+++ b/stock_account_valuation_discrepancy_adjust/wizards/__init__.py
@@ -1,4 +1,3 @@
 # Copyright 2021 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-from . import wizard_stock_discrepancy_report
 from . import wizard_stock_discrepancy_adjustment
diff --git a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment.py b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment.py
index d8059bb7f..1cd640cf3 100644
--- a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment.py
+++ b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment.py
@@ -4,10 +4,15 @@
 
 
 class WizardStockDiscrepancyAdjustment(models.TransientModel):
-
     _name = "wizard.stock.discrepancy.adjustment"
     _description = "Wizard Stock Discrepancy Adjustment"
 
+    product_selection_ids = fields.One2many(
+        comodel_name="wizard.stock.discrepancy.adjustment.line",
+        inverse_name="wizard_id",
+        string="Selected Products",
+    )
+
     def _get_default_stock_journal(self):
         return self.env["account.journal"].search(
             [
@@ -17,6 +22,13 @@ def _get_default_stock_journal(self):
             limit=1,
         )
 
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        required=True,
+        readonly=True,
+        default=lambda self: self.env.company,
+    )
     journal_id = fields.Many2one(
         comodel_name="account.journal",
         string="Journal",
@@ -38,57 +50,34 @@ def _get_default_stock_journal(self):
     to_date = fields.Datetime(
         string="To date",
         required=False,
-        default=fields.Datetime.now(),
-    )
-    product_ids = fields.Many2many(
-        comodel_name="product.product",
-        relation="wizard_discrepancy_product_product_rel",
-        column1="wizard_id",
-        column2="product_id",
-        string="Product",
-    )
-    selected_product_ids = fields.Many2many(
-        comodel_name="product.product",
-        relation="wizard_discrepancy_selected_product_product_rel",
-        column1="wizard_id",
-        column2="product_id",
-        string="Product",
     )
 
     @api.model
     def default_get(self, fields_list):
-        values = super(WizardStockDiscrepancyAdjustment, self).default_get(fields_list)
-        product_discrepancy_model = self.env["product.discrepancy"]
-        if self.env.context.get("active_model", False) == "product.discrepancy":
-            records = product_discrepancy_model.browse(
-                self.env.context.get("active_ids")
-            )
-            values["selected_product_ids"] = records.mapped("product_id").ids
-            values["to_date"] = records.mapped("to_date_valuation")[0]
+        values = super().default_get(fields_list)
+        if self.env.context.get("active_model", False) != "product.product":
+            raise UserError(_("Bad context propagation"))
+        products = self.env["product.product"].browse(
+            self.env.context.get("active_ids")
+        )
+        values["product_selection_ids"] = [
+            (0, 0, {"product_id": product_id}) for product_id in products
+        ]
+        to_date = self.env.context.get("at_date", False)
+        if to_date:
+            values["to_date"] = to_date
+        else:
+            values["to_date"] = fields.Datetime.now()
         return values
 
-    @api.onchange(
-        "to_date",
-        "selected_product_ids",
-    )
-    def _onchange_at_date(self):
-        product_model = self.env["product.product"]
-        if self.selected_product_ids:
-            self.product_ids = self.selected_product_ids.ids or [(6, 0, [])]
-        elif self.to_date:
-            products = product_model.with_context(
-                to_date=self.to_date, target_move="posted"
-            ).search([("valuation_discrepancy", "!=", 0.0)])
-            self.product_ids = products.ids or [(6, 0, [])]
-
     def action_create_adjustment(self):
         move_model = self.env["account.move"]
         product_model = self.env["product.product"]
         moves_created = move_model.browse()
-        if self.product_ids or self.selected_product_ids:
+        if self.product_selection_ids:
             products_with_discrepancy = product_model.with_context(
                 to_date=self.to_date
-            ).browse(self.product_ids.ids or self.selected_product_ids.ids)
+            ).browse(self.product_selection_ids.mapped("product_id").ids)
             for product in products_with_discrepancy:
                 move_data = {
                     "journal_id": self.journal_id.id,
@@ -144,3 +133,28 @@ def action_create_adjustment(self):
             action["domain"] = [("id", "in", moves_created.ids)]
             return action
         return {"type": "ir.actions.act_window_close"}
+
+
+class WizardSelectedProduct(models.TransientModel):
+    _name = "wizard.stock.discrepancy.adjustment.line"
+    _description = "Selected Product for Wizard"
+
+    wizard_id = fields.Many2one(
+        comodel_name="wizard.stock.discrepancy.adjustment",
+        string="Wizard",
+        required=True,
+        ondelete="cascade",
+    )
+    product_id = fields.Many2one(
+        comodel_name="product.product",
+        string="Product",
+        required=True,
+    )
+    stock_value = fields.Float("Inventory Value", related="product_id.stock_value")
+    account_value = fields.Float("Accounting Value", related="product_id.account_value")
+    qty_at_date = fields.Float("Inventory Quantity", related="product_id.qty_at_date")
+    account_qty_at_date = fields.Float(
+        "Accounting Quantity", related="product_id.account_qty_at_date"
+    )
+    qty_discrepancy = fields.Float(related="product_id.qty_discrepancy")
+    valuation_discrepancy = fields.Float(related="product_id.valuation_discrepancy")
diff --git a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment_view.xml b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment_view.xml
index a18e53bd6..58ddd61cb 100644
--- a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment_view.xml
+++ b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_adjustment_view.xml
@@ -1,113 +1,88 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-
-        <record id="wizard_stock_discrepancy_adjustment_view_form" model="ir.ui.view">
-            <field name="name">wizard_stock_discrepancy_adjustment_view_form</field>
-            <field name="model">wizard.stock.discrepancy.adjustment</field>
-            <field name="arch" type="xml">
-                <form string="wizard_stock_discrepancy_adjustment_form">
-                    <sheet>
-                        <group>
-                            <field
-                                name="to_date"
-                                attrs="{'invisible': [('selected_product_ids', '!=', [])], 'required': [('selected_product_ids', '=', [])]}"
-                            />
-                            <field
-                                name="journal_id"
-                                attrs="{'invisible': [('product_ids', '=', [])], 'required': [('product_ids', '!=', [])]}"
-                            />
-                            <field
-                                name="increase_account_id"
-                                attrs="{'invisible': [('product_ids', '=', [])], 'required': [('product_ids', '!=', [])]}"
-                            />
-                            <field
-                                name="decrease_account_id"
-                                attrs="{'invisible': [('product_ids', '=', [])], 'required': [('product_ids', '!=', [])]}"
-                            />
-                            <field
-                                name="selected_product_ids"
-                                invisible="1"
-                                widget="many2many_tags"
-                            />
-                        </group>
-                        <notebook
-                            colspan="4"
-                            attrs="{'invisible': [('product_ids', '=', [])]}"
-                        >
-                            <page string="Products with discrepancy">
-                                <field
-                                    name="product_ids"
-                                    nolabel="1"
-                                    attrs="{'readonly': [('selected_product_ids', '!=', [])]}"
-                                >
-                                    <tree edit="false" create="false">
-                                        <field name="display_name" />
-                                        <field name="qty_at_date" />
-                                        <field name="uom_id" groups="uom.group_uom" />
-                                        <field name="currency_id" invisible="1" />
-                                        <field name="cost_currency_id" invisible="1" />
-                                        <field
-                                            name="stock_value"
-                                            sum="Stock Valuation"
-                                            widget="monetary"
-                                            options="{'currency_field': 'cost_currency_id'}"
-                                        />
-                                        <field name="cost_method" invisible="1" />
-                                        <field
-                                            name="account_qty_at_date"
-                                            sum="Accounting Qty"
-                                        />
-                                        <field
-                                            name="account_value"
-                                            sum="Accounting Valuation"
-                                            widget="monetary"
-                                        />
-                                        <field
-                                            name="qty_discrepancy"
-                                            sum="Discrepancy Qty"
-                                        />
-                                        <field
-                                            name="valuation_discrepancy"
-                                            sum="Valuation Discrepancy"
-                                            widget="monetary"
-                                        />
-                                    </tree>
-                                </field>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <footer>
-                        <button
-                            name="action_create_adjustment"
-                            attrs="{'invisible': [('product_ids', '=', [])]}"
-                            string="Make Adjustment"
-                            type="object"
-                            class="btn-primary"
+    <record id="wizard_stock_discrepancy_adjustment_view_form" model="ir.ui.view">
+        <field name="name">wizard_stock_discrepancy_adjustment_view_form</field>
+        <field name="model">wizard.stock.discrepancy.adjustment</field>
+        <field name="arch" type="xml">
+            <form string="wizard_stock_discrepancy_adjustment_form">
+                <sheet>
+                    <group>
+                    <field name="to_date" readonly="1" />
+                        <field
+                            name="journal_id"
+                            attrs="{'invisible': [('product_selection_ids', '=', [])], 'required': [('product_selection_ids', '!=', [])]}"
                         />
-                        <button
-                            string="Cancel"
-                            class="btn-secondary"
-                            special="cancel"
+                        <field
+                            name="increase_account_id"
+                            attrs="{'invisible': [('product_selection_ids', '=', [])], 'required': [('product_selection_ids', '!=', [])]}"
                         />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record
-            id="action_wizard_stock_discrepancy_adjustment_view_form"
-            model="ir.actions.act_window"
-        >
-            <field name="name">Adjust Stock Valuation Account Discrepancies</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.stock.discrepancy.adjustment</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="wizard_stock_discrepancy_adjustment_view_form" />
-            <field name="target">new</field>
-            <field name="binding_model_id" ref="model_product_discrepancy" />
-        </record>
-
+                        <field
+                            name="decrease_account_id"
+                            attrs="{'invisible': [('product_selection_ids', '=', [])], 'required': [('product_selection_ids', '!=', [])]}"
+                        />
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Products with discrepancy">
+                            <field name="product_selection_ids" nolabel="1" edit="0">
+                                <tree edit="false" create="false">
+                                    <field name="product_id" />
+                                    <field name="qty_at_date" />
+                                    <field
+                                        name="stock_value"
+                                        sum="Stock Valuation"
+                                        widget="monetary"
+                                        options="{'currency_field': 'cost_currency_id'}"
+                                    />
+                                    <field
+                                        name="account_qty_at_date"
+                                        sum="Accounting Qty"
+                                    />
+                                    <field
+                                        name="account_value"
+                                        sum="Accounting Valuation"
+                                        widget="monetary"
+                                    />
+                                    <field
+                                        name="qty_discrepancy"
+                                        sum="Discrepancy Qty"
+                                    />
+                                    <field
+                                        name="valuation_discrepancy"
+                                        sum="Valuation Discrepancy"
+                                        widget="monetary"
+                                    />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <footer>
+                    <button
+                        name="action_create_adjustment"
+                        attrs="{'invisible': [('product_selection_ids', '=', [])]}"
+                        string="Make Adjustment"
+                        type="object"
+                        class="btn-primary"
+                    />
+                    <button string="Cancel" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
 
-    </data>
+    <record
+        id="action_wizard_stock_discrepancy_adjustment_view_form"
+        model="ir.actions.act_window"
+    >
+        <field name="name">Adjust Stock Valuation Account Discrepancies</field>
+        <field name="res_model">wizard.stock.discrepancy.adjustment</field>
+        <field name="binding_view_types">tree,form</field>
+        <field name="view_id" ref="wizard_stock_discrepancy_adjustment_view_form" />
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="product.model_product_product" />
+        <field
+            name="groups_id"
+            eval="[(6, 0, [ref('account.group_account_manager')])]"
+        />
+    </record>
 </odoo>
diff --git a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report.py b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report.py
deleted file mode 100644
index 6bd63d9a0..000000000
--- a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021 ForgeFlow S.L.
-from odoo import fields, models
-from odoo.tools.misc import format_date
-
-
-class WizardStockDiscrepancyReport(models.TransientModel):
-
-    _name = "wizard.stock.discrepancy.report"
-    _description = "Stock Discrepancy Report"
-
-    to_date = fields.Datetime(
-        string="To date",
-        required=True,
-        default=fields.Datetime.now(),
-    )
-
-    def action_show_discrepancy_report(self):
-        product_model = self.env["product.product"]
-        product_discrepancy_model = self.env["product.discrepancy"]
-        products = product_model.with_context(
-            to_date=self.to_date, target_move="posted"
-        ).search([("valuation_discrepancy", "!=", 0.0)])
-        discrepancy_records = product_discrepancy_model.browse()
-        for product in products.read(
-            [
-                "categ_id",
-                "stock_value",
-                "account_value",
-                "qty_at_date",
-                "account_qty_at_date",
-                "valuation_discrepancy",
-                "qty_discrepancy",
-            ],
-            load="_classic_write",
-        ):
-            discrepancy_records |= product_discrepancy_model.create(
-                {
-                    "product_id": product["id"],
-                    "categ_id": product["categ_id"],
-                    "stock_value": product["stock_value"],
-                    "account_value": product["account_value"],
-                    "qty_at_date": product["qty_at_date"],
-                    "account_qty_at_date": product["account_qty_at_date"],
-                    "valuation_discrepancy": product["valuation_discrepancy"],
-                    "qty_discrepancy": product["qty_discrepancy"],
-                    "to_date_valuation": self.to_date,
-                }
-            )
-        action = self.env.ref(
-            "stock_account_valuation_discrepancy_adjust." "product_discrepancy_action"
-        ).read()[0]
-        action["domain"] = [("id", "in", discrepancy_records.ids)]
-        action["display_name"] = "%s (%s)" % (
-            action["display_name"],
-            format_date(
-                self.env,
-                fields.Datetime.context_timestamp(self.env.user, self.to_date),
-            ),
-        )
-        return action
diff --git a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report_view.xml b/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report_view.xml
deleted file mode 100644
index 588c07a7a..000000000
--- a/stock_account_valuation_discrepancy_adjust/wizards/wizard_stock_discrepancy_report_view.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data>
-
-        <record id="wizard_stock_discrepancy_report_view_form" model="ir.ui.view">
-            <field name="name">wizard_stock_discrepancy_report_view_form</field>
-            <field name="model">wizard.stock.discrepancy.report</field>
-            <field name="arch" type="xml">
-                <form string="Discrepancy Report">
-                    <sheet>
-                        <group>
-                            <field name="to_date" />
-                        </group>
-                    </sheet>
-                    <footer>
-                        <button
-                            name="action_show_discrepancy_report"
-                            string="Show Report"
-                            type="object"
-                            class="btn-primary"
-                        />
-                        <button
-                            string="Cancel"
-                            class="btn-secondary"
-                            special="cancel"
-                        />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record
-            id="action_wizard_stock_discrepancy_report_view_form"
-            model="ir.actions.act_window"
-        >
-            <field name="name">Report Stock Valuation Account Discrepancies</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.stock.discrepancy.report</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="wizard_stock_discrepancy_report_view_form" />
-            <field name="target">new</field>
-        </record>
-
-
-        <menuitem
-            id="menu_valuation"
-            name="Products with Account Discrepancy"
-            parent="stock.menu_warehouse_report"
-            sequence="120"
-            action="action_wizard_stock_discrepancy_report_view_form"
-        />
-
-
-    </data>
-</odoo>