diff --git a/g2p_payment_g2p_connect/README.rst b/g2p_payment_g2p_connect/README.rst
index 192a289c..7883327b 100644
--- a/g2p_payment_g2p_connect/README.rst
+++ b/g2p_payment_g2p_connect/README.rst
@@ -7,14 +7,14 @@ OpenG2P Program Payment: G2P Connect Payment Manager
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:81c41f1c1bbf5c8bf43037f3238f41e7fc27ba59bccc9c6a52523920fe69b5ee
+   !! source digest: sha256:a3b7235594fd9b2f7c893d7ef0635b1f16eceaf00ece6621405d1328860c201b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_g2p_connect
+    :target: https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_g2p_connect
     :alt: OpenG2P/openg2p-program
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-program/issues>`_.
 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
-`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_g2p_connect%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_g2p_connect%0Aversion:%2017.0-develop%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.
 
@@ -52,6 +52,6 @@ Authors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_g2p_connect>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_g2p_connect>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_payment_g2p_connect/static/description/index.html b/g2p_payment_g2p_connect/static/description/index.html
index 87737bf9..1d53bdb2 100644
--- a/g2p_payment_g2p_connect/static/description/index.html
+++ b/g2p_payment_g2p_connect/static/description/index.html
@@ -367,9 +367,9 @@ <h1 class="title">OpenG2P Program Payment: G2P Connect Payment Manager</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:81c41f1c1bbf5c8bf43037f3238f41e7fc27ba59bccc9c6a52523920fe69b5ee
+!! source digest: sha256:a3b7235594fd9b2f7c893d7ef0635b1f16eceaf00ece6621405d1328860c201b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_g2p_connect"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></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="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_g2p_connect"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></a></p>
 <p>G2P Connect Payment Manager</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/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
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_g2p_connect%0Aversion:%2015.0-develop%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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_g2p_connect%0Aversion:%2017.0-develop%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">
@@ -406,7 +406,7 @@ <h2><a class="toc-backref" href="#id3">Authors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_g2p_connect">OpenG2P/openg2p-program</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_g2p_connect">OpenG2P/openg2p-program</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_payment_g2p_connect/views/payment_manager_view.xml b/g2p_payment_g2p_connect/views/payment_manager_view.xml
index d088b04b..202368e0 100644
--- a/g2p_payment_g2p_connect/views/payment_manager_view.xml
+++ b/g2p_payment_g2p_connect/views/payment_manager_view.xml
@@ -40,18 +40,14 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
                     <field
                         name="reg_id_type_for_payee_id"
                         string="ID Type for Payee ID"
-                        attrs="{'invisible':[('payee_id_type','!=','reg_id')],
-                                'required':[('payee_id_type','==','reg_id')]}"
-                    />
-                    <field
-                        name="payee_prefix"
-                        attrs="{'invisible':[('payee_id_type','==', False)],
-                                                        'required':[('payee_id_type','!=', True)]}"
+                        invisible="payee_id_type != 'reg_id'"
+                        required="payee_id_type == 'reg_id'"
                     />
+                    <field name="payee_prefix" invisible="not payee_id_type" required="not payee_id_type" />
                     <field
                         name="payee_suffix"
-                        attrs="{'invisible':[('payee_id_type','!=','reg_id')],
-                                                        'required':[('payee_id_type','==','reg_id')]}"
+                        invisible="payee_id_type != 'reg_id'"
+                        required="payee_id_type == 'reg_id'"
                     />
                     <field name="locale" />
                 </group>
diff --git a/g2p_payment_interop_layer/README.rst b/g2p_payment_interop_layer/README.rst
index d6287e96..2bc0847f 100644
--- a/g2p_payment_interop_layer/README.rst
+++ b/g2p_payment_interop_layer/README.rst
@@ -2,19 +2,22 @@
 OpenG2P Program Payment (Payment Interoperability Layer)
 ========================================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:0c0ab5d8146cb7feb0363c6d8b7fb06b1d1abbb302e46376983880a1eba4afaf
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_interop_layer
+    :target: https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_interop_layer
     :alt: OpenG2P/openg2p-program
 
-|badge1| |badge2| 
+|badge1| |badge2|
 
 G2P Payment Payment Interoperability Layer Payment Manager
 
@@ -33,8 +36,8 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-program/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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_interop_layer%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_interop_layer%0Aversion:%2017.0-develop%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.
 
@@ -49,6 +52,6 @@ Authors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_interop_layer>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_interop_layer>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_payment_interop_layer/static/description/index.html b/g2p_payment_interop_layer/static/description/index.html
index fff89340..8091403a 100644
--- a/g2p_payment_interop_layer/static/description/index.html
+++ b/g2p_payment_interop_layer/static/description/index.html
@@ -3,18 +3,18 @@
 <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>OpenG2P Program Payment (Payment Interoperability Layer)</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z 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.
 
-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.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">OpenG2P Program Payment (Payment Interoperability Layer)</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:0c0ab5d8146cb7feb0363c6d8b7fb06b1d1abbb302e46376983880a1eba4afaf
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_interop_layer"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></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="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_interop_layer"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></a></p>
 <p>G2P Payment Payment Interoperability Layer Payment Manager</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -378,33 +380,33 @@ <h1 class="title">OpenG2P Program Payment (Payment Interoperability Layer)</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="#maintainers" id="toc-entry-4">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="#maintainers" id="id4">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/OpenG2P/openg2p-program/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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_interop_layer%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_interop_layer%0Aversion:%2017.0-develop%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">
-<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>OpenG2P</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_interop_layer">OpenG2P/openg2p-program</a> project on GitHub.</p>
+<h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_interop_layer">OpenG2P/openg2p-program</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_payment_interop_layer/views/payment_manager_view.xml b/g2p_payment_interop_layer/views/payment_manager_view.xml
index 5dfbbb30..03c6b9ed 100644
--- a/g2p_payment_interop_layer/views/payment_manager_view.xml
+++ b/g2p_payment_interop_layer/views/payment_manager_view.xml
@@ -32,8 +32,8 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
                     <field
                         name="reg_id_type_for_payee_id"
                         string="ID Type for Payee ID"
-                        attrs="{'invisible':[('payee_id_type','!=','reg_id')],
-                                'required':[('payee_id_type','==','reg_id')]}"
+                        invisible="payee_id_type != 'reg_id'"
+                        required="payee_id_type == 'reg_id'"
                     />
                 </group>
             </xpath>
diff --git a/g2p_payment_phee/README.rst b/g2p_payment_phee/README.rst
index 3ef939aa..06de540f 100644
--- a/g2p_payment_phee/README.rst
+++ b/g2p_payment_phee/README.rst
@@ -2,19 +2,22 @@
 OpenG2P Program Payment (Payment Hub EE)
 ========================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a7806a6a8c839ac8088ecc410b2f80f08963cd4c039348194ed0be2812152984
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_phee
+    :target: https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_phee
     :alt: OpenG2P/openg2p-program
 
-|badge1| |badge2| 
+|badge1| |badge2|
 
 G2P Payment Hub EE Payment Manager
 
@@ -33,8 +36,8 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-program/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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_phee%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_phee%0Aversion:%2017.0-develop%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.
 
@@ -49,6 +52,6 @@ Authors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_phee>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_phee>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_payment_phee/static/description/index.html b/g2p_payment_phee/static/description/index.html
index e0259f8c..0fe5d94a 100644
--- a/g2p_payment_phee/static/description/index.html
+++ b/g2p_payment_phee/static/description/index.html
@@ -3,18 +3,18 @@
 <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>OpenG2P Program Payment (Payment Hub EE)</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z 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.
 
-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.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">OpenG2P Program Payment (Payment Hub EE)</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:a7806a6a8c839ac8088ecc410b2f80f08963cd4c039348194ed0be2812152984
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_phee"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></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="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_phee"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></a></p>
 <p>G2P Payment Hub EE Payment Manager</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -378,33 +380,33 @@ <h1 class="title">OpenG2P Program Payment (Payment Hub EE)</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="#maintainers" id="toc-entry-4">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="#maintainers" id="id4">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/OpenG2P/openg2p-program/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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_phee%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_payment_phee%0Aversion:%2017.0-develop%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">
-<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>OpenG2P</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_payment_phee">OpenG2P/openg2p-program</a> project on GitHub.</p>
+<h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_payment_phee">OpenG2P/openg2p-program</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_payment_phee/views/payment_manager_view.xml b/g2p_payment_phee/views/payment_manager_view.xml
index 2ff5e7ad..43b62a16 100644
--- a/g2p_payment_phee/views/payment_manager_view.xml
+++ b/g2p_payment_phee/views/payment_manager_view.xml
@@ -54,22 +54,14 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
                     </group>
                     <group colspan="4" col="4" string="Batch Parameters">
                         <field name="create_batch" colspan="2" />
-                        <field
-                            name="max_batch_size"
-                            colspan="2"
-                            attrs="{'invisible':[('create_batch','!=',True)]}"
-                        />
-                        <field
-                            name="make_csv_at_prepare"
-                            colspan="4"
-                            attrs="{'invisible':[('create_batch','!=',True)]}"
-                        />
+                        <field name="max_batch_size" colspan="2" invisible="not create_batch" />
+                        <field name="make_csv_at_prepare" colspan="4" invisible="not create_batch" />
                         <field
                             name="make_csv_at_prepare"
                             colspan="4"
                             string="Get CSV from Attachments"
                             help="Get CSV from Attachments"
-                            attrs="{'invisible':[('create_batch','=',True)]}"
+                            invisible="not create_batch"
                         />
                         <field name="batch_type_header" colspan="2" />
                         <field name="batch_purpose_header" colspan="2" />
@@ -86,8 +78,8 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
                         <field
                             name="reg_id_type_for_payee_id"
                             string="ID Type for Payee ID"
-                            attrs="{'invisible':[('payee_id_type','!=','reg_id')],
-                                    'required':[('payee_id_type','==','reg_id')]}"
+                            invisible="payee_id_type != 'reg_id'"
+                            required="payee_id_type == 'reg_id'"
                         />
                     </group>
                     <group colspan="4" col="4" string="Authentication Parameters">
diff --git a/g2p_payment_phee/views/res_config_settings_view.xml b/g2p_payment_phee/views/res_config_settings_view.xml
index 5c794d1b..c9d24dfd 100644
--- a/g2p_payment_phee/views/res_config_settings_view.xml
+++ b/g2p_payment_phee/views/res_config_settings_view.xml
@@ -9,124 +9,30 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
         <field name="priority" eval="1000" />
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div
-                    class="app_settings_block"
-                    data-string="Payment Hub EE API"
+            <xpath expr="//form" position="inside">
+                <app
                     string="Payment Hub EE API"
-                    id="g2p_payment_phee"
                     data-key="g2p_payment_phee"
                     groups="base.group_system,g2p_registry_base.group_g2p_admin"
                 >
-                    <h2>Payment Hub EE API Endpoint URLs</h2>
-                    <div class="row mt16 o_settings_container" name="endpoint_url_container">
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            id="endpoint_url"
-                            title="Configure the Payment Hub EE Endpoint URLs"
-                        >
-                            <div class="o_setting_left_pane">
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <div>
-                                    <field name="default_auth_endpoint_url" />
-                                    <div>
-                                        <label for="default_auth_endpoint_url" />
-                                    </div>
-                                    <span class="text-muted">Default authentication endpoint URL</span>
-                                </div>
-                                <div class="mt-3">
-                                    <field name="default_payment_endpoint_url" />
-                                    <div>
-                                        <label for="default_payment_endpoint_url" />
-                                    </div>
-                                    <span class="text-muted">Default payment endpoint URL</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <div>
-                                    <field name="default_status_endpoint_url" />
-                                    <div>
-                                        <label for="default_status_endpoint_url" />
-                                    </div>
-                                    <span class="text-muted">Default status endpoint URL</span>
-                                </div>
-                                <div class="mt-3">
-                                    <field name="default_details_endpoint_url" />
-                                    <div>
-                                        <label for="default_details_endpoint_url" />
-                                    </div>
-                                    <span class="text-muted">Default details endpoint URL</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                    <block title="Payment Hub EE API Endpoint URLs">
+                        <setting
+                            name="default_auth_endpoint_url"
+                            title="Default authentication endpoint URL"
+                        />
+                        <setting name="default_payment_endpoint_url" title="Default payment endpoint URL" />
+                        <setting name="default_status_endpoint_url" title="Default status endpoint URL" />
+                        <setting name="default_details_endpoint_url" title="Default details endpoint URL" />
+                    </block>
 
-                    <h2>Authentication Parameters</h2>
-                    <div class="row mt16 o_settings_container" name="auth_params_container">
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            id="auth_params"
-                            title="Configure the Payment Hub EE authentication paramaters"
-                        >
-                            <div class="o_setting_left_pane">
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <div>
-                                    <field name="default_tenant_id" />
-                                    <div>
-                                        <label for="default_tenant_id" />
-                                    </div>
-                                    <span class="text-muted">Default tenant ID</span>
-                                </div>
-                                <div class="mt-3">
-                                    <field name="default_username" />
-                                    <div>
-                                        <label for="default_username" />
-                                    </div>
-                                    <span class="text-muted">Default username</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <div>
-                                    <field name="default_password" password="True" />
-                                    <div>
-                                        <label for="default_password" />
-                                    </div>
-                                    <span class="text-muted">Default password</span>
-                                </div>
-                                <div class="mt-3">
-                                    <field name="default_grant_type" password="True" />
-                                    <div>
-                                        <label for="default_grant_type" />
-                                    </div>
-                                    <span class="text-muted">Default grant type</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <div>
-                                    <field name="default_authorization" />
-                                    <div>
-                                        <label for="default_authorization" />
-                                    </div>
-                                    <span class="text-muted">Default authorization</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                    <block title="Authentication Parameters">
+                        <setting name="default_tenant_id" title="Default tenant ID" />
+                        <setting name="default_username" title="Default username" />
+                        <setting name="default_password" title="Default password" password="True" />
+                        <setting name="default_grant_type" title="Default grant type" password="True" />
+                        <setting name="default_authorization" title="Default authorization" />
+                    </block>
+                </app>
             </xpath>
         </field>
     </record>
diff --git a/g2p_program_assessment/tests/test_entitlement.py b/g2p_program_assessment/tests/test_entitlement.py
index 3d079065..6152bf8a 100644
--- a/g2p_program_assessment/tests/test_entitlement.py
+++ b/g2p_program_assessment/tests/test_entitlement.py
@@ -49,7 +49,7 @@ def setUpClass(cls):
         )
 
     def test_copy_assessments_from_beneficiary(self):
-        previous_entitlement = self.env["g2p.entitlement"].create(
+        self.env["g2p.entitlement"].create(
             {
                 "partner_id": self.partner.id,
                 "program_id": self.program.id,
diff --git a/g2p_program_registrant_info/static/src/js/g2p_additional_info.js b/g2p_program_registrant_info/static/src/js/g2p_additional_info.js
index e513075b..85c3c592 100644
--- a/g2p_program_registrant_info/static/src/js/g2p_additional_info.js
+++ b/g2p_program_registrant_info/static/src/js/g2p_additional_info.js
@@ -1,7 +1,8 @@
 /** @odoo-module **/
 
 import {_t} from "@web/core/l10n/translation";
-import {markup, registry, useState} from "@odoo/owl";
+import {registry} from "@web/core/registry";
+import {markup, useState} from "@odoo/owl";
 import {TextField} from "@web/views/fields/text/text_field";
 import {useService} from "@web/core/utils/hooks";
 
diff --git a/g2p_program_registrant_info_rest_api/README.rst b/g2p_program_registrant_info_rest_api/README.rst
index 1ef6c9c7..3a70607f 100644
--- a/g2p_program_registrant_info_rest_api/README.rst
+++ b/g2p_program_registrant_info_rest_api/README.rst
@@ -7,14 +7,14 @@ G2P Program : Program Registrant Info Rest API
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:80cfa05f6e514ca2fa121270f8ce45297241f2b36b17f03e05e3e77776080036
+   !! source digest: sha256:397186dd0258aee823becd6cf0361d4b83f5a5fb8238d52357ef5e3686cf3fa3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_program_registrant_info_rest_api
+    :target: https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_program_registrant_info_rest_api
     :alt: OpenG2P/openg2p-program
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-program/issues>`_.
 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
-`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_program_registrant_info_rest_api%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_program_registrant_info_rest_api%0Aversion:%2017.0-develop%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.
 
@@ -52,6 +52,6 @@ Authors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_program_registrant_info_rest_api>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-program <https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_program_registrant_info_rest_api>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_program_registrant_info_rest_api/static/description/index.html b/g2p_program_registrant_info_rest_api/static/description/index.html
index e1801b9e..862284cb 100644
--- a/g2p_program_registrant_info_rest_api/static/description/index.html
+++ b/g2p_program_registrant_info_rest_api/static/description/index.html
@@ -367,9 +367,9 @@ <h1 class="title">G2P Program : Program Registrant Info Rest API</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:80cfa05f6e514ca2fa121270f8ce45297241f2b36b17f03e05e3e77776080036
+!! source digest: sha256:397186dd0258aee823becd6cf0361d4b83f5a5fb8238d52357ef5e3686cf3fa3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_program_registrant_info_rest_api"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></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="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_program_registrant_info_rest_api"><img alt="OpenG2P/openg2p-program" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--program-lightgray.png?logo=github" /></a></p>
 <p>This module adds REST API support to “G2P Program Registrant Info”</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/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
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_program_registrant_info_rest_api%0Aversion:%2015.0-develop%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/OpenG2P/openg2p-program/issues/new?body=module:%20g2p_program_registrant_info_rest_api%0Aversion:%2017.0-develop%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">
@@ -406,7 +406,7 @@ <h2><a class="toc-backref" href="#id3">Authors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/15.0-develop/g2p_program_registrant_info_rest_api">OpenG2P/openg2p-program</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-program/tree/17.0-develop/g2p_program_registrant_info_rest_api">OpenG2P/openg2p-program</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>