Merge PR #3129 into 18.0

Signed-off-by pedrobaeza

web_widget_x2many_2d_matrix/README.rst

@@ -153,18 +153,18 @@ Now in our wizard, we can use:
 Known issues / Roadmap
 ======================
 
-- Support extra attributes on each field cell via field_extra_attrs
+-  Support extra attributes on each field cell via field_extra_attrs
-  param. We could set a cell as not editable, required or readonly for
+   param. We could set a cell as not editable, required or readonly for
-  instance. The readonly case will also give the ability to click on m2o
+   instance. The readonly case will also give the ability to click on
-  to open related records.
+   m2o to open related records.
-- Support limit total records in the matrix. Ref:
+-  Support limit total records in the matrix. Ref:
-  https://github.com/OCA/web/issues/901
+   https://github.com/OCA/web/issues/901
-- Support cell traversal through keyboard arrows.
+-  Support cell traversal through keyboard arrows.
-- Entering the widget from behind by pressing ``Shift+TAB`` in your
+-  Entering the widget from behind by pressing ``Shift+TAB`` in your
-  keyboard will enter into the 1st cell until
+   keyboard will enter into the 1st cell until
-  https://github.com/odoo/odoo/pull/26490 is merged.
+   https://github.com/odoo/odoo/pull/26490 is merged.
-- Support extra invisible fields inside each cell.
+-  Support extra invisible fields inside each cell.
-- Support kanban mode. Current behaviour forces list mode.
+-  Support kanban mode. Current behaviour forces list mode.
 
 Changelog
 =========
@@ -172,14 +172,14 @@ Changelog
 12.0.1.0.1 (2018-12-07)
 -----------------------
 
-- [FIX] Cells are unable to render property.
+-  [FIX] Cells are unable to render property.
-  (`#1126 <https://github.com/OCA/web/issues/1126>`__)
+   (`#1126 <https://github.com/OCA/web/issues/1126>`__)
 
 12.0.1.0.0 (2018-11-20)
 -----------------------
 
-- [12.0][MIG] web_widget_x2many_2d_matrix
+-  [12.0][MIG] web_widget_x2many_2d_matrix
-  (`#1101 <https://github.com/OCA/web/issues/1101>`__)
+   (`#1101 <https://github.com/OCA/web/issues/1101>`__)
 
 Bug Tracker
 ===========
@@ -206,20 +206,22 @@ Authors
 Contributors
 ------------
 
-- Holger Brunn <hbrunn@therp.nl>
+-  Holger Brunn <hbrunn@therp.nl>
-- Pedro M. Baeza <pedro.baeza@tecnativa.com>
+-  Pedro M. Baeza <pedro.baeza@tecnativa.com>
-- Artem Kostyuk <a.kostyuk@mobilunity.com>
+-  Artem Kostyuk <a.kostyuk@mobilunity.com>
-- Simone Orsi <simone.orsi@camptocamp.com>
+-  Simone Orsi <simone.orsi@camptocamp.com>
-- Timon Tschanz <timon.tschanz@camptocamp.com>
+-  Timon Tschanz <timon.tschanz@camptocamp.com>
-- Jairo Llopis <jairo.llopis@tecnativa.com>
+-  Jairo Llopis <jairo.llopis@tecnativa.com>
-- Dennis Sluijk <d.sluijk@onestein.nl>
+-  Dennis Sluijk <d.sluijk@onestein.nl>
-- `CorporateHub <https://corporatehub.eu/>`__
+-  `CorporateHub <https://corporatehub.eu/>`__
 
-  - Alexey Pelykh <alexey.pelykh@corphub.eu>
+   -  Alexey Pelykh <alexey.pelykh@corphub.eu>
 
-- Adrià Gil Sorribes <adria.gil@forgeflow.com>
+-  Adrià Gil Sorribes <adria.gil@forgeflow.com>
-- Christopher Ormaza <chris.ormaza@forgeflow.com>
+-  Christopher Ormaza <chris.ormaza@forgeflow.com>
-- SodexisTeam <dev@sodexis.com>
+-  SodexisTeam <dev@sodexis.com>
+-  Jasmin Solanki jasmin.solanki@forgeflow.com
+-  David Jiménez david.jimenez@forgeflow.com
 
 Maintainers
 -----------
@@ -234,13 +236,16 @@ 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.
 
-.. |maintainer-ChrisOForgeFlow| image:: https://github.com/ChrisOForgeFlow.png?size=40px
+.. |maintainer-JasminSForgeFlow| image:: https://github.com/JasminSForgeFlow.png?size=40px
-    :target: https://github.com/ChrisOForgeFlow
+    :target: https://github.com/JasminSForgeFlow
-    :alt: ChrisOForgeFlow
+    :alt: JasminSForgeFlow
+.. |maintainer-DavidJForgeFlow| image:: https://github.com/DavidJForgeFlow.png?size=40px
+    :target: https://github.com/DavidJForgeFlow
+    :alt: DavidJForgeFlow
 
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-ChrisOForgeFlow| 
+|maintainer-JasminSForgeFlow| |maintainer-DavidJForgeFlow| 
 
 This module is part of the `OCA/web <https://github.com/OCA/web/tree/18.0/web_widget_x2many_2d_matrix>`_ project on GitHub.
 

web_widget_x2many_2d_matrix/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "2D matrix for x2many fields",
     "version": "18.0.1.0.2",
-    "maintainers": ["ChrisOForgeFlow"],
+    "maintainers": ["JasminSForgeFlow", "DavidJForgeFlow"],
     "development_status": "Production/Stable",
     "author": (
         "Therp BV, "

web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.md

@@ -10,3 +10,5 @@
 - Adrià Gil Sorribes \<<adria.gil@forgeflow.com>\>
 - Christopher Ormaza \<<chris.ormaza@forgeflow.com>\>
 - SodexisTeam \<<dev@sodexis.com>\>
+- Jasmin Solanki <jasmin.solanki@forgeflow.com>
+- David Jiménez <david.jimenez@forgeflow.com>

web_widget_x2many_2d_matrix/static/description/index.html

@@ -509,8 +509,8 @@ crucial part is that we fill the field in the default function:</p>
 <ul class="simple">
 <li>Support extra attributes on each field cell via field_extra_attrs
 param. We could set a cell as not editable, required or readonly for
-instance. The readonly case will also give the ability to click on m2o
+instance. The readonly case will also give the ability to click on
-to open related records.</li>
+m2o to open related records.</li>
 <li>Support limit total records in the matrix. Ref:
 <a class="reference external" href="https://github.com/OCA/web/issues/901">https://github.com/OCA/web/issues/901</a></li>
 <li>Support cell traversal through keyboard arrows.</li>
@@ -575,6 +575,8 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Adrià Gil Sorribes &lt;<a class="reference external" href="mailto:adria.gil&#64;forgeflow.com">adria.gil&#64;forgeflow.com</a>&gt;</li>
 <li>Christopher Ormaza &lt;<a class="reference external" href="mailto:chris.ormaza&#64;forgeflow.com">chris.ormaza&#64;forgeflow.com</a>&gt;</li>
 <li>SodexisTeam &lt;<a class="reference external" href="mailto:dev&#64;sodexis.com">dev&#64;sodexis.com</a>&gt;</li>
+<li>Jasmin Solanki <a class="reference external" href="mailto:jasmin.solanki&#64;forgeflow.com">jasmin.solanki&#64;forgeflow.com</a></li>
+<li>David Jiménez <a class="reference external" href="mailto:david.jimenez&#64;forgeflow.com">david.jimenez&#64;forgeflow.com</a></li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -586,8 +588,8 @@ If you spotted it first, help us to smash 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>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</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 image-reference" href="https://github.com/JasminSForgeFlow"><img alt="JasminSForgeFlow" src="https://github.com/JasminSForgeFlow.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/DavidJForgeFlow"><img alt="DavidJForgeFlow" src="https://github.com/DavidJForgeFlow.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/18.0/web_widget_x2many_2d_matrix">OCA/web</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>