diff --git a/product_warranty/README.rst b/product_warranty/README.rst
index 7c12f762..d4802039 100644
--- a/product_warranty/README.rst
+++ b/product_warranty/README.rst
@@ -88,6 +88,9 @@ Contributors
 -  Cyril Gaudin <cyril.gaudin@camptocamp.com>
 -  Bima Jati Wijaya <bimajatiwijaya@gmail.com>
 -  Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+-  `APSL-Nagarro <https://www.apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
 
 Other credits
 -------------
diff --git a/product_warranty/__manifest__.py b/product_warranty/__manifest__.py
index feaa7d03..02cdf9e2 100644
--- a/product_warranty/__manifest__.py
+++ b/product_warranty/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Product Warranty",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Generic Modules/Product",
     "author": "Akretion, Vauxoo, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/rma",
diff --git a/product_warranty/images/product_warranty.png b/product_warranty/images/product_warranty.png
index c2eb36e6..aae51cfd 100644
Binary files a/product_warranty/images/product_warranty.png and b/product_warranty/images/product_warranty.png differ
diff --git a/product_warranty/readme/CONTRIBUTORS.md b/product_warranty/readme/CONTRIBUTORS.md
index ef5d4a2c..e9a5e8a6 100644
--- a/product_warranty/readme/CONTRIBUTORS.md
+++ b/product_warranty/readme/CONTRIBUTORS.md
@@ -9,3 +9,5 @@
 - Cyril Gaudin \<<cyril.gaudin@camptocamp.com>\>
 - Bima Jati Wijaya \<<bimajatiwijaya@gmail.com>\>
 - Serpent Consulting Services Pvt. Ltd. \<<support@serpentcs.com>\>
+- [APSL-Nagarro](https://www.apsl.tech):
+  - Antoni Marroig \<<amarroig@apsl.net>\>
diff --git a/product_warranty/static/description/index.html b/product_warranty/static/description/index.html
index af21197a..07eb1503 100644
--- a/product_warranty/static/description/index.html
+++ b/product_warranty/static/description/index.html
@@ -435,6 +435,10 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Cyril Gaudin &lt;<a class="reference external" href="mailto:cyril.gaudin&#64;camptocamp.com">cyril.gaudin&#64;camptocamp.com</a>&gt;</li>
 <li>Bima Jati Wijaya &lt;<a class="reference external" href="mailto:bimajatiwijaya&#64;gmail.com">bimajatiwijaya&#64;gmail.com</a>&gt;</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.apsl.tech">APSL-Nagarro</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
diff --git a/product_warranty/views/product_supplierinfo_views.xml b/product_warranty/views/product_supplierinfo_views.xml
index ddc2fbef..029e3bd9 100644
--- a/product_warranty/views/product_supplierinfo_views.xml
+++ b/product_warranty/views/product_supplierinfo_views.xml
@@ -31,12 +31,13 @@
                     <field name="warranty_return_partner" />
                     <field
                         name="warranty_return_other_address"
-                        attrs="{'invisible':[('warranty_return_partner', '!=', 'other')], 'required':[('warranty_return_partner', '=', 'other')]}"
+                        invisible="warranty_return_partner != 'other'"
+                        required="warranty_return_partner == 'other'"
                         class="oe_inline"
                     />
                     <field
                         name="warranty_return_address"
-                        attrs="{'invisible':[('warranty_return_partner', '=', 'other')]}"
+                        invisible="warranty_return_partner == 'other'"
                         class="oe_inline"
                     />
                 </group>