diff --git a/partner_invoicing_mode_monthly/README.rst b/partner_invoicing_mode_monthly/README.rst
index a0793f77844..b6dd2225a53 100644
--- a/partner_invoicing_mode_monthly/README.rst
+++ b/partner_invoicing_mode_monthly/README.rst
@@ -69,6 +69,8 @@ Contributors
 
 -  Phuc (Tran Thanh) <phuc@trobz.com>
 
+-  Tran Thanh Trai <traitt@trobz.com>
+
 Other credits
 -------------
 
diff --git a/partner_invoicing_mode_monthly/__manifest__.py b/partner_invoicing_mode_monthly/__manifest__.py
index c999f83b01c..312776c1e46 100644
--- a/partner_invoicing_mode_monthly/__manifest__.py
+++ b/partner_invoicing_mode_monthly/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Partner Invoicing Mode Monthly",
-    "version": "16.0.2.0.0",
+    "version": "17.0.1.0.0",
     "summary": "Create invoices automatically on a monthly basis.",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/account-invoicing",
diff --git a/partner_invoicing_mode_monthly/readme/CONTRIBUTORS.md b/partner_invoicing_mode_monthly/readme/CONTRIBUTORS.md
index 7d04f82d381..d8ff4cd8d1e 100644
--- a/partner_invoicing_mode_monthly/readme/CONTRIBUTORS.md
+++ b/partner_invoicing_mode_monthly/readme/CONTRIBUTORS.md
@@ -3,3 +3,4 @@
   > - Thierry Ducrest \<<thierry.ducrest@camptocamp.com>\>
 
 - Phuc (Tran Thanh) \<<phuc@trobz.com>\>
+- Tran Thanh Trai \<<traitt@trobz.com>\>
diff --git a/partner_invoicing_mode_monthly/static/description/index.html b/partner_invoicing_mode_monthly/static/description/index.html
index 1c7d5c91dce..79d3c0299da 100644
--- a/partner_invoicing_mode_monthly/static/description/index.html
+++ b/partner_invoicing_mode_monthly/static/description/index.html
@@ -418,6 +418,8 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </li>
 <li><p class="first">Phuc (Tran Thanh) &lt;<a class="reference external" href="mailto:phuc&#64;trobz.com">phuc&#64;trobz.com</a>&gt;</p>
 </li>
+<li><p class="first">Tran Thanh Trai &lt;<a class="reference external" href="mailto:traitt&#64;trobz.com">traitt&#64;trobz.com</a>&gt;</p>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
diff --git a/partner_invoicing_mode_monthly/tests/test_invoice_mode_monthly.py b/partner_invoicing_mode_monthly/tests/test_invoice_mode_monthly.py
index 41947cb9d0f..5cba169dd43 100644
--- a/partner_invoicing_mode_monthly/tests/test_invoice_mode_monthly.py
+++ b/partner_invoicing_mode_monthly/tests/test_invoice_mode_monthly.py
@@ -17,7 +17,7 @@ def deliver_invoice(self, sale_order):
         sale_order.action_confirm()
         for picking in sale_order.picking_ids:
             for move in picking.move_ids:
-                move.quantity_done = move.product_uom_qty
+                move.quantity = move.product_uom_qty
             picking.action_assign()
             picking.with_context(test_queue_job_no_delay=True).button_validate()
 
diff --git a/partner_invoicing_mode_monthly/views/res_config_settings_views.xml b/partner_invoicing_mode_monthly/views/res_config_settings_views.xml
index dbe09556648..d7369112e2b 100644
--- a/partner_invoicing_mode_monthly/views/res_config_settings_views.xml
+++ b/partner_invoicing_mode_monthly/views/res_config_settings_views.xml
@@ -1,43 +1,37 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field name="inherit_id" ref="account.res_config_settings_view_form" />
+        <field
+            name="inherit_id"
+            ref="partner_invoicing_mode.res_config_settings_view_form"
+        />
         <field name="model">res.config.settings</field>
         <field name="arch" type="xml">
-            <div id="invoicing_settings" position="after">
-                <h2>Invoicing Mode</h2>
-                <div
-                    class="row mt16 o_settings_container"
-                    id="monthly_invoicing_settings"
-                >
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane" />
-                        <div class="o_setting_right_pane">
-                            <span class="o_form_label">Monthly Invoicing Options</span>
-                            <div class="content-group">
-                                <div class="row mt16">
-                                    <label
-                                        string="Invoicing day"
-                                        for="res_invoicing_mode_monthly_day_todo"
-                                        class="col-lg-4 o_light_label"
-                                    />
-                                    <field name="res_invoicing_mode_monthly_day_todo" />
-                                </div>
-                                <div class="row mt16">
-                                    <label
-                                        string="Last executed on"
-                                        for="invoicing_mode_monthly_last_execution"
-                                        class="col-lg-4 o_light_label"
-                                    />
-                                    <field
-                                        name="invoicing_mode_monthly_last_execution"
-                                    />
-                                </div>
-                            </div>
+            <xpath expr="//setting[@id='invoicing_mode']" position="inside">
+                <div class="mt16">
+                    <div class="text-muted">
+                        <span>Monthly Invoicing Options</span>
+                    </div>
+                    <div class="content-group">
+                        <div class="row mt16">
+                            <label
+                                string="Invoicing day"
+                                for="res_invoicing_mode_monthly_day_todo"
+                                class="col-lg-4 o_light_label"
+                            />
+                            <field name="res_invoicing_mode_monthly_day_todo" />
+                        </div>
+                        <div class="row mt16">
+                            <label
+                                string="Last executed on"
+                                for="invoicing_mode_monthly_last_execution"
+                                class="col-lg-4 o_light_label"
+                            />
+                            <field name="invoicing_mode_monthly_last_execution" />
                         </div>
                     </div>
                 </div>
-            </div>
+            </xpath>
         </field>
     </record>
 </odoo>