diff --git a/account_move_fiscal_year/README.rst b/account_move_fiscal_year/README.rst
index 079bfd262..2ca9aa42d 100644
--- a/account_move_fiscal_year/README.rst
+++ b/account_move_fiscal_year/README.rst
@@ -14,16 +14,16 @@ Account Move Fiscal Year
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github
-    :target: https://github.com/OCA/account-financial-tools/tree/14.0/account_move_fiscal_year
+    :target: https://github.com/OCA/account-financial-tools/tree/15.0/account_move_fiscal_year
     :alt: OCA/account-financial-tools
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/account-financial-tools-14-0/account-financial-tools-14-0-account_move_fiscal_year
+    :target: https://translation.odoo-community.org/projects/account-financial-tools-15-0/account-financial-tools-15-0-account_move_fiscal_year
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/92/14.0
+    :target: https://runbot.odoo-community.org/runbot/92/15.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Display the fiscal year on journal entries/items.
 
@@ -37,16 +37,10 @@ Installation
 
 You need to install account_fiscal_year.
 
-Configuration
-=============
-
-You just need to create date ranges associated to 'Fiscal Year' type.
-
 Usage
 =====
 
-Go to Invoicing -> Configuration -> Date Ranges -> Fiscal Years to create a new
-Fiscal Year.
+Go to Invoicing -> Configuration -> Fiscal Years to create a new Fiscal Year.
 
 Bug Tracker
 ===========
@@ -54,7 +48,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-tools/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/account-financial-tools/issues/new?body=module:%20account_move_fiscal_year%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/account-financial-tools/issues/new?body=module:%20account_move_fiscal_year%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -70,6 +64,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Benjamin Willig <benjamin.willig@acsone.eu>
+* Juany Davila <juany.davila@forgeflow.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -84,6 +79,6 @@ 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.
 
-This module is part of the `OCA/account-financial-tools <https://github.com/OCA/account-financial-tools/tree/14.0/account_move_fiscal_year>`_ project on GitHub.
+This module is part of the `OCA/account-financial-tools <https://github.com/OCA/account-financial-tools/tree/15.0/account_move_fiscal_year>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_move_fiscal_year/__manifest__.py b/account_move_fiscal_year/__manifest__.py
index 09e352bbf..b08ad5030 100644
--- a/account_move_fiscal_year/__manifest__.py
+++ b/account_move_fiscal_year/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Account Move Fiscal Year",
     "summary": """
         Display the fiscal year on journal entries/item""",
-    "version": "14.0.1.0.1",
+    "version": "15.0.1.0.1",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/account-financial-tools",
diff --git a/account_move_fiscal_year/readme/CONFIGURE.rst b/account_move_fiscal_year/readme/CONFIGURE.rst
deleted file mode 100644
index 4ff91ecd7..000000000
--- a/account_move_fiscal_year/readme/CONFIGURE.rst
+++ /dev/null
@@ -1 +0,0 @@
-You just need to create date ranges associated to 'Fiscal Year' type.
diff --git a/account_move_fiscal_year/readme/CONTRIBUTORS.rst b/account_move_fiscal_year/readme/CONTRIBUTORS.rst
index eea6cac08..20ea902c5 100644
--- a/account_move_fiscal_year/readme/CONTRIBUTORS.rst
+++ b/account_move_fiscal_year/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Benjamin Willig <benjamin.willig@acsone.eu>
+* Juany Davila <juany.davila@forgeflow.com>
diff --git a/account_move_fiscal_year/readme/USAGE.rst b/account_move_fiscal_year/readme/USAGE.rst
index bac5a2067..ef0c74d99 100644
--- a/account_move_fiscal_year/readme/USAGE.rst
+++ b/account_move_fiscal_year/readme/USAGE.rst
@@ -1,2 +1 @@
-Go to Invoicing -> Configuration -> Date Ranges -> Fiscal Years to create a new
-Fiscal Year.
+Go to Invoicing -> Configuration -> Fiscal Years to create a new Fiscal Year.
diff --git a/account_move_fiscal_year/static/description/index.html b/account_move_fiscal_year/static/description/index.html
index 16207ef6b..0a2c0a637 100644
--- a/account_move_fiscal_year/static/description/index.html
+++ b/account_move_fiscal_year/static/description/index.html
@@ -3,7 +3,7 @@
 <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 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Account Move Fiscal Year</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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/account-financial-tools/tree/14.0/account_move_fiscal_year"><img alt="OCA/account-financial-tools" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-tools-14-0/account-financial-tools-14-0-account_move_fiscal_year"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/92/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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/account-financial-tools/tree/15.0/account_move_fiscal_year"><img alt="OCA/account-financial-tools" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-tools-15-0/account-financial-tools-15-0-account_move_fiscal_year"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/92/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Display the fiscal year on journal entries/items.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -394,15 +394,14 @@ ul.auto-toc {
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<p>Go to Invoicing -&gt; Configuration -&gt; Date Ranges -&gt; Fiscal Years to create a new
-Fiscal Year.</p>
+<p>Go to Invoicing -&gt; Configuration -&gt; Fiscal Years to create a new Fiscal Year.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-tools/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/account-financial-tools/issues/new?body=module:%20account_move_fiscal_year%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/account-financial-tools/issues/new?body=module:%20account_move_fiscal_year%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -417,6 +416,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <ul class="simple">
 <li>Benjamin Willig &lt;<a class="reference external" href="mailto:benjamin.willig&#64;acsone.eu">benjamin.willig&#64;acsone.eu</a>&gt;</li>
+<li>Juany Davila &lt;<a class="reference external" href="mailto:juany.davila&#64;forgeflow.com">juany.davila&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -426,7 +426,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <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>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-tools/tree/14.0/account_move_fiscal_year">OCA/account-financial-tools</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-tools/tree/15.0/account_move_fiscal_year">OCA/account-financial-tools</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>
 </div>
diff --git a/account_move_fiscal_year/views/account_move.xml b/account_move_fiscal_year/views/account_move.xml
index 09941ad97..22ca9df0e 100644
--- a/account_move_fiscal_year/views/account_move.xml
+++ b/account_move_fiscal_year/views/account_move.xml
@@ -9,8 +9,7 @@
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
-
-            <field name="date" position="after">
+            <field name="invoice_date" position="after">
                 <field name="date_range_fy_id" options="{'no_open': True}" />
             </field>
 
@@ -23,18 +22,16 @@
         <field name="inherit_id" ref="account.view_account_move_filter" />
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
-
-            <field name="date" position="after">
+            <xpath expr="//field[@name='partner_id']" position="after">
                 <field name="date_range_fy_id" />
-            </field>
-
+            </xpath>
         </field>
     </record>
 
     <record model="ir.ui.view" id="account_move_tree_view">
         <field name="name">account.move.tree (in account_move_fiscal_year)</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_tree" />
+        <field name="inherit_id" ref="account.view_invoice_tree" />
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
 
diff --git a/account_move_fiscal_year/views/account_move_line.xml b/account_move_fiscal_year/views/account_move_line.xml
index 9ae81a42e..12b57f827 100644
--- a/account_move_fiscal_year/views/account_move_line.xml
+++ b/account_move_fiscal_year/views/account_move_line.xml
@@ -9,11 +9,9 @@
         <field name="inherit_id" ref="account.view_move_line_form" />
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
                 <field name="date_range_fy_id" options="{'no_open': True}" />
             </field>
-
         </field>
     </record>
 
@@ -39,11 +37,9 @@
         <field name="inherit_id" ref="account.view_move_line_tree" />
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
                 <field name="date_range_fy_id" />
             </field>
-
         </field>
     </record>