From 970cca94f377970b693fc270ee7b00da4c79c330 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Wed, 11 Mar 2015 18:00:21 +0100
Subject: [PATCH 01/95] [ADD] web_widget_x2many_2d_matrix

---
 web_widget_x2many_2d_matrix/README.rst        |  56 ++++
 web_widget_x2many_2d_matrix/__init__.py       |  20 ++
 web_widget_x2many_2d_matrix/__openerp__.py    |  45 +++
 .../static/description/icon.png               | Bin 0 -> 1142 bytes
 .../src/css/web_widget_x2many_2d_matrix.css   |   0
 .../src/js/web_widget_x2many_2d_matrix.js     | 305 ++++++++++++++++++
 .../src/xml/web_widget_x2many_2d_matrix.xml   |  33 ++
 .../views/templates.xml                       |  11 +
 8 files changed, 470 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/README.rst
 create mode 100644 web_widget_x2many_2d_matrix/__init__.py
 create mode 100644 web_widget_x2many_2d_matrix/__openerp__.py
 create mode 100644 web_widget_x2many_2d_matrix/static/description/icon.png
 create mode 100644 web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
 create mode 100644 web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
 create mode 100644 web_widget_x2many_2d_matrix/views/templates.xml

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
new file mode 100644
index 000000000..27a266b98
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -0,0 +1,56 @@
+2D matrix for x2many fields
+===========================
+
+This module allows to show an x2many field with 3-tuples
+($x_value, $y_value, $value) in a table
+
++-----------+-----------+-----------+
+|           | $x_value1 | $x_value2 |
++===========+===========+===========+
+| $y_value1 | $value1/1 | $value2/1 |
++-----------+-----------+-----------+
+| $y_value2 | $value1/2 | $value2/2 |
++-----------+-----------+-----------+
+
+where `valuen/n` is editable.
+
+
+Usage
+=====
+
+Use this widget by saying::
+
+<field name="my_field" widget="x2many_2d_matrix" />
+
+This assumes that my_field refers to a model with the fields `x`, `y` and
+`value`. If your fields are named differently, pass the correct names as
+attributes::
+
+<field name="my_field" widget="x2many_2d_matrix"
+ field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3" />
+
+Known issues / Roadmap
+======================
+
+* ...
+
+Credits
+=======
+
+Contributors
+------------
+
+* Holger Brunn <hbrunn@therp.nl>
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+    :alt: Odoo Community Association
+    :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/web_widget_x2many_2d_matrix/__init__.py b/web_widget_x2many_2d_matrix/__init__.py
new file mode 100644
index 000000000..faef9dac0
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
new file mode 100644
index 000000000..1cbc4aad7
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name": "2D matrix for x2many fields",
+    "version": "1.0",
+    "author": "Therp BV",
+    "license": "AGPL-3",
+    "category": "Hidden/Dependency",
+    "summary": "Show list fields as a matrix",
+    "depends": [
+        'web',
+    ],
+    "data": [
+        'views/templates.xml',
+    ],
+    "qweb": [
+        'static/src/xml/web_widget_x2many_2d_matrix.xml',
+    ],
+    "test": [
+    ],
+    "auto_install": False,
+    "installable": True,
+    "application": False,
+    "external_dependencies": {
+        'python': [],
+    },
+}
diff --git a/web_widget_x2many_2d_matrix/static/description/icon.png b/web_widget_x2many_2d_matrix/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c7ab302908e114888446d84d3493fa726033c1f
GIT binary patch
literal 1142
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpuXS$
zpAc7|0+Vy!%`Sd3J@*~Rz=H@Xz@vBMNCCrhU++~OAXQKj<QEL285miZ_{7V(vUOQm
z6_!r1cV01f-XirSG1Co=O;=e))mlYsYq@PP*AcZ7l#|k1Zo#d{p|Nnm+I!0u2iSOS
zj92wOQY}068k-oq+5C_;kv;lNyt`tva?*r?4JPO3WeCq<4&{;YZ=dLEbU{sGwZN}b
zP=aAh@^*J&=wOxg0CG4BJR*yM3F<lsGdgL^t^g{S>gnPb5^?zLm6yRy4l)f7mx|d;
zx?*(k%?4)UEmyi0Ecrc2=k&YFn|8nX@qd4)(saLN%zo##oL4V9SpH%8W(I{5_Kby-
zn<aAI{1#GUFYLa_d_c;IfyHr_#F4Aa42OL!)~zwyEtOyV;+<g1Zn4PA4_}w8OqVMu
zfAOxgYM05LDeIRl`2Reie8KYYtJmdCq+}$n@G2Ojm{`Q*PgwTyf=9)aX$FF4WMz{x
zDlONsBp*Fnk(6ZQvU-N*2|wdmy#fy``sUB{EfPxP+woky<x*GtlZAh#PXBY?dP;g_
z>eS~VhopAyb6lBS&$U5E`<Kw{%&;cs@-0hC&UQuLZjn*(u2$Hr94{uH**Z&f_w2QH
zhi&y2{tw)j@@+NGhX)rbF1%|gW$iz7TwQ8;`t#I--QIiVDaf6Q&3v-%^V5U(q&Ll5
z5Mj9N%zT!~f`+;~|C&~W%YC`GT(t6K{^tp$ABA2C+OS@2fBF2>gKppbdV7NQIC+SE
zKe2ts8LoR*Hw$jqc<S+aAx-W&5t&oRWqAyI%$<!*>IEDHSU_mi4;HoUDLTgOJMIHx
zO|`@|q9i4;B-JXpC>2OC7#SEE>l#?<8d`)H8e5qfSQ#5>8yHy`7<AVhd5WSTH$Npa
jtrDuiT-U%Hq`?TN#}c9;vBcCHsDZ)L)z4*}Q$iB}p<fKL

literal 0
HcmV?d00001

diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
new file mode 100644
index 000000000..3a754f426
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -0,0 +1,305 @@
+//-*- coding: utf-8 -*-
+//############################################################################
+//
+//   OpenERP, Open Source Management Solution
+//   This module copyright (C) 2015 Therp BV <http://therp.nl>.
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as
+//   published by the Free Software Foundation, either version 3 of the
+//   License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//############################################################################
+
+openerp.web_widget_x2many_2d_matrix = function(instance)
+{
+    instance.web.form.widgets.add(
+        'x2many_2d_matrix',
+        'instance.web_widget_x2many_2d_matrix.FieldX2Many2dMatrix');
+    instance.web_widget_x2many_2d_matrix.FieldX2Many2dMatrix = instance.web.form.FieldOne2Many.extend({
+        template: 'FieldX2Many2dMatrix',
+        widget_class: 'oe_form_field_x2many_2d_matrix',
+
+        // those will be filled with rows from the dataset
+        by_x_axis: {},
+        by_y_axis: {},
+        field_x_axis: 'x',
+        field_label_x_axis: 'x',
+        field_y_axis: 'y',
+        field_label_y_axis: 'y',
+        field_value: 'value',
+        // information about our datatype
+        is_numeric: false,
+        show_row_totals: true,
+        show_column_totals: true,
+        // this will be filled with the model's fields_get
+        fields: {},
+
+        // read parameters
+        init: function(field_manager, node)
+        {
+            this.field_x_axis = node.attrs.field_x_axis || this.field_x_axis;
+            this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis;
+            this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
+            this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
+            this.field_value = node.attrs.field_value || this.field_value;
+            this.show_row_totals = node.attrs.show_row_totals || this.show_row_totals;
+            this.show_column_totals = node.attrs.show_column_totals || this.show_column_totals;
+            return this._super.apply(this, arguments);
+        },
+
+        // return a field's value, id in case it's a one2many field
+        get_field_value: function(row, field, many2one_as_name)
+        {
+            if(this.fields[field].type == 'many2one' && _.isArray(row[field]))
+            {
+                if(many2one_as_name)
+                {
+                    return row[field][1];
+                }
+                else
+                {
+                    return row[field][0];
+                }
+            }
+            return row[field];
+        },
+
+        // setup our datastructure for simple access in the template
+        set_value: function()
+        {
+            var self = this,
+                result = this._super.apply(this, arguments);
+
+            self.by_x_axis = {};
+            self.by_y_axis = {};
+                
+            return jQuery.when(result).then(function()
+            {
+                return self.dataset._model.call('fields_get').then(function(fields)
+                {
+                    self.fields = fields;
+                    self.is_numeric = fields[self.field_value].type == 'float';
+                    self.show_row_totals &= self.is_numeric;
+                    self.show_column_totals &= self.is_numeric;
+                }).then(function()
+                {
+                    return self.dataset.read_ids(self.dataset.ids).then(function(rows)
+                    {
+                        var read_many2one = {},
+                            many2one_fields = [
+                                self.field_x_axis, self.field_y_axis,
+                                self.field_label_x_axis, self.field_label_y_axis
+                            ];
+                        // prepare to read many2one names if necessary (we can get (id, name) or just id as value)
+                        _.each(many2one_fields, function(field)
+                        {
+                            if(self.fields[field].type == 'many2one')
+                            {
+                                read_many2one[field] = {};
+                            }
+                        });
+                        // setup data structure
+                        _.each(rows, function(row)
+                        {
+                            var x = self.get_field_value(row, self.field_x_axis),
+                                y = self.get_field_value(row, self.field_y_axis);
+                            self.by_x_axis[x] = self.by_x_axis[x] || {};
+                            self.by_y_axis[y] = self.by_y_axis[y] || {};
+                            self.by_x_axis[x][y] = row;
+                            self.by_y_axis[y][x] = row;
+                            _.each(read_many2one, function(rows, field)
+                            {
+                                if(!_.isArray(row[field]))
+                                {
+                                    rows[row[field]] = rows[row[field]] || []
+                                    rows[row[field]].push(row);
+                                }
+                            });
+                        });
+                        // read many2one fields if necessary
+                        var deferrends = [];
+                        _.each(read_many2one, function(rows, field)
+                        {
+                            if(_.isEmpty(rows))
+                            {
+                                return;
+                            }
+                            var model = new instance.web.Model(self.fields[field].relation);
+                            deferrends.push(model.call(
+                                'name_get',
+                                [_.map(_.keys(rows), function(key) {return parseInt(key)})])
+                                .then(function(names)
+                                {
+                                    _.each(names, function(name)
+                                    {
+                                        _.each(rows[name[0]], function(row)
+                                        {
+                                            row[field] = name;
+                                        });
+                                    });
+                                }));
+                        })
+                        return jQuery.when.apply(jQuery, deferrends);
+                    });
+                });
+            });
+        },
+
+        // get x axis values in the correct order
+        get_x_axis_values: function()
+        {
+            return _.keys(this.by_x_axis);
+        },
+
+        // get y axis values in the correct order
+        get_y_axis_values: function()
+        {
+            return _.keys(this.by_y_axis);
+        },
+
+        // get x axis labels
+        get_x_axis_labels: function()
+        {
+            var self = this;
+            return _.map(
+                this.get_x_axis_values(),
+                function(val)
+                {
+                    return self.get_field_value(
+                        _.first(_.values(self.by_x_axis[val])),
+                        self.field_label_x_axis, true);
+                });
+        },
+
+        // get the label for a value on the y axis
+        get_y_axis_label: function(y)
+        {
+            return this.get_field_value(
+                _.first(_.values(this.by_y_axis[y])),
+                this.field_label_y_axis, true);
+        },
+
+        // return the class(es) the inputs should have
+        get_xy_value_class: function()
+        {
+            var classes = 'oe_form_field oe_form_required';
+            if(this.is_numeric)
+            {
+                classes += ' oe_form_field_float';
+            }
+            return classes;
+        },
+
+        // return row id of a coordinate
+        get_xy_id: function(x, y)
+        {
+            return this.by_x_axis[x][y]['id'];
+        },
+
+        // return the value of a coordinate
+        get_xy_value: function(x, y)
+        {
+            return this.get_field_value(
+                this.by_x_axis[x][y], this.field_value);
+        },
+
+        // validate a value
+        validate_xy_value: function(val)
+        {
+            return true;
+        },
+
+        // parse a value from user input
+        parse_xy_value: function(val)
+        {
+            if(this.is_numeric)
+            {
+                return parseFloat(val);
+            }
+            else
+            {
+                return val;
+            }
+        },
+
+        // format a value from the database for display
+        format_xy_value: function(val)
+        {
+            return instance.web.format_value(
+                val, {'type': this.fields[this.field_value].type});
+        },
+
+        // compute totals
+        compute_totals: function()
+        {
+            var self = this,
+                totals_x = {},
+                totals_y = {};
+            return self.dataset.read_ids(self.dataset.ids).then(function(rows)
+            {
+                _.each(rows, function(row)
+                {
+                    var key_x = self.get_field_value(row, self.field_x_axis),
+                        key_y = self.get_field_value(row, self.field_y_axis);
+                    totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
+                    totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
+                });
+            }).then(function()
+            {
+                _.each(totals_y, function(total, y)
+                {
+                    self.$el.find(
+                        _.str.sprintf('td.row_total[data-y="%s"]', y)).text(
+                            self.format_xy_value(total));
+                });
+                _.each(totals_x, function(total, x)
+                {
+                    self.$el.find(
+                        _.str.sprintf('td.column_total[data-x="%s"]', x)).text(
+                            self.format_xy_value(total));
+                });
+            });
+        },
+
+        start: function()
+        {
+            var self = this;
+            this.$el.find('input').on(
+                'change',
+                function()
+                {
+                    var $this = jQuery(this),
+                        val = $this.val()
+                    if(self.validate_xy_value(val))
+                    {
+                        data = {}
+                        data[self.field_value] = self.parse_xy_value(val);
+                        self.dataset.write($this.data('id'), data);
+                        $this.parent().removeClass('oe_form_invalid');
+                        self.compute_totals();
+                    }
+                    else
+                    {
+                        $this.parent().addClass('oe_form_invalid');
+                    }
+
+                });
+            this.compute_totals();
+            return this._super.apply(this, arguments);
+        },
+
+        // deactivate view related functions
+        load_views: function() {},
+        reload_current_view: function() {},
+        get_active_view: function() {},
+    });
+}
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
new file mode 100644
index 000000000..e29367a01
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -0,0 +1,33 @@
+<templates>
+    <t t-name="FieldX2Many2dMatrix">
+        <div>
+            <table class="oe_list_content">
+                <thead>
+                    <tr class="oe_list_header_columns">
+                        <th />
+                        <th t-foreach="widget.get_x_axis_labels()" t-as="label">
+                            <t t-esc="label" />
+                        </th>
+                        <th t-if="widget.show_row_totals">Total</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr t-foreach="widget.get_y_axis_values()" t-as="y">
+                        <th><t t-esc="widget.get_y_axis_label(y)" /></th>
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x">
+                            <span t-att-class="widget.get_xy_value_class()">
+                                <input t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                            </span>
+                        </td>
+                        <td t-if="widget.show_row_totals" class="row_total" t-att-data-y="y"/>
+                    </tr>
+                    <tr t-if="widget.show_column_totals">
+                        <th>Total</th>
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="column_total" t-att-data-x="x" />
+                        <td />
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </t>
+</templates>
diff --git a/web_widget_x2many_2d_matrix/views/templates.xml b/web_widget_x2many_2d_matrix/views/templates.xml
new file mode 100644
index 000000000..06934cc33
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/views/templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js"></script>
+                <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

From 900d12e019c740bf83b28a353178ede4e551ab74 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Wed, 11 Mar 2015 18:05:40 +0100
Subject: [PATCH 02/95] [UPD] readme

---
 web_widget_x2many_2d_matrix/README.rst | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 27a266b98..6be504c44 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -29,10 +29,28 @@ attributes::
 <field name="my_field" widget="x2many_2d_matrix"
  field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3" />
 
+You can pass the following parameters:
+
+field_x_axis
+    The field that indicates the x value of a point
+field_y_axis
+    The field that indicates the y value of a point
+field_label_x_axis
+    Use another field to display in the table header
+field_label_y_axis
+    Use another field to display in the table header
+field_value
+    Show this field as value
+show_row_totals
+    If field_value is a numeric field, calculate row totals
+show_column_totals
+    If field_value is a numeric field, calculate column totals
+
 Known issues / Roadmap
 ======================
 
-* ...
+* no validation yet
+* it would be better to instantiate the proper field widget and let it render the input
 
 Credits
 =======

From d946e72e0abad974437cd05bc15a0024788d44ab Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 12 Mar 2015 12:22:37 +0100
Subject: [PATCH 03/95] [IMP] show column totals in table footer

---
 .../static/src/xml/web_widget_x2many_2d_matrix.xml     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index e29367a01..fe3f82d31 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -14,19 +14,21 @@
                 <tbody>
                     <tr t-foreach="widget.get_y_axis_values()" t-as="y">
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x">
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_field_cell">
                             <span t-att-class="widget.get_xy_value_class()">
                                 <input t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
                             </span>
                         </td>
                         <td t-if="widget.show_row_totals" class="row_total" t-att-data-y="y"/>
                     </tr>
-                    <tr t-if="widget.show_column_totals">
+                </tbody>
+                <tfoot t-if="widget.show_column_totals">
+                    <tr>
                         <th>Total</th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="column_total" t-att-data-x="x" />
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_footer oe_number column_total" t-att-data-x="x" />
                         <td />
                     </tr>
-                </tbody>
+                </tfoot>
             </table>
         </div>
     </t>

From fcafa6268f8cbc0068287aa6009f3141a5cfeee9 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 12 Mar 2015 12:27:24 +0100
Subject: [PATCH 04/95] [FIX] use odoo's parse_value

---
 .../static/src/js/web_widget_x2many_2d_matrix.js       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 3a754f426..b157a6799 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -221,14 +221,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         // parse a value from user input
         parse_xy_value: function(val)
         {
-            if(this.is_numeric)
-            {
-                return parseFloat(val);
-            }
-            else
-            {
-                return val;
-            }
+            return instance.web.parse_value(
+                val, {'type': this.fields[this.field_value].type});
         },
 
         // format a value from the database for display

From 4a4bf0b68f4bdef2077647b390c071dfb918d6f0 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 12 Mar 2015 15:27:25 +0100
Subject: [PATCH 05/95] [ADD] allow to open linked record

of one of the axes is a many2one field
---
 .../src/css/web_widget_x2many_2d_matrix.css   |  4 ++
 .../src/js/web_widget_x2many_2d_matrix.js     | 47 ++++++++++++++-----
 .../src/xml/web_widget_x2many_2d_matrix.xml   |  8 ++--
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
index e69de29bb..2992579de 100644
--- a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
+++ b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
@@ -0,0 +1,4 @@
+.oe_form_field_x2many_2d_matrix th.oe_link
+{
+    cursor: pointer;
+}
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index b157a6799..f9ebeb25d 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -166,18 +166,12 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             return _.keys(this.by_y_axis);
         },
 
-        // get x axis labels
-        get_x_axis_labels: function()
+        // get the label for a value on the x axis
+        get_x_axis_label: function(x)
         {
-            var self = this;
-            return _.map(
-                this.get_x_axis_values(),
-                function(val)
-                {
-                    return self.get_field_value(
-                        _.first(_.values(self.by_x_axis[val])),
-                        self.field_label_x_axis, true);
-                });
+            return this.get_field_value(
+                _.first(_.values(this.by_x_axis[x])),
+                this.field_label_x_axis, true);
         },
 
         // get the label for a value on the y axis
@@ -264,6 +258,36 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             });
         },
 
+        setup_many2one_axes: function()
+        {
+            if(this.fields[this.field_x_axis].type == 'many2one')
+            {
+                this.$el.find('th[data-x]').addClass('oe_link')
+                .click(_.partial(
+                    this.proxy(this.many2one_axis_click),
+                    this.field_x_axis, 'x'));
+            }
+            if(this.fields[this.field_y_axis].type == 'many2one')
+            {
+                this.$el.find('tr[data-y] th').addClass('oe_link')
+                .click(_.partial(
+                    this.proxy(this.many2one_axis_click),
+                    this.field_y_axis, 'y'));
+            }
+        },
+
+        many2one_axis_click: function(field, id_attribute, e)
+        {
+            this.do_action({
+                type: 'ir.actions.act_window',
+                name: this.fields[field].string,
+                res_model: this.fields[field].relation,
+                res_id: jQuery(e.currentTarget).data(id_attribute),
+                views: [[false, 'form']],
+                target: 'current',
+            })
+        },
+
         start: function()
         {
             var self = this;
@@ -288,6 +312,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
 
                 });
             this.compute_totals();
+            this.setup_many2one_axes();
             return this._super.apply(this, arguments);
         },
 
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index fe3f82d31..625a2d20f 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -1,18 +1,18 @@
 <templates>
     <t t-name="FieldX2Many2dMatrix">
-        <div>
+        <div t-att-class="widget.widget_class">
             <table class="oe_list_content">
                 <thead>
                     <tr class="oe_list_header_columns">
                         <th />
-                        <th t-foreach="widget.get_x_axis_labels()" t-as="label">
-                            <t t-esc="label" />
+                        <th t-foreach="widget.get_x_axis_values()" t-as="x" t-att-data-x="x">
+                            <t t-esc="widget.get_x_axis_label(x)" />
                         </th>
                         <th t-if="widget.show_row_totals">Total</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr t-foreach="widget.get_y_axis_values()" t-as="y">
+                    <tr t-foreach="widget.get_y_axis_values()" t-as="y" t-att-data-y="y">
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_field_cell">
                             <span t-att-class="widget.get_xy_value_class()">

From 4203e2ab4c8ed67483dc6a615a9e064aeffd36a2 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 12 Mar 2015 15:44:57 +0100
Subject: [PATCH 06/95] [IMP] handle readonly flag

[ADD] show grand total
[IMP] classify floats as floats
---
 .../static/src/js/web_widget_x2many_2d_matrix.js         | 4 ++++
 .../static/src/xml/web_widget_x2many_2d_matrix.xml       | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index f9ebeb25d..df8b49308 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -230,6 +230,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         compute_totals: function()
         {
             var self = this,
+                grand_total = 0,
                 totals_x = {},
                 totals_y = {};
             return self.dataset.read_ids(self.dataset.ids).then(function(rows)
@@ -240,6 +241,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                         key_y = self.get_field_value(row, self.field_y_axis);
                     totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
                     totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
+                    grand_total += self.get_field_value(row, self.field_value);
                 });
             }).then(function()
             {
@@ -255,6 +257,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                         _.str.sprintf('td.column_total[data-x="%s"]', x)).text(
                             self.format_xy_value(total));
                 });
+                self.$el.find('.grand_total').text(
+                    self.format_xy_value(grand_total))
             });
         },
 
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index 625a2d20f..2950439c1 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -14,19 +14,20 @@
                 <tbody>
                     <tr t-foreach="widget.get_y_axis_values()" t-as="y" t-att-data-y="y">
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_field_cell">
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <input t-if="!widget.get('effective_readonly')" t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <t t-if="widget.get('effective_readonly')" t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" />
                             </span>
                         </td>
-                        <td t-if="widget.show_row_totals" class="row_total" t-att-data-y="y"/>
+                        <td t-if="widget.show_row_totals" class="row_total oe_number" t-att-data-y="y"/>
                     </tr>
                 </tbody>
                 <tfoot t-if="widget.show_column_totals">
                     <tr>
                         <th>Total</th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_footer oe_number column_total" t-att-data-x="x" />
-                        <td />
+                        <td class="grand_total oe_number" />
                     </tr>
                 </tfoot>
             </table>

From 82b6dc199b74d4c5862b36f4d1347c953e9bedbc Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 15:29:09 +0100
Subject: [PATCH 07/95] [IMP] collapse whitespace in rows

---
 .../static/src/css/web_widget_x2many_2d_matrix.css            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
index 2992579de..d33d4f21b 100644
--- a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
+++ b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
@@ -2,3 +2,7 @@
 {
     cursor: pointer;
 }
+.openerp .oe_form_field_x2many_2d_matrix .oe_list_content > tbody > tr > td.oe_list_field_cell
+{
+    white-space: normal;
+}

From ea84a081f012283c644beed5840735529b62e7b6 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 15:34:02 +0100
Subject: [PATCH 08/95] [IMP] support changing readonly state

---
 .../static/src/js/web_widget_x2many_2d_matrix.js    | 13 +++++++++++++
 .../static/src/xml/web_widget_x2many_2d_matrix.xml  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index df8b49308..058a682e2 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -317,9 +317,22 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                 });
             this.compute_totals();
             this.setup_many2one_axes();
+            this.on("change:effective_readonly",
+                    this, this.proxy(this.effective_readonly_change));
+            this.effective_readonly_change();
             return this._super.apply(this, arguments);
         },
 
+        effective_readonly_change: function()
+        {
+            this.$el
+            .find('tbody td.oe_list_field_cell span.oe_form_field>input')
+            .toggle(!this.get('effective_readonly'));
+            this.$el
+            .find('tbody td.oe_list_field_cell span.oe_form_field>span')
+            .toggle(this.get('effective_readonly'));
+        },
+
         // deactivate view related functions
         load_views: function() {},
         reload_current_view: function() {},
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index 2950439c1..4f587e3f0 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -16,8 +16,8 @@
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input t-if="!widget.get('effective_readonly')" t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
-                                <t t-if="widget.get('effective_readonly')" t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <input style="display: none" t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <span style="display: none"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>
                         <td t-if="widget.show_row_totals" class="row_total oe_number" t-att-data-y="y"/>

From 2e2b2453d78d30b109609c0cd8e1fb93751c7fce Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 17:36:39 +0100
Subject: [PATCH 09/95] [FIX] update readonly value after editing

---
 .../static/src/js/web_widget_x2many_2d_matrix.js                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 058a682e2..9a7b8ca62 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -305,6 +305,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                     {
                         data = {}
                         data[self.field_value] = self.parse_xy_value(val);
+                        $this.siblings('span').text(
+                                self.format_xy_value(self.parse_xy_value(val)));
                         self.dataset.write($this.data('id'), data);
                         $this.parent().removeClass('oe_form_invalid');
                         self.compute_totals();

From 08285bb319efca47a2471f5ba17946fb1c7ceb19 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 17:44:41 +0100
Subject: [PATCH 10/95] [IMP] pass computed totals to inheriting function

---
 .../static/src/js/web_widget_x2many_2d_matrix.js             | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 9a7b8ca62..0425468bf 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -259,6 +259,11 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                 });
                 self.$el.find('.grand_total').text(
                     self.format_xy_value(grand_total))
+                return {
+                    totals_x: totals_x,
+                    totals_y: totals_y,
+                    grand_total: grand_total,
+                };
             });
         },
 

From fef7b3c4091570f23995c13967f53c6fbb29d874 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 18:19:42 +0100
Subject: [PATCH 11/95] [FIX] replace therp icon

---
 .../static/description/icon.png               | Bin 1142 -> 12361 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/description/icon.png b/web_widget_x2many_2d_matrix/static/description/icon.png
index 4c7ab302908e114888446d84d3493fa726033c1f..2c8e1ad59d7db69e97b2467c6fb0d4e3e460c9b4 100644
GIT binary patch
literal 12361
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
YID`P*yI)_SqJKa}LQ%X*)WH9L08=sy2LJ#7

literal 1142
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpuXS$
zpAc7|0+Vy!%`Sd3J@*~Rz=H@Xz@vBMNCCrhU++~OAXQKj<QEL285miZ_{7V(vUOQm
z6_!r1cV01f-XirSG1Co=O;=e))mlYsYq@PP*AcZ7l#|k1Zo#d{p|Nnm+I!0u2iSOS
zj92wOQY}068k-oq+5C_;kv;lNyt`tva?*r?4JPO3WeCq<4&{;YZ=dLEbU{sGwZN}b
zP=aAh@^*J&=wOxg0CG4BJR*yM3F<lsGdgL^t^g{S>gnPb5^?zLm6yRy4l)f7mx|d;
zx?*(k%?4)UEmyi0Ecrc2=k&YFn|8nX@qd4)(saLN%zo##oL4V9SpH%8W(I{5_Kby-
zn<aAI{1#GUFYLa_d_c;IfyHr_#F4Aa42OL!)~zwyEtOyV;+<g1Zn4PA4_}w8OqVMu
zfAOxgYM05LDeIRl`2Reie8KYYtJmdCq+}$n@G2Ojm{`Q*PgwTyf=9)aX$FF4WMz{x
zDlONsBp*Fnk(6ZQvU-N*2|wdmy#fy``sUB{EfPxP+woky<x*GtlZAh#PXBY?dP;g_
z>eS~VhopAyb6lBS&$U5E`<Kw{%&;cs@-0hC&UQuLZjn*(u2$Hr94{uH**Z&f_w2QH
zhi&y2{tw)j@@+NGhX)rbF1%|gW$iz7TwQ8;`t#I--QIiVDaf6Q&3v-%^V5U(q&Ll5
z5Mj9N%zT!~f`+;~|C&~W%YC`GT(t6K{^tp$ABA2C+OS@2fBF2>gKppbdV7NQIC+SE
zKe2ts8LoR*Hw$jqc<S+aAx-W&5t&oRWqAyI%$<!*>IEDHSU_mi4;HoUDLTgOJMIHx
zO|`@|q9i4;B-JXpC>2OC7#SEE>l#?<8d`)H8e5qfSQ#5>8yHy`7<AVhd5WSTH$Npa
jtrDuiT-U%Hq`?TN#}c9;vBcCHsDZ)L)z4*}Q$iB}p<fKL


From 4af854c2eb61f7d5885fbf1280cd4379c410d322 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 18:26:29 +0100
Subject: [PATCH 12/95] [FIX] setup focus

---
 .../static/src/js/web_widget_x2many_2d_matrix.js                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 0425468bf..191ffad66 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -338,6 +338,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             this.$el
             .find('tbody td.oe_list_field_cell span.oe_form_field>span')
             .toggle(this.get('effective_readonly'));
+            this.$el.find('input').first().focus();
         },
 
         // deactivate view related functions

From 1eaf985999cd31c422f462f7d7ac049bf6d7e066 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 13 Mar 2015 18:47:15 +0100
Subject: [PATCH 13/95] [ADD] validation

[IMP] write formatted value to back to input
---
 web_widget_x2many_2d_matrix/README.rst        |  3 +--
 .../src/js/web_widget_x2many_2d_matrix.js     | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 6be504c44..5fb296beb 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -49,8 +49,7 @@ show_column_totals
 Known issues / Roadmap
 ======================
 
-* no validation yet
-* it would be better to instantiate the proper field widget and let it render the input
+* it would be worth trying to instantiate the proper field widget and let it render the input
 
 Credits
 =======
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 191ffad66..0c818548d 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -209,6 +209,14 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         // validate a value
         validate_xy_value: function(val)
         {
+            try
+            {
+                this.parse_xy_value(val);
+            }
+            catch(e)
+            {
+                return false;
+            }
             return true;
         },
 
@@ -308,10 +316,12 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                         val = $this.val()
                     if(self.validate_xy_value(val))
                     {
-                        data = {}
-                        data[self.field_value] = self.parse_xy_value(val);
-                        $this.siblings('span').text(
-                                self.format_xy_value(self.parse_xy_value(val)));
+                        var data = {}, value = self.parse_xy_value(val);
+                        data[self.field_value] = value;
+
+                        $this.siblings('span').text(self.format_xy_value(value));
+                        $this.val(self.format_xy_value(value));
+
                         self.dataset.write($this.data('id'), data);
                         $this.parent().removeClass('oe_form_invalid');
                         self.compute_totals();
@@ -341,6 +351,11 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             this.$el.find('input').first().focus();
         },
 
+        is_syntax_valid: function()
+        {
+            return this.$el.find('.oe_form_invalid').length == 0;
+        },
+
         // deactivate view related functions
         load_views: function() {},
         reload_current_view: function() {},

From 0d805deb39a51cc07f93180d1c0997f5e00bc97b Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 16 Mar 2015 16:35:17 +0100
Subject: [PATCH 14/95] [IMP] we don't need data-x and data-y on the input

---
 .../static/src/xml/web_widget_x2many_2d_matrix.xml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index 4f587e3f0..952a003f6 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -14,9 +14,9 @@
                 <tbody>
                     <tr t-foreach="widget.get_y_axis_values()" t-as="y" t-att-data-y="y">
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')">
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input style="display: none" t-att-data-x="x" t-att-data-y="y" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <input style="display: none" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
                                 <span style="display: none"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>

From 569def98e248dcd3cb4822444be01b70f6c0708c Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 16 Mar 2015 16:47:21 +0100
Subject: [PATCH 15/95] [IMP] use semantic css classes instead of element names

[RFR] and being on it, make reacting to changes in overrides simple
---
 .../src/js/web_widget_x2many_2d_matrix.js     | 55 ++++++++++---------
 .../src/xml/web_widget_x2many_2d_matrix.xml   |  4 +-
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 0c818548d..12a56c8cb 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -308,30 +308,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         start: function()
         {
             var self = this;
-            this.$el.find('input').on(
-                'change',
-                function()
-                {
-                    var $this = jQuery(this),
-                        val = $this.val()
-                    if(self.validate_xy_value(val))
-                    {
-                        var data = {}, value = self.parse_xy_value(val);
-                        data[self.field_value] = value;
-
-                        $this.siblings('span').text(self.format_xy_value(value));
-                        $this.val(self.format_xy_value(value));
-
-                        self.dataset.write($this.data('id'), data);
-                        $this.parent().removeClass('oe_form_invalid');
-                        self.compute_totals();
-                    }
-                    else
-                    {
-                        $this.parent().addClass('oe_form_invalid');
-                    }
-
-                });
+            this.$el.find('.edit').on(
+                'change', self.proxy(this.xy_value_change));
             this.compute_totals();
             this.setup_many2one_axes();
             this.on("change:effective_readonly",
@@ -340,15 +318,38 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             return this._super.apply(this, arguments);
         },
 
+        xy_value_change: function(e)
+        {
+            var $this = jQuery(e.currentTarget),
+                val = $this.val();
+            if(this.validate_xy_value(val))
+            {
+                var data = {}, value = this.parse_xy_value(val);
+                data[this.field_value] = value;
+
+                $this.siblings('.read').text(this.format_xy_value(value));
+                $this.val(this.format_xy_value(value));
+
+                this.dataset.write($this.data('id'), data);
+                $this.parent().removeClass('oe_form_invalid');
+                this.compute_totals();
+            }
+            else
+            {
+                $this.parent().addClass('oe_form_invalid');
+            }
+
+        },
+
         effective_readonly_change: function()
         {
             this.$el
-            .find('tbody td.oe_list_field_cell span.oe_form_field>input')
+            .find('tbody td.oe_list_field_cell span.oe_form_field .edit')
             .toggle(!this.get('effective_readonly'));
             this.$el
-            .find('tbody td.oe_list_field_cell span.oe_form_field>span')
+            .find('tbody td.oe_list_field_cell span.oe_form_field .read')
             .toggle(this.get('effective_readonly'));
-            this.$el.find('input').first().focus();
+            this.$el.find('.edit').first().focus();
         },
 
         is_syntax_valid: function()
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index 952a003f6..35f1669bc 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -16,8 +16,8 @@
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input style="display: none" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
-                                <span style="display: none"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
+                                <input class="edit" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <span class="read"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>
                         <td t-if="widget.show_row_totals" class="row_total oe_number" t-att-data-y="y"/>

From 1ad7523065e874f4f6d9d5f093dd00a46b07d3d1 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 16 Mar 2015 17:20:43 +0100
Subject: [PATCH 16/95] [IMP] add screenshot, example in README

---
 web_widget_x2many_2d_matrix/README.rst        |  25 +++++++++++-------
 .../static/description/screenshot.png         | Bin 0 -> 19577 bytes
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/static/description/screenshot.png

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 5fb296beb..0b145aaf6 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -4,16 +4,22 @@
 This module allows to show an x2many field with 3-tuples
 ($x_value, $y_value, $value) in a table
 
-+-----------+-----------+-----------+
-|           | $x_value1 | $x_value2 |
-+===========+===========+===========+
-| $y_value1 | $value1/1 | $value2/1 |
-+-----------+-----------+-----------+
-| $y_value2 | $value1/2 | $value2/2 |
-+-----------+-----------+-----------+
+          $x_value1   $x_value2 
+========= =========== ===========
+$y_value1 $value(1/1) $value(2/1)
+$y_value2 $value(1/2) $value(2/2)
+========= =========== ===========
 
-where `valuen/n` is editable.
+where `value(n/n)` is editable.
 
+An example use case would be: Select some projects and some employees so that
+a manager can easily fill in the planned_hours for one task per employee. The
+result could look like this:
+
+.. image:: /web_widget_x2many_2d_matrix/static/description/screenshot.png
+    :alt: Screenshot
+
+The beauty of this is that you have an arbitrary amount of columns with this widget, trying to get this in standard x2many lists involves some quite agly hacks.
 
 Usage
 =====
@@ -26,8 +32,7 @@ This assumes that my_field refers to a model with the fields `x`, `y` and
 `value`. If your fields are named differently, pass the correct names as
 attributes::
 
-<field name="my_field" widget="x2many_2d_matrix"
- field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3" />
+<field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3" />
 
 You can pass the following parameters:
 
diff --git a/web_widget_x2many_2d_matrix/static/description/screenshot.png b/web_widget_x2many_2d_matrix/static/description/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c2a40d62b23f3b5c4b97dbc699f20dc5baa5ba
GIT binary patch
literal 19577
zcmdVC2{e^$`#!8vX%Y!#h!7%_%wx1ELp-K!rXqxGo->q)2xUm-h$J?Nz0D*cWS*yF
z9=3U&{m+e__j#Z9dDri^{_FeJw?3;y>)!Wp-S>T6=XspRah&`49}2fl9j7`@KtOOx
z<~Bl^fZ$Lt0l@)XqJywyo4foJ{5fPRDWgh6MAY4{_=|vmo<Ig6q3RSp+55;&wY67#
zyFMa9-s0f(^Y@>aGSRCs-Pp1@#&m`gIq70YLVD)@G0D*G1@G7Ha`E?hJr$+m(d;%U
zPY6h>P7^9IiC~pdpX;1VJaCzWk%Z_P{ndyc$A<XAqZc*?zX;UIGhcr+9kODUXN2N^
z6gRoR_q}T5`lH-u&yFxCr?w&tubx9FWn)nr1?G;q#9b!u0{HfS+0u+o_vGdZ_-sY9
z`VDp6OkTLg7RKguP?8#z-6*~LOZZ$DO=Vu|jNuDO7jw*|rH&H({Sr8Nv-%Oo2?_?{
zu2yuFjW4<2uav;*;8bUydY3@z;9oA{Xi}iTbXWh}mjzcJ9P9UyhwWGnqJ#Fu3x4W_
z1LPS_<?MQM@Lw048VO-wfo>sNCQ5Fn8k3Vl_Nu?`=SL^w`qpA3IR^cgQx>#36k%KQ
zx!9+&v{v-dTjJB$E{1|p{o{+*1$Ixif8MeYwX;&)v~6{I=%<2#gLXnOCRz2Seas9`
zPuQn_KuP`UHVbZc%b-$GqNy#|USkXvz45sxfSTX;c9L?8z#Q!X{4Enc`Sz_K>6TvL
zVB#$eZ!I*1lu{S_9R-Esi^uVwzbz1Un0z6d^m#f<_EGxrxxgD-r}2mV;xqG3#cZoJ
zHZ;)tCCDb_yXJ{C)EvTpM9*MqV)9F%POICm7m43MB)yz`oK=-A41*=#-QnDA4Eofm
zQ``}g4k-3s!BgxFX1hn`qRaBoOs&}Co^O>?(slX|<@4e9f83qeg$$53K%>I!S7~-%
z)Z@pte{_FDrXH4Pz%3onqr&g@g_bQ$mN`UbBdsYm^`ti%zm3G)T(Mxn$pVKl%Q;vi
zg5N~Izz{o{WUHMdsvaT#EQAohiGHj@JmzOQsyuJ+D3LS_8b(*yh5RbBdp#0)nrNoG
zSI;GOwNdj&9x4>V9|dO`aMoLQy@HEPz0x4JyW<#@sW$$((T~}EK$Tmt<9G8q(t^c*
zc%wlAwYP!kf8O9Nn<TlnH({7wkxP}~XPEeK7-?g<KjopK-C>7sYIJ{W#t^z(!(WB~
z@d0%h{yZk}w%s2?M_l(uqQzi(r`EQ%i6s{al7mGr=`U?@%HF<Bv?vMt<{xgsdKzFb
zn58AO&DtN{2gSPun2BDmubU=liR8hconqWjsmY2=T4?M|MJ1(IKJ8w2-?rn1=i@tq
z93`1mNKUoj6bCcmy?!}esM76st96!<=-{$u0aM83D->sy;2KVGai-cF6gAC?;%McR
z_wo^+&DzsXi*GiV^I3Ldr~J8!Nu;iEaG<s~*JP8Lgv|TDdV6ei_Xz}Qe>QwxdY6@z
z)i*G3yVlbEy6dWy{*}{Tej4{p5Jr4CX7h@Xfm_py&%eWHAhNrw`-fzfl7%^$cGuw$
zB_2&L$C0~_@Z;(;Jo5C(sB@U?aJj#1fn9BFEh#B!fx{F-LT`a1oru#_Vc|z`?eg++
zZ*T9mdw1^Kk$z`g6?{pg-m)iGiNq^OE_}i+pF<n#WGzEbcZ@q;F)nU#nzDU^g(^&%
zmXeZ^u3fm;QKuwsar>eEot<LQqd(u}?_5~gT3IqJdTziEkH9r>)H!yv)fA(J<~w)t
z$kS5c0yLI9z0LDLR;P&dz_;(;Z!@rQa9m0V4Lut;Xk%-8npTL%aa!l$oAUcI3JOTJ
zFhom3!^_vNnK8JDiNeo(v#;O3kHWQaq<sA7G+Rnqva_{bFg<a3Dg5<?)rB|@T~*b=
za?SR1x1Htg5^=|A)xP4Dt-hUtk<z1d4mf45qQ%LQ9XC}|@wso4-Y3)@-5wouobqvb
zLiT_mqE=EaYVv(bQ3|>!&)dv`EUNokn?u%jscOP3)?c;$a5o2jb$7MJidu?m+-?sF
z2q2ew<?9riLrXzTZPsUDX}Mx3^UMCxiUkd~;o|%-wb<HF(P?p4<K@X=gsSFRMooBX
zp_tj$`f!<#_<S{cx18LHWmoq6RL;(HTT)~s6~86tRQHNl`%Jo`-5pcqLX_hD`wXPI
z`F2(B8#6}y+$##F5SP>S&%;2@b+lvGmsLIs1cp#qTU#SqnwpwgS`Y}TfQn>&O4s<p
z&A6159dhb!gUOD{nwpZALiI5l(k`xx(`j>q$zofJg&#hQSr2BbXSC%$N*Ni65_QQ{
zU%8Lf5L(p9w;OLtl0z)A1a6R3%82$M^)C|7l){Q2A`p-17P|M<Yo*VlBrWZSIUiZ$
zx94PTE0{00EP6iRdJDKnm!^AXx-eQPwi7LsuGh@whfb!<)$;q$IsLll$kp28YCF|c
zuBOH^UE(p;l;n}OF&*dN>}ceF?b@|D@f9T5^D#x5m0(saYPG(dD6)dWbNE$My)lZ-
zXJur3my+^uVWbw3*lOC`+`P45U+OQ<{7(723_|unVq?cdvu5y2Ny#UBoEcY9c6qN{
zz`1MvnU&l}PEjE>R@(~;qr>&<X6DVx5#<ho(hTJJaPG%(&RX4Fnrdb~+rGZO-X|zI
zb#fc3KGk)RFojmLhE$z9fBpdvR!XW|;CxE!G7H1FsIqyM?}zvACot`?`q^V1M@~9@
z?>&4)`!zeSQQhWJq4S_lo^Vz<Lm1)hjJAp_N-kOQgY|latV^r{G{z?&d)RKLqr9z}
zk`+A_9K(Dka2d<E_P(m`2?<oVW|r<NMceBWt(_+*i}`GZf|i)l^*`pXr_mGHZQLXa
z)$KV)+I#s7eZseI--rXk5lSD)UT$MzK6L|zAt4YG%pw1(Y%_0gE6Ba6#}zl*zeCGA
zp%howRlK$IoGdwjiud`HGBw|3e~98wGZbq3*V8*?KFRs><Qxu`RW={;?qrkH<-#+W
z72L4Z&V%`=boSBmr1SP>>(Ef*jSP~_iGgzeLq|?pt;&&;lgkbhb;pj3Xq&Zjrhoi+
z4rcs}M~Rq_(Cg{V+TyS+!8G$Mp_AWh*vH#5N^s#H)5W5q3MMC7BYiGV<=Ktv4-8CC
zUpbH(tP&>@A(UHl?-m<1zqv-qgDIq0P?hSn``?IIRA4M$bSnd6o(BbG7GFxu%v53y
zu?`3bP)4OHw0l;zO;?~R+h&pLwaNZj%-wNJcRB3CXj067^k%zvQ#+YMMwpE^sH{6l
z)l$Fyg{>7kP<x30frvIq&r9GxHs7ok-u)w?@v9nLL5C5=9g0Rn6|uLzg>r!g_!M%m
zRB;r0kWlcI|LwS(XkSF2fKtVC3MC4O`vvk$PeQ5?5#HCOUh14JcNjQWqyZCYmhuzi
z9?zcDIK>M)3sq0_@CnJTy4hCyqE3||x5TGkN2x~%OFdPFV7u#qQLJYw57nJVk1+JP
zc2`tan2264FPjEPlZ|=fk2?Vgt@6y7Grp!v>&+A=etHhQk!QyBYKOdhNwT|#*F{KQ
z)Ud~_{1G@n;vi-(f7|_mpA7^A7mxkkFlnZpxxbCz_qPAo$;yH~Hy(>cX0)F;C}#2H
z+W5>Bt85OqEswWYa+*{$8l7PoR^!8VcD1wOn#8A;c6GAWfhv5C!NK`O-5458F|;mz
zetsf_%!G%E^ti%Lm%A5|aYuNXyw&rd3c?T0{ntZO>f%c_(ZYczywOCSkKNihs|=6(
zAC@``pZ**z=|X087NWYbT*a%BXUns*v)2|z*~4V%+&Bp8-Imb`FONmjQwlOLgh-iW
z`J$N9^Uy`LS9qw0EBG>#bg!P53XyU$CdR76+uN*F$Dj)wXT+Rlf5D_3wsE$wurN2D
z?8&n&+PFkec>CosxAo1$7(%6AS13yFQ`AzV*D@?~`&TSGgeZM_lh@|ZX!tNgK=Y1Q
zB_7B1&G+S@lai7Up~1o2MnBFm2-%Ij3@RpBy`$S(K3o$QA+}YTBo`;(I30>9$zFVn
z?Cz^VY#e|rRAMvyW4!q&m*#xU$B!Y)Dm26<ruh*e3p&!$$_jP1ckb}V=<Fng$F`bo
z$n6v^)Uk8+#(vS=h~Hl4b=z8U>BX$GtDmGSZdcRIcVCa59@5;JyMF2xTZUTnV7;CR
z$zdAuqxiL7ER>_xRSZjGFC(oClwYLhGhZ$1$Slz*av2TRcVAuZuHiRlWlpHB_RuZX
z88&=fb^zDTMJKlTN?os0Pb=S}`F)sW$(Ez~k;&cy>+dfcYr-v8heB4wHfLixv%(!6
zw%)(5sEv}_ST3qxD!`HHhD4sV><)SJ<~AanQ}^@3#nilnxNDZeN`5$X{ER%Zj6oN7
zp#uE<853T=hNR8R&}70Rwl4XLKS(@wZ79SxAt8Z9-f7*3&NQ*kcC`4_1v=qDt1qi_
zDsk>EdaA06xz=5&>SmM1f;4~VZP&N7?Dz#tU2~Wm93Ive$aA+{sJ$SnYSA0hd4IgY
z7N4=gIY}Gi1f~^fSe9J1-Mj?~k3zhqCva8!hn!XP$ZfXdIawStgMayaIVIgmYKKP!
z){wKJ>um(?{xxe+9t9}WUf`(DFwtAkhcUw_r1$+}8nd@G#GWG~BipgH<bCD4{mq)|
zc>+dhX{$sqv&J9h<m2Q*4+}G6Zf@?#$VfiRpYjNRM53a-xAciNC&!a#g8VnCB6(*X
zxu^UkiIpE<4pB;Z!Nicn-DF~JZ!=8F$Sks~QSnxy?D&bD$nfxm`I<FdPG)Adw(<vZ
z_FVAbe;NNwL1Dx*c^Me)1E7SIwrK85VkfpfCTTsl6CSm(!Qa=@-Fa^Ol(Li*uR^+t
zipo-#Sv{B5qWGaBB12ZMw+NEBs|~rOrKQgYpp=xZDR35>Yo@on5nO0r7zwZ)F8)E`
zuX={QNQ)Yu*wlzb9?d1Ry!&MpjgJ@gYZ+Mbuk}83BN6h_-jdfIHZ7i@+@3NtR8k69
zFh>4cdTV9GX3-FjHM2-07sw)(mee<va5F>et*yp~CEj+^MgD4fQmXulfb<eGvx7+?
zlb>?T<Hd|AFMMhBnBZkft7(|5x8wTF@Icy)%`Z<-C=^=XeXYM}g?N5QxjUys%z7YO
z=^b+(FTLPe=DS<s4=sxAS7&zusg^#3;4C|4eH6u<GccI7r>FT&(Zx<w2VeP}2mdHw
zXM{KQg$&B7B<1sX*!mWk+G@(%-qFEYbV)AR44^5LiKQ8wdW8aazYzG8s46MNs|J3W
zN=Z$vtKHg4k_+2fzr?AxSyAuK7rmDfnN!OS&<ZWg%L+}#3ehz5xSH)^A@ZBgUTkm8
zwBNc_>EN(6F_D#*SCg)Xb{>m=B^SPZiF4Y*XT>CSsD(xGJ@K?n$E)g!Q`Bvingy+0
z2Ha{d&RzRjg%6)r?U@F~M@~(!gj7*cQ+v3|y$-5FdC%I`iymr6Z+rqK;Qr&fBcEzv
z4P~0P7NozR5wP;z()?6so$$3^=3tw$da8qJ8=Po0)(yq}Q|I6f#JA@ok?bxZ^y0eq
zd9_!lICPdW{ZU4ZhNO4+h7b9DFBlTQ7q#>xuJ#t}H%v(Ld>5T-p5GqwC3_HULi&J|
z30s3WBM>1UswtpCSS6)o&cfN?4@r^8V_P_foId--&f3tNcpS}`8eH{8GNh!y|L^l;
z7y8t>tMm<WFeC!2W4{Yp$bt9`l4t%O*bsaRgNFHpJ8@hI;&qYB((y$$$&-=>j~hDZ
z`T4#FoU$=^+S5VkVPT4iL^14NkSTs|1fImdH}v=56B7ZE(0=9n(yMEK1H@gw8(f!v
z)W(W-cTIO@jUGBJGCK)02@jQH#wUYHV#kuj<T&?y+fjv$=a(*B>c*lB3f_AVYMVfo
zhvHDkc|Nhz{DO$nY?@|PkJbzPC*qs4H}Bo+hhTzGD%{!L$ol+weQ|tnI&6!+!zKh0
zM$U&1zEhvKNzL=nx&_NWBCcaaOV8_m8fISdn6F~txBOW+8vAIZE+*>Do3Xv4vUG!(
zR!jPr>e|PLJY;Fp&wtsFLZymNc4Xcp@%sGvv*S<a<jl;uAdk&=+P0m=CQ?$~Zlmq`
z9=iJa^$rr^Ct@3xr+c-Pm4jnq(2XW-Xl-L2s&Fp-ItMp>_zY{&tEH=3WZuawK?0wJ
z!%s*^nS+}+QEZRz2e{G1M6W>srL&#sll-M2+Gb{E8G1!+8F1=5aO$4wni|LHo`|q8
z`+Cup!lgFtjg^_5DNB!<y)&e#7ue(4pnMlFX`sjYZ$xG*wA1kjZ^S7Rbhcyf=d>ys
za(8}z#rXUK7W>-w3Wc15g9DtOSuwWIV`m$!ofBC*g0H~ET;KQxhlCi{MkcAUjf<D`
zzmOh`6@3&)CvL$*bt~w?R*!AH6aqo=s?!|M`swQG>aMP?#25~oZR=!b7OF(kUZ{6*
zy!kYZz^|DN<1<Y0ZW~iM$Gz{jd{8>>?de+=Cq6Su(*xTzcM#X80uXk?)#TzvUl?xN
zFecpeA?}6fpr)qgUgUw42-cR9larT!QDXV?kVJ4dAco7~HI+eh8LDjX_9kb}_E0kA
zX%?;gd;|}#UTh;RZn{s7=DlHWWSGVBL~AM#2(7KHp7bZFcubZjJH^+k6c6T4bpIwG
z$j8FG1jmgL4C|fs?$U^+Lw~^K5QuN@??m~I4F-vC!vy8Ne%)g!RX;2=)OEGrXPL4y
z%edY+&W+EY;)Q0Gk=s(M`p#;lc;YtT2B`XHRFV~-G#-b&ax8jHw@$V7J9dR$R&jL>
z*P~#HN5dg7vokX@o9@36pDGjgWa7cy52O*4M7+Bdv|QEeqWE%%ndqzd_FPbCXy~s#
z(=b9A3l0trxIM0t&H2r>g+3P?N9?GZbF&@^Q(kLJ3shYIAQ!wT^)xW1tr)X**S(Kq
z*x1=?s;imrM4qLin~CaPBKNs$pWC^)xd}Iru8}#wU$Ry^-kiL!uyE+JYAo;}>X1t?
zT|laxJTi%0f4X>6US9r(FDawB*_|Iowz9IahK5X}fdASNJT^nO0|)097J_Jn`D{mi
z5Vv3E;$lf4Wt9GI_!+JM_X5-kgOJN2D=8Fs6X^xhY^<!a&AMwEpS+PuN^{c%GiQ`s
zT=K&$8aF&SvIT8NNE&DR%U}T)+WHieisWtK^mp=|7e>Y!-@$X7=zX;4{i_O{mj^ie
z{@g%0i$Zh<#w=ViUIQp8N6R*UPnMk5uPG!*f`fxEIQ@E3SXdY%?8vE&{ZYV=lPV3N
zCVife3pHVqGC({<m$?gDWnrOu&coy>_qZc`Kji0k)%#DLG}YcJmANAmbU`%nS+*z%
z85!f$=bl36W_K$U6*5u|t?b+D>QF@RLgwXZkMbwZetUchmr+tzQ$t4BuU@hqwy3UJ
zdijGSV}hrrXGZb5DZJ_^KGgB~$h<oDs`|XGLAsrD*X|?i?6S3Sr$c{L-EoP!OnT?d
z)qCyfy2kaf_G`=s>78u+eSNP|1pp!UiJr*W*?F`s#ug{NdBq8q$H$K!Yr?sLsCYlB
zXXvH(NxrnYlyu#=?koj`UV#I;s3-=OwSOGtWeJp7L%)E6=?7J|7=`w(E;cuRfz2qB
z0BPH;^`*^C*A$IP{27*(mVkY0>&x%2t&ewG>2-|aw|reQ>`%!>JYtL-Jvbl398#sM
ztc*o<BQ-V0=V%F^#n~2E?c%pYT{?zH(MQW>8AT3#ZY$3H3Y+Yoc8o)0$#1@jv&FS%
z^a1w$VU%U(TabP4yx-=|mQioy($|Tty0B1)gCE;*`p&~)k7kM-e-=8s>l;9-rMd#w
z^8JvIFrdG)PDz^d{(V=_`Rhg}Noj>0(msBiSR0MofqB8U1k>)dFGR!o7-4?ny6Dza
z_2!tJ1K!nn2h2Cgv?L@X9zEKCrE+s6qV=_hq&CJ>&B0+A(nR7`)E}<16JNyhrgF>H
zGvY7Ac-U;j?X1O3PEOj6)@kl+w<q%tAKk7(_2gP3>=wtA#yN({o}F447F~PVx6Ksx
zlgD|cXk~p`&owzK)Z7y3!Ve7U=BW72<*6GvSnRq-$_LabJ(c(J4=pS>uUt7RWj#Ms
zrJQo-DA2WN^wiVSVkRgQt%%bnjNWWYax8a*Ja8GLQr9kDmYLWo=W<ul(TNTT$+8}l
z#*v%jo*Z;vj~v}3i(KSf1(`rgm{cn~zBWcU=hG*v+DKjqsU4s0N$7P?9N!tDaNk_^
zz(OFLsrT5nH8dRZIz|Sde$&>mcrdQ#g4?3f)6&_-TXZ0Ju&}Tg8yT&SPP<lGmMA7Q
zd4e?4*B7#4|2lZ8wk}$5VQZyNKg%cpnOghfM-N1ck7}tuodyHGq(}SaR#Zr*VAXb^
zrj6NWRicB4mX40GcL&3-I^|CO2Vhv`<hQ&h{A9Ev^ZL^xOCeQ;0500PkP+>aNA;Mt
zL@24LsmHv%&UjT2#Aixan7^c^9;!H!=S}8adY42>DM@+Uj^l~mNxQ{@zAdOGj3B!|
z(YwtmVRDj$YIo1wgS5wh^=A$NzF4!K?3byjDMAVI(CFHNx)RfuE2}wUPf7j($o!Bx
zI5&5#trD4{N&uV+pq3jAnc_L10O1h~$-#XxLZY%5OJ1<QP2?l0T>EocV%(vFMSdht
z8_v=5{E3YKCY8ofcWZzCu7pax6&K7409^6?o{U2D9}LIuE0*pH9KnBdPuv9B-=#>8
z#OnqZ)62xTmq4TF&;&IQ#b2}L=aIBPc=c#p+{I!yE&5A~v90ey2){gs)Vscp%ya!9
z*@(VLK`7_u#;b&8FX<zRB#ggi#SX_g{swS^78dv9-y>7i*vRV_p6JQsHsY3S)^2Rx
zr4PA0H2=h<=x10d(H+l*bGhVH7juO7Uq+@iKfiW+hQ5BD%`jy3@GF}0y^ejF8zt)#
z>}X{7y-#HdsUssJ(b3V1i;M7kWW<Oi=4XO(3g}Cv_+)}7*^%$Ct?GmlUuJlo%fGjp
zn{gzGB$qV!<znL1WB%vxkQP{A+C8=x;wUL7fTa$h=C=qHVrOSJGc^@@Vb}4{tUgv$
zMn>lF;luEIV|mK9X<V55Y3Y}RLfNGGC3XBeB=Cq7upR(qgZBLSh}W+jmL}9v7Jy%Y
zSv-BU=^hKI=8AqzO$}6+2KVn*1k!5j=}jj#Ydb;y)9W%0Th^Joc@oZY!^vebvof)Q
zzt436Adc)*ib`@<kX?riLP|<Xd9WgYnkwL#@4(<-hHk+~VzVO<RrsR>Qd3jAKR>9c
z;VPM|l9Fc*QBGk>@bx8n*Ej|jnXE@GZCj+eUCUS!>@72Mai`63T^~<|P`NVDjxx#J
z?)S;-^YBo3H!f^HG2rEOG;v!cx!7fA%RZxIn@+#{Ub32**}`-$z`~L{x6g^#j?9mZ
zb<_#nr0tGzh;yZpH2J-NU|F1mb%4y!1Ce2?@A>oRu{yU>R3qizgRl`&b(Wlb7zPa#
zgqC4hf%<X~(DX2hM=OzZ?r(&xe%0%{q*zUMu!wK3I%wM6xih?k<E51rn#@*H{>*ai
z+QV``&u`xnZ~80?j-RwQckFVTw<h}Q`prv?kH5Dx(dtjZK_zID=o3ECoUG{PCQ3SP
zmtX9*AvC^7vC)MTk72r-sgbRPLL%E<G2Sw&jSK^1ySX|yFfj1r#}5d}fTc7m6O)ta
z1gz*884Vf}q=@NgYK?65^z?uRaB*3Gc8Xe_nT!;zg^^8d)vDyu$_75Z%#izhKm{Ox
zw6rwH9z!D|k+nt-Zy0YOVHVd{SI=7ziSMj^vmT5^vN8Icl1t4f(WTH;ceI!v3M6kJ
z7JhCrT-`0)+2^Jn8yZSQPJZ3+d&kF*HY_pmb!g$KXKMmpf31mnFhC8;gfIilsa}w~
z#KHpbIX5Y37|;x$AP1PC?!bZxvF4_vRGIK_YJT<_U4vMD-1C#&xN?j_&Vw2X+?%$x
zwhtdZ0Neqvis~!w-B#XX3GYJMf;{H$?|<UNiRUH*-<~7vHdn0~n#S$y?d>mLz6?6>
z+qb`dl|HQx6u1O+@}3t!bfw4h@CmV<&4sOv6*<cBv_3XqbZ{46(5$_YB$Yr=a=M1R
zv?{o={^}Nu>J8yZCI+)wg8II(PL-R8BA0T09v$1J^AkP!%@%KhZW8U+e)wfts|$4F
zOvz61GV%D;11YHPv9u6#Kk+!{kqD>)0L4X%d$@OHKU5GZD&Ouw>cbm;RMsYRz`r~=
zI{Hf3G#?L7Vp5XKRDQltcV0?LN&+iH4k#_!wyXDf%&*ou78cX-H+}F`S#&fFEv>Ge
zUV5vkVzhvS;|0SYJW>Ya{i<d-FE0<u#Op>steR$y3hDOlY|p$-yAo8LP-~=u@Cx=l
z>qnH;IhJ_6CA0V8N>$}WFGwuEbIb^*4<<6*v1_^V+qX0=%*V0}p~*$sza$;KLJMPl
zx_$j@=Bo6>LsQewC7yO;66WS<tbPclDY9GA((m8De;pc{jlsl-I4i$vJV`4Q>TA)P
zFNKJRh-m78=yf}wZryFF3lm8zj1*sL@mQI{DQRX)#`8qo0d1($T$$}%wB0iytnifB
z-=<YQdF<!|ZcTs#OCnG1Zic1-x*dOl0g$*{LPbewEG#X=@xm9ty<w(?LbL#Igeh}_
zm9{ju5OZ^Lh-}L~vGLk_k5;C`jySf>sPJ3zK?Unl9V&HN<kv$@I~|?4iV7D7Q}dRG
zJZ>@nWdwrat=Rk|SVU=QFMOY!rnA^dC1aL<SwSP}5;}eM5Q!3iHCNZo>E42<$jG#q
zhYuej?8X}60glQ8=!NB9x8XK1<I%S~TNZM`wc*5r#-~SF;skAT(P&5{Wv9gix@3$$
z7!)*5hy432Lu+Sdpq5%KQrn(slYyVYSxj8K1S(Wwal<Q&jDycvVmk_*7nY~GlR}QB
zk+I0Xu>ziT8>ae9pZ<irqN2w{O0om~ewQZhl|AFo`1Hlu!)K{GN7Q;kbv#_ZxWpz2
zxqeGX{)TBcpAe2IieKt|k|<<^wUH>>bR9u)iyof;ve@$l)8D_BK3fh`Hdfq&S5WZs
zr_{MwgTriWY<f@$j>dTuXPstUNcQtPo@9e~t4?}F{=FY5W4^+n_)bZalR75@UUqv(
z?&F+_rJk>4K#vU!8i2b2fRWf*Xxd{E!cr5S3j$Veq0kOtQ6yfp!DqEEHD@7>k`Rth
zt;OS3=LRhc=cM7;`;oKXzkmN=5e<HySzm|-u@~Pqns{2|gyo6c{qg47G96x)B_Oz0
zroM+b2(F$8u+=Vm3SpB_4hDFZuykO+kxDWPKfKccFQZQ30T_Or^i*@aI6Rn#?w5Gi
zn4P0OxDrLL(bb)bjyv8@BN;-^bHu`1`uh~|pS#y`n1j24N(Y1PXS#Ut$p>VHI4YCq
ziJlxiSS5ZI@g6&NEd8Xk31Gc1=mw&^-X}eK%u+x>o_FRip`2YV>q~zg`a=kQ#E(fx
znD;@F03Me8hG2V{mVl5J)Id=o8N812Q)~Aoz2XiWI^u*=zR-$wv8KhJg8=zYG*rjF
zDdX{<ri^y1i(N2*fV#GJYCG<5e1S*sXX(KTmdlJhk|y#!rvhG5lV0RU?vh|-FST<e
zQK=a%5VG5Is)uiq`&n#dJ)zf_z@<Jn)m__q*1$v*@I*VF)TZFj?|9>AdxH7{YKd-F
zfcoZ+m4E-T<|x=d)Q>Ro90M4H1Q;}Z<M*`a?Gaj?NX^LBLZcLIZEY146kJ?f;J2-9
zR?B6guYKFgIZ(Ej%zizwv%OL>l`&}bx=f+()h_W|zEGG^qU;Ec5BFplLvC+>kCLYi
zX(UvK+HW!r8T~n+9GfgPO-)S|mF9TczhSBnA;>oG5)zIdKOXyNIu9zZ4*lx>D?a}T
z=?r#X8NCP;+7`gA&<gzxS8>`yaFmZ0n1kw{ir=CqZfDaNcNeFCF4H6ycDrSC^_)|z
zdWvfCwk-Zt{ZfQ%kC`d79(*SK?qb5~>MEF0WMY6j+uq)o0WN9@&j_Ta*9ql*`0%|7
zKcKG*BJ~SRVyW4qd%mW}7T*lHFNeu8`0W<Z%Eo49IH*Cf=ADpzqQk>S2jHmU!7W>D
z;n1z%THAb|_Qg%1bP%0;^X+k&29-aI78>Gjj@HM~0b?@98|65or>(t#lKlEB;(9oq
z2yYu-OS7_>Xi*0(WO}LHV>4rBcKNUbD_ga&^+23sZ&D=RRQsW$#5k*%=@6#k=D%>K
zg_8e<zb@HJ-?}BfKK8D$u@P<@o?*Iw7L9|8|5hGepW^u3|BkC)Wu|z;!rFQc7*AxH
zh7uBqb>DKS&(Qo26t?J!?D&w9Qs`dv{$_GnHy0NdlI`90tdD0UoyT;uB5g~sV;s|5
z%wIDgx!d|;N=60?1MmYmmij3RK*?C3P+?s*c|GO$7gVW;K~wlkrM4P9ct9&?W7w7k
zGe#4*H!e=jI>2Xjbz=4tq4x3s!=4;E3Z*6mhnC&ey8VV+MC}NmuNN;~KtXVdnhzvm
z1}%(f7%~+TsGn`3BrW|67<H-upf=!ykifs!*78QxHa)IeM=QjMq5oi2R#BmI8N0~v
zF)eLT#A~LQT~Ssxz|ZeIx1qV3T3(0(gI1n$%~kfzme!akkvs#Ayt3|{k*HuFy4Z8H
zZtb7$4N`EdXTC0^W_~{N*ZM5uwt|8fSeE4EYWmB3Aii?gzfVjAnvI8_-(z#Gvh11t
zCUs4nk>KRw>&LBF*`tT~d3ga!UXpt~D^dbAxdh2;PTh~q<1nM{(>8Z?0XXCZ4mm$R
zf2upDTi<kLy7%bm3-DwhIk<!W<=(xEq<5kPUikubs(=uRNl#DbymUz_MU~?0SsGxn
z^G0K}Kiw_GrwxxC_i=`pC2b%c=H3N~<>S%|ilM+_2(Atg{kFjGvfM(Vl%Y3w>QsBQ
z-I-TQGv9h6$=xqFf0Mx9e2M$kd;oRd&bVS$TgDDXVa0&MnP2`)-^0Ju1Jg~W80DlS
zj0B=yWI_JHgW+gFTVP_vQC&QES4;|U>19wgE5-;deLca|p;wAuVz5}ckk3(IEL8Y%
zKa+`tMJ}lTe1eebmAjWunIS?WBia1!17HKXb1FkeOG_33pp>R^cx2>)ke$hNPhM43
z70mGA;bATGGMIAgMkSVkfkyCvT%D&A8x;jqIk!Q@NtP|z(6BI6SN3z?kslF*&df$x
zml-5w5XYswI?e5xVA;)%%r4(~-$v)2n{D3t`lgTA6}IY{I``Tz&3h65zS4SzKOwIJ
zS<w1XjaCREnV$RF0~U2Fftq{CIe354#M!<&SuFztgQ@PRsVUlu+oIqwTULJ=`w6y5
zDKRmOKRv_1$OwQyPF5DmYlT>mltz<h#I&*qpduL(e*BPsI1La!QQCM5D=R0rv)*2E
z-190-1PCGdPJ;@pXJxZG6IG=nYnef^lt~`V`WjW%t<Lstr+&wohnri7*M8y^Be7{!
zfnxBg0$x|yFM)9*o^w5Ie@A*1>+LHc%y&L(TmjZoz<#0y^1ompBg6RA4%EOQKWVTK
zryg2CeFNyw4TsJdvRSJRV^5Zk7zo?&^T#!JXec5A0)ztIXM`x!8+-Hn<YXZGP~5%g
zm%^)P{xdYRp}i{d&<}Qh5InG6HuPhz-t*+abFp^G=N|h4#|o9N<IK<AmKMV)c{#aV
z+CE0m)(D_~s(OaQPfN_h=J(6X%R4JO+i~j4nwS0)`RzXyI&P-nC`(x_?I_R{oW2ko
z#SHbb$hao|M(Pl<>}|P$K~PRfEHPbSK%dHCwxOw9aCLWg-`U=p5)XXg3$Z8GY2bM+
zke7YMx<bxhgsi`M9RvA)q7M%nx03205GBXDm{tbT!tgHenRh^W6uqJiCd@O9QI^G3
z4wS@6{|NyN7q)NZ7<tEqv163awjHsz*+@xISz4$2>15zwzm&of>r}dYT*1iu!Qb8@
z5||I!q~K*uaI~g_J;+7wwL&|jptBuI&a0UR!KDP;@WevB_{{9PADd|j36d!^q+@D?
zCqh#0fAdXmzF~rej7<p{dpYh;5=Jy<7E1C6iKpuTrz$Ec==y>m;0@QRDXK!cfaJa_
zkPyCWbo%w>$pujt`B)Lbh8oa{2?&B_MYuw$prlS4Jw|ANVt+bV83gPfI9Tn={m8-K
z_C${uzn@b?Mjh%wna+i)urxP<@FWOeum|7`cr&@jjyatO>1v~A3aJ9fSa8~o=%VLc
z>$#&$UPj))7+s*c$WQ%SCd>`f?jQn7B7I_`2|&ifrDw*x3E%ur@bSgr_5&LC-tXCc
zJi$*y7_1r;{PN|m0VgkMqJZZGfT<W6hANKl!m4vNCk_#x{_@oTPrMKihFgj4A;_=4
z<x!@??R(rBf!99JLpZB;yUYzp>8BmTAM>^B@qt4f%w2f&=f$<K=OFI!{4H4i2_1jK
z#9#Z`rVK#2i>|@kc{?)IL;)mJWUg(3f0B_ftkWQMUWj2LQ1~lGr2YIqLPUe#RMzoD
z*{=b58R0cY2aX<!kiQsyx&^oN->|d&I9`if4g_KH)`Yo*MO{^ujG|(FRTVJM*tlV<
z8{t_ZrFfvUOT$s)O#_d+kou&A2TGcmxFf!nm-I=PAOW)C;PGbt3Cgwe?4dr#`x=4p
zf*<f}gbJ-pc7}w8s{ZlEOQ?FG#N5y%K58deQ(y?^PEwu|nZaf3+Mo}#x3shX`#~H7
zfger-v&^6}kb{dWXW0y+#d1g}YM6Z2!?0@&XLt9-&(tyL$fzjLLA2G>?02?Sc9wHW
z0)m2A5}=GW;h|#i3koW6n2NNw0?%`cmB8C9O|iXK_1MDjn=dI4Odg<LfYAkwL4)T!
zMfHpl0^!wYlD+>7?&)_=Z1o~>MxVoevv2LXc{UGfUUPuhn7}Hw`s?WliYsI78F4=C
zJ^4#Pt*yz4%WtkJf<5}BFT|(+0E2IKAMV#9-BXM_Kw$p{`$Hq-aLy1asDoYmy(ts1
z$|*b%@~>XKVh*{?##ZeP4kz8Zc~1RSEJf!mh|YskIeptBQI>kHbLHZj{ih+wuh!^q
z53KQOYe%`S6x3#v=q;|}q?)d?lZJ&(%E-%WWhT&HyEfi%@hIj8{spj`f9e&JylHas
zcd(GK&{NXY<tQqZJ6jIyV@j4{oES(wh{Wdc_2nru@tXd}oW{;yfkIYfIi_)i0*#CU
z=56TvD^MpP?9+<77lI^k{rYub;f<CQm9}f+<Kst(X}*8|u90ohxP)t;;(EXrwJ<*q
zk+-S2ncuwQE~scGkZ`roZ9?wA)15zm9+V>!o{`~UIAQIZYmEH-?dE)PhlFrBE(^8%
zP^yc&uFm>gaPjpuH8T@E9go3WW`1vQc+s&hjO9|2v{d=Y^W4~v6O~#c5PlVo*zvJ%
z=Gt%I>FM9u5)x<OeGq5jT<2u~>HjQx<a3&i)1LWn6x{wID69cI+ayu?-`(UImDyOV
zw3HO&k&N_o3&^d@;ax?KR!W~9&C1Gxsz6^yM@K{BHiC>rfhhsPDA_B8WFUOyWMq`s
z!hn<p?B_b2H%f6uV-}REnZ6SJ{M*J`v_zh><&^p)jf_De1I|P!RBeG{hAxIpRNUiI
zJuXopwxlsD`I)cFlAoo?YUb;;rFQ@5lVj${RcqWbDUkSo$%M}3Q0<CuEj9xs12UjE
z5PZs`*Xu=8G&Kc523r`dSB&DT73$F19Jjh*oK^Uh4ud|^eO%ov=JBp={k5zkH5C<*
zy@?LGx-nBdEiI}_XQ9M|641<JxT#5*K~_elUx1UJe+B9w5X7MEBrq_LlZ&g}6a(|}
zt?=p3w*qM{CR{V9_&z+})6)Y`04P?0@tI$sW-%lHjjN@|yYLO%MfZokSFQA1AIqwD
zxF9fFH`&QW27UoQ-#^a0k|e#yC;Z`ogTUJw&3jL$mPx5Vp7|35E%-q>QM|R>O)CTx
zJrb?;K)hr9>?r<*ToLj34igg-li6u|VfKf>nP4n)a&jEcF)s1&@^<P=XqoQwb85rD
z5dW|EIpNh+Q2I9}v!GN-1DD8fxW2=1Ma=i_xw;2LA2$5}uGr!5zj1c7E!@I14Z~@l
zN*y+cPQ_pQUAY5PVTZ8B90Jy?2>JJoCWhRaSKVcia&rEQU%Il46*u(3cbG-X7(*eA
z_(w#?`q^z`S;msM8>R?PZq_!jA$LT!8M|7a%UE?79sAqid0*k2W-y?{`chHbQw2QL
zGV(c;A5G5JVL=yvk>|+o1Wcb}!FjG8#R1w0J3AwTS;QywF*4@c27wnuWgYzv__6{@
z7ZY=bdIgq4TU~ZG58gZ45OLiYoDW!+CDYL@WXVSFOsxC*I7rUb)v^p!KuL|RU_5r7
z8B~g0qXJ*X3Nek-M%$6o3Szb+R@&M%<IO&Ft_>0#S@-~VoZ37mr~zQiZ+_^dcFuhW
z!KuB-zd<+vttfGz_y4bWy^>Z~5wPwGZHB9P&Dy|sb|1Jvi(c=WD#@JN?ImJhS4aax
z=}x;xZ~9{exkoT1=4<&!b@FW7dvfW_BG5A)cKBq{Uy1I%g(s)}MH08w{^{!81#hiR
z{|4T~?I%<-(*3Qk$qxJ8$Y9WTBTvpKZ5MMyG7FD~&Vhoq<Mo^3!sU7U>{-4QnL~K_
z__WNl-Ry%O#~t&$%R>b|nFdIfRUs@#T?FyK<ky4aPfK^3xSGbb4i=qrfTG)DFn}LG
zw|bfeDdf1ZVf=oNZ#l(=R~bT~*|tFFY4)4*i*Yl=e@ftWKtE>BVg2O_PaW#iX;7O<
zt~}9``h$ef-@or6QSEV12t`35<olgCtl4v}QoI<&K06v9-TYH8pwH6t?nBEAtUH^R
z?LR7mIiKzULbPhdJ`3^kB23UK+RiR#Aavn)0x;2KrHzS+DVO_PybR2P97)C@hoieL
zGN^W@M<^;haeIJ@z-JVjps*|6N#1x9y*K3kZ=fIS15cta`y#0wUO^jUdIJ6g7qbWW
zdn9o`a`N0Sv>YJ2iE?}V76OfZQ`*05aZvQ#-vft|1a*7l-&+Hii;Xe|f9ZfdQ!j(k
zYkFIznks-gF7d@b>#fJZHmt0zt*zh37JgcdHGir8i0574PnbX253f-F7e4eYw$)?N
zrASANWTTTiLXwm2Lpx6Q{EL5N2yx1P<NENmnsfM%yH{sLGL%zXx5DzNB}it4?=Xa1
z*4f;k{b$%64n*9)K{S?_*!p?GdH{fUbB`7ZZ|*tdu-lE6|7w1I9)Q}LH*cVDeH|Vy
zJkG>`M%G-dxwWT#Hw1tS;^w<X5+$IT!B_;$gOZXGY1x&G8@r8gH*$=)BSK{_k%AfQ
zT!8fMr8sBex=nlKv7g0~A35Er&lpSx1`(Wi?b`bJ7>x7EG-%v?%uFX^1#O+}?97c}
zc*m)U0uD(2r3_v;o}~PcI|6F(JIpGos-e42;wxTHn!;nI#_(AT7K<GixF0xJXkQu}
zEc*Pp3_J2H6EicdP<H)py?x|wf`4Jczd;~eV)KIL&r2$)t!!a_qt0>e=l#nQT1~-z
z1Xe6=vo^fu0SO*j$)Hp+GB%DAvac3m78Tw4^5hUe8_+fL-M8|$lE4=Af2l=c@#@^h
zbV0rUMb{NwXJutmRn;FaFB+tNtd6le(^ws*^-Qz>DCCyEYPx!_qN4#d^@DM}%;z-N
zl)CUYD-yq}wc9;=Y!~|&I{T8IdV(MWp1t5pa!#>*xz_LKiNJ;4I&P<pHO~xuh(ZCE
z7Rhg^r>olwBFYpO26UpQM^D3j*2jsL<mTpn`t;J5St0s10s;@7AXHaZ4-XDbP-Q!D
z{5bIikyY^jfvWNgDp)A6OYB|&aYrc80kt+TJW@)FNFouBcgBjRNS7wa`x>ljWmrgy
zwp~ce(q{ken8<J%i7*DA+USo6Tj=-$(m-&WDQZA5$7s!W#Z3DWz9sMfb@kA4X{lX*
zL1gDUV^AT$j-S=v%=x4ctj}-9`(BL-P!JN0Bj<wv_Se)ff-js?k!YKw5cAl9p2%Tx
zd|QD~c}`YvTSte+hQp&rk9@8vE2^l3Y>_8s<=;0jNOJolrSKvEW?o)QVqzkgfrhF=
zr~-^YF+<ov;~+!zj~}5UKViX{+O=6ip52B;2^?{OdyTF#Yp79{Ov;O0*>HC`c%S;4
zWyapt{UgdA+>8GUsF9STTwYm8)(BF3BEOGJ<w1e*9LVx)moH~dpEtvF;lrzwzO}U*
z6*cbphfJm9#zlKP1^4O6zZ+h1EH2%}pe-)%p^OCJRJ(U3z;={)4Y<`L;c@~5aI0WG
zEP?q2jTUCcT3S@3v;Z`~h}-=Bj&_j?X2Cs`xRM_H2;gu2Qno=QBCz%&q6~%NNLHkC
zpDk_t$EV*`TLnR^et|8lx}d$a%gT(Q(psc`baWJ|3J(Z?%ZK1G|6ege8>(7e*Liuv
zEQ<w4tHTxsEAH4f$?yS0Fhj2X-E@@mFZrPwY?!_Y9pEup7|nqC<FJF<1^2WY(4UtI
zOwZ;*J+P{+skr+(FO&rt8d8ZUm{rPsNp+K-G?)Wu<9r4>n)sfx$HrjL#iG9->{57d
zQjQ^D1?YLecYza1xWuW9o%v^VkP#k*%d^MQ@8<fG4c9tf9{wYRfZ!x_AWEo$Dh!1j
z*nIQvm-|7ezrh8qIRpfSKR^)te2??=x$8zRwr=5DV+d~eeiqN+mEX$_^o8CsC^M4a
zDnrk^bG=7}yhtQI<*pt&^Uq45xfcp{hEAHPsaDUs#}*|I0@Q&2w<&sC5&zfxPmp$1
zWlwXHfbQpmGV8}KU%XgaKDW!NI0FAAjrblwzKa>I4pAJTx$xL~xABR9h_l~yzm=P8
zzjOQc@$@~ShJa{aHuRnUfW;IR_TWz7vBl$0*GyYjvCn_gIzvh*9QfR3{CV-@!wr6)
zecne#U=J$%FFozYGdu!-{B|7c%rx)`nTrF!To)r86Z9&5-1TH`ItF78lm?4pEKgJ|
zgxFYKv)6caOA(5=5Jj;(aD0GQ<2snSzkNe6zyj>VqNweIOUm!#ZHB=1Ui2FPx*YGs
z{)3gqVSVj_Td9~|-E_;nU}P^Fk59*$8y3GYKcSk%Kl|Zt25!HcnD6Jfy<Ou{f>p~`
z1XDOW8(ZPLeJOMWPjg(pTvb=sX2OGOLtm!~fVvWX`todz!IlGqTWHg^oa!st$tl^I
z+Vi>33@Ll;Z1jN}xrS2D>4`7cfHxM$7l5;9x|bX`U29Au-9M{9%iIYS(n<7n^JDb<
zzl#7*wj8jTBh}Tpw6XFeUf@;-f@pYXNMQ43_4*eF7y+fet98R$3B5e7(}zD}Tg~}O
zz|si3j0Wf=;6lZ_eV~J2qua71NjNAEEUdb~$wNC4l;<U2y#N=}2Fkg&I;YP)^$%9*
z0IH>|xUCnyAap1qpbIBShm%g+eG~jL;2yss`Vjm`Af<Ne--D>p<nb9_)8lQ(K6tJl
zc#9bOXF@(o0);9*GRiq{D;Ad?_oV&C%EvzTY=iOJqOaKP`^$?>bSvuVI`MToFM|vJ
z<wo~Fj&bg^V%<SpigR1mba24RGuPDD2R(lt0cM#%T4D2*2jIWv(kpxu64Kn%G!Hz`
z$mnRvVv}64o(6xmQ7u)95?)n-t_xo<bb;9KFx}(4IM#^w&6au|1`#iU`+?troQ$|u
zkA1st0_&MZaKj4YPTCW{vvNu%4w<w;YCLN@k0pFb{TqBsyosVG+O6Xo-`xsn7Ej!B
zieCT?Y<1PiBmL9$?GLD_AMm#CAQ*224he9Ii|=$~8UUj;d37XAUGEiDlb*S~J*Mw<
z`zbY5)k45Ah|t(r1q2w?J?WV)T@s!BatP!-Vd$90nrj-{qCKLZ(0P8FGhD9kbCZXF
zPt3il{uqbXOp;kP><5O7y!Q*GJ0v4~#&t9dRAR19NF;^*wofRlA2fd`vxO;&ttHx9
zeA)^RgX%hVRE;exqvTBe0^%%`L*(RA2za5{bYMk~z|SBMo|I#}%J0uDeauILdCmn~
z&lLW{V9{>H_dl>QFnIc2a9_PQt`834(Q5m|ok);^;0JN`{P|8zV+|XpWL@UY+MA4R
z|MuLp!CDNKEHDG|p}G(;I~RdEv|pPahAFc$(ORRuGJNrGMtXSrvWgYp-Upwx-6+?4
z;SP|R!`RjJT*i~&8w^%a_j(%~``mJz7mV_Bwn5@vpR1$`7lM|vTL_~p&Gm??a?4^!
z)Mu1HtcSJZJC-cI_0V|l`9&D=pAOI<`%4VCXTcqD<<cc@UwEY{3*w3Rf*<itI$(al
z%{gYrR9i(^S!{cC5d0|*PxJEfs!asFc)>#z0OTMLU9TOY;5!+B@2H170T>f34r5~`
z`Wfhg%dD&>mX`XtR`H7=uMMFp0C5G({U6S*e!5o{ty8M?O2p{L8^8^*V1!zq4tF;Y
zm^>**Jd>TpL>d{U4H1C-FCjoJ6{%b7>O5Q>2F-B@J1~zcje6XMM@iZUog8M5yuWOR
zpE5+@plt#uVQ{`lDMgDoe@3Q;t$WP*>z}2h932`mhf%=W1~b}rB(E8`2#t*JPBP$&
zmMW+%S5dEey%zPpf=p)tjgk`(ohw0BHNAQc8V=uqGBq?b1UlY&y^0g<1=HmYgCJd)
zW?;|$B`_UcvN@b66C(7lHI&`zCW$+#eenCKeUdloZ8Zw!7<89Ft)Rqu7Ffs-Q*Ggm
zo3a`0WOxrZ<xCAO_uqTfnR1wceW&Aq?oZGj9+%}ea6)OsEGAarVqs=r@J_#ew=^ZV
zI|3cY_<aZ{ce{4>db}Qgy?fO+;e&FDUH<DET)XM|v9Ir_vl;47`vU>df&Jw6_UZ3r
z23{DwT&q$_v)vRp+t7Km!l4Rp9agNmueS>X9&7(LIv?FPDF^>)vDvT1|JAg;zw7^x
zHprAN6teo6VyO0SjtSZjK_O6%Vc&;2g!^4||H}7U@a;4K)V1I{-+c?D`;-BR_kSou
zzc+xRJx|BI02?+az!0prE4z6<nY#XQ(eL*jfo9r*fn|G;h4A#oQPsos3!d~JR6m-v
zTO2mk+`SMMOvnNXUB+9Pe;Urs)9OFu=to6GNhyH@B)(~NegBJj=owtb;x~XDoHBlJ
zSs;*1>eXPbn48PuL@QAK&z>DoI-7*G69NBk5q^@4f4Guz2Z2T5-Vks7<?D?cyZI`u
zm$!fxFtw#gMy3h|nwgu2b^%Rf3SV3BMYqUB?IS9zj_i}i-LS4EN;0X;ta8mt!kah#
za*m@nqXq>ww((s7sEseCs7f&5cT)vOyUY#?C`dR?9H9|w1q2J@IdoJg8~+7N|N1Vb
z(G2*?r}<PJmhHiC(AkB~9=UCtD~pO9MfnqcSh!Dc_SoA$ze4I=Z#+t$>2ARe+f>$>
zS5vX<9?7w-`SolVa^e-FaAEbZ4NfdohqH3;OP=<xq3b*>P*>cyoYLfw)0)3C;e=aS
zU&1v}qthOxH!WneK=UjXgKk;7&TFc@|2<UruWFiZaM0*x!=NpHFfcq6Z@qg}V+Fah
z<4||*sN}gLo@VY=J3IG}uk)NmzPL!yZ#v@F_+3Li1BqO2$y(oR!b;Z##4hnEO+2us
zsl@-=?BvkR;B>@(G!CG}72&$j>!?)Ydye&AJBzeyr#BY%_M+KIi|Vwoc&E4((2cya
zm72KFi%c4dveaHcFjC$my68nBnVTqD%=8EMXcMc>B~3GqzEAnMxY(sF;=n-x__uvI
zXAXHI@491paG`cU9q;z2YmS-<R?Xg<0Dmx1zubC8bl(}Hyz_BPw4d*BkR98cX~EAs
N87T!sy5wEY{{ynT<+%U=

literal 0
HcmV?d00001


From c4cbaf52a84b4c31b4a0e620311080bf8409b153 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 16 Mar 2015 17:20:59 +0100
Subject: [PATCH 17/95] [IMP] icon

---
 .../static/description/icon.png               | Bin 12361 -> 5139 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/description/icon.png b/web_widget_x2many_2d_matrix/static/description/icon.png
index 2c8e1ad59d7db69e97b2467c6fb0d4e3e460c9b4..d7cdcec3b4f3db5e2af2745392b116e16a2e40b4 100644
GIT binary patch
literal 5139
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

literal 12361
zcmd5?1yfsHw7s|%D^Ms-DaGB3yL$^1_u}rfxVyVsaS!fRG{xN|xVyf5Z{Cl1lQ}ub
znPl$G&X%?JT4BnHQtwbdq5=T$PDWZ>6}mV4w~!H`&jRC!Y|stSNKQ%|c>C{>+fkAL
zJwdUT)^Y*>wD<ol7$7~90D6ezETbTSv<`=kPfI0AWjX=?<baI0h`RgINtTB<@j%+0
z&$roCC-8nvRMc?1m5e4=hSmG{0WHz3d%$|M$$Lu-#Jb}jYpoe=>Qvj(x3|kONT7dd
zgMyBXi(K6!lf0@>mk}sTzKPx=l3X-7c0K0oHhcBTx_YUZJ?Zy(vpwhW_rIZ^lGAFd
zH|1pzkFrBr;eyGZ93P`3{~v7QH57`|Y=nUPo7=};$UWAp-qjn$F$ZnPK}0Q&ufZr$
z?zIm`I`&B(0x<gFkIF5H`mP;{@8PG3E5Mt$+X_Ja-KS<snfwX~d?SUqk6kCfEKw1g
zeGckFa<BdY_sHV=(&=6bR(kk(DF(CwI$E0_d)DVM@)<sk=hgx`n7Me}u0S~wmTQ%N
zC?2r<_SSTZZT$e&c)7E^_3>GIyR&Ar9JjYuz}v+3O-2PhDLvou1JQP}e*|;9YLDO0
zUe{Ypt8H%IY%Z%GGT)xQDzOWRTz%NnOpaJQxKd;K7lbz!C@W+uR9(*YHJxq&67x`<
z<@Hg@iKC=e?ID@Xa99M{S;)7wZe2jXFe#94_APq3Oo#jE?I}#q)a$R$%S&rIhuCh4
zY45QWS{t6{!EYZP9*6T6pcU{Y88V&%&a>!pjw+O^$R5rV1ha_EDYrU*y`@-gJ5kbg
z#k^H}LQHb9=R|0|i_4JD<^kJluNlnr%rnjw5&x@=mq@bVd+oQ!Gn}!XU%4IT?omzu
z++|I4nn`)U-ABExJ>abov4(~&gKR*JjanxsCv%&9Arg&URyH>88k?H5D=RBYvMgqn
zmgtt2mn%Uau2GOpLMYt>Rb=Q`021a8aTDnGUL?}pDc;r_;jWvR;qGnIgr6K0ljfO`
z`U30LyZD7Y1htEL5I~O|zeWToU;FdKLPSYONCr!F3R_xuXV%tUi^K9eI&`g<8V(Y(
z)#T*R{=4`$3*gh~zm7@LAFw=d-Fa+I+c5yC6s`5$H89_NK~mb)dK)&l$NWa?WD=}?
zsOzD{j|QMq)a-A}-j57b9j3obD6KVtUi8h*JZ}9o9=RfEeYiR2UduzAW`iYt3f;+k
zF@Wmi4le74#zvHhmQ+5MGPT#o*8rq1-44ZY_f!tAB40Cpc`>E1JGBrK7)w*(gbr>q
zOEDY?6(wTsIJW50Yg92@AM_{;rhb(zkR3Q%ay#qDQP1X1f+K5mYU!%AX=BP5^>d2;
z$seuBksc;q&}AwspeT+68PB*A&q1`Do0}^;m@XNe*7_H)wVd<lcQZittFtNp&0I!K
z*Dv#^FuxJ((nTOdFG%W-Rv1Ajt*R_5$|f3>)}3=wP}3adFzK1PBAhb)PEB(o@=eKx
z#&z}K>qj#5s;@U^AM-Ka$~a?GbVfzQk9Sk__snyCx!OrIf*N#Ehj**Mx7YH?;-QiS
z<do91d4+-MsIs*76Fme0Sg^$wqO=IhAndvdBL@5@SIW3%hq($Z^))NSG&WOlc*A87
zVU(m-koQKn-`|`V(hdr{WsN<jmYrsYZE|$DY>0^LqL&cR{o=Jzj1u6~T!ls{N`>!5
zoh`k>;Wk&X+T-H1SP?p~ZAo?XlLwweKJm|G-s`H`dS8ym{d`BqxDvi?T71G9{!qd;
z0_5)~Y_m~f0)nHAEFu;y0dZs~y`ngB7*;NMggtV2Ak_4{#;ok9h=@{nhUw3(T2DeR
zQF?KWXCJIbbhHMZ3AjY~-=41qm)BoineTrcfo!;!K`*8h@C3$xAy+i`5eAXG;{Bna
z4imh_k%_9APF10yrBloz2pN+<ar2asvlEd+M1_=Q=D}&dE(Vz4gq4&qm8cUqbo_tX
z+TuriU_Sjtz1(E?7D~0W$v3gg3$YKE*g->Z&xRx=#XTre!1)T^<t3^Hn`-fYjPiHF
zn0LTZpz3V%hNgf2Gp#1utXji9#53mNkl#0t^9%je3gm#h^X42{Ys6}ZXfIB7`M(o0
znC?wfMAog$q)d~+N8B&~0Rb_1$_HH>9zmjz9Hqa&EcDA5Pxw@j^CU<0Nw@-V4q@J1
zAY2chM7|lxWSz6BTj@0HYl4U9bI8AUWeV{Ytmc7`VyAt6sq4|>zUM~PP3J7d4K(z1
zdUYCQdChZ}q(lO4j~74TGich&MqL%9=;8GIomyFW&Mp{=exWkaLa~pwR>Jg#tQl0O
zi$vD0vE8~UiNhD+!o-UAi{)X(3~it5e3-iGY<~@>?_8AfappsN41~4Kc^cPO*m=J;
zttJ0Sd(6+zE0ew8ntwqi$zv;MWbKZbF!bv^I*hEJda9P>6l&l1fr&q%?KfM=japp_
zEL@S8$I)L;H&XO}x4`;(aoN3^^f-{#_8OXad2ZlGFa=_vZ|vgf9jpcab0-GA*A*iY
z3wLTh&ns2y`@9Es9C=A224+g<Cfz!(vWA9~QqODUsRMMl&{*~yCe~}zv^UrAuxY0`
zqTDI{+HKSrKK?oi$D`N77~>iw$a3|k#xke5(Xnyj8o!hV;d~+<b@3B%&+MaFW$^py
zu8rxJ2&+klYmU!t;H%GdBRoCVxyy$)g5Z2q*(9i}q3`2hZvF-Jp?xTb#WRHP<Ex(t
z?dKq@{HiL9An(_|tu9B@K=<it+hT7Jng#N^LJfXxsAH(xXMREN6P~X%CZ~*XvW53A
zH0;DI!Ug_lG7R=@vhWzcc`ur#tfB)%+_tz@a}{wVQMoAn1hSZAm4@3VD(sFAImZ~d
z{8Aq?BR26JISuKH3VReTl6Ty9GLMrF7_Bs}8P|yn?@m{}H+zFn0WRwW<pxoTqlH@I
za|KL2L1N6OjwD@eS((!Gk7md)6ASCrnzdUHyMFbhc9$a!c?w$|*JA?WAwm_3l)I%)
z-uyr;@2&o@{ljB#lhxf6pOF~1tKeY7n_{%qcBFQ@$4a3pg<1V;qeoL3EFK=jGV8e}
zT=iWAK3h-qN_Q+=T6>muP8a;>VyBpKTkWebwS&^>0}i<&)rNzrwn2yK=Xy1U{4WVA
z{!W53sEi-Rl*i*Yc<G7~p>dTY>zDWgWHb<dB8GjH>~*?GB147W{y0MK*CA*hz|fTT
z^sKAz)w<rw^h8Q2YGcF5UzDxe=6Tab$6IO_oa<%W8pC*h`aZfM&AI;+2mr1sH!LX`
ze6Zp}rLkEtl#&p(c#XwT5x4t!WHG+KMFk*GBTLIfMny|uDhbUszd7aXYp?ZeNa4-Q
zRcap<sY+cv@LMl`|J{&psYSOKrz$%@_;vHWcz+<)N;MJ}t_m83yRI%tZ}JT&C@P8>
zgSw*0cqqE#I}OL#zz6+6ETf<ARAlqxTegyvlJ8B80C-5|yMg0))w0J&&#J^nvFXFv
zvx*((E^LwPcnf$ShH0^NdE-4b$*`+3xtad=Br+WOZw+6HATqQH6Pj$e+b)}lE|P_F
z=)VtpY3T{W9TGC+=|1DpA_1&}be>B)qiL*&g9v=6QY@3iUX#WVO}4bmX9i#7;)e@i
zfzlb3We^ghnUJEKEUgqR!Ze3RUGbpw>`ZE7W22ePuMRD3ZL7JN8G=pw)F(rM`7_q1
zDDwMSE2bi6VsL<wb&B2g-P2;0*X@eYkMGr~PZ8?y;Q200C0W`uEC&3D3w1ivq;)a6
zB)0cqfrjbSpNgnTUyuGge+|THudi1l48DlYYI7CX>#AByB=wZ*6a1}p#DBA&sgT1p
zevX-Q=79%WQD%%QP7{h8p7<q|1t*UO9+2`3&6u3{N%QC=>8|IuNR0bAxCz4l1n0^s
zRLs%KUKk<p87bJI;B8{Vz2LEYM;tfep}4eCA>)?g_&wSW$Z$_If5vHNo0u$baY>1k
z<2u<Nf+XHoKH8$cbqv|kRIy-453dvhw3^|BJ*Ovul4M{H+0w?^96>LeMtR*<R#qwu
z_=d||1jgB9Y)5Bpp{#>j7d&$uoVB^w$>710<tC-E3~r^h4x8nbP>a*2>6}+*e@!F;
z1pdKP?3f`#0z_i47z2)s)b_=jne2-mYx1_ZAxe8?D!7X|V_b0~Qw-V9neQECe5Mm?
zDz=oY478|oIfW1SXtz2aG!`)Zd>sDdugjt($mVvW9j@-(!oH3G8|Q0~<h2`r{!GAD
z9#v@I`)NE<e~>bcdBRffdS7_mV?AG&OzFdk-7Ni?7*61X_ecM`vqV-FY3VI2Yk8_5
zdw#*&{K|-E!N;9~tptdVqp)_R$K7dLmZ+hrlvD_=C_0T<Q6k4XF{*eOp6CF34o_`<
zoQI`$k1IW*{Wj3)LM?U5u(t+sT&yakM*5H9sa>U4y+MM)M7lWX^CtOB_nv_iol7<F
zm3$wI&iXLUyLa#EJcgpBJ2e~F)6n_BpD5soy3M{6;mT3r)G(ltdom@->I#@oWIiFa
zhD5ooJ;X)Y_<V|!*Xs}am!*ig&x2I`9{cd<2qqu10-Cc@q@syg2V=<2qM*U<RSjx!
zb6cv?O<~;QrwCLTcKE8dNIuH4NI1#oKJxT!rlQMWs!D6|J#kHSLfZ3*7`hH1n-8%o
zRyk~aKaWqWvt)F;pc|7#(T|Yj%8gnlocRq@9iSp2OPjFS9ICxJFWBgIlLi-<f<DpG
z<T9Fk7jUKT?CgxbP>x_&DozR0$6{a6_EgNQ_v@xBx$BIX3&-^Kli*FMk_vgZZ`*0>
z(V1!Oy(SfLwA-$uz3v?qdr5`4m;!$^`}*UYn?9S((ivUlz(T#-8T*0rqwaxo>mjn*
zZTgnzIs0IgSgodaEvR^}px$hpZ))h6mCSRWf;!MQ5$A)RJ4KRG#@%33*V_xy;M}}^
z=CFw}4K5<bEbvE}rXN~QzE}SkSo<R&U?O7Pnf*TO$mnt?YPnO{KI^RA){PEk@X1R#
zTQxMKH<S?D_e$%-nN=$$@Z0AEvH;f0u;9B3+_998f00l<)p6*0=tPO(fvkI@!F2y}
z;?nI-;y<SOaA1^-KB47f8cUv@O5B%E>AH(Bj%GLN&1g<l72`4c@o2A7yB=XVde@Qn
zbKu5HSXyYTJoRSlDZNI8{+mY6(fZTc-B@{5D{3U`V$90~CYj(^G^qgH$B!R9=i65t
zMj3NZid5fDzvg%Jxh?+Opu$0+Cq>0e(Q(ykZhvO(xQ=(YT{QP{vs-GQA&%hedK?nE
zT^gUwj!_No-DHXQf`b)V`2%FVxK}qw5H4A;Rw(l_gN?mjXByG+>&f*lPKuOPpzmb)
zZEzHlLrHmU!q#!5Q6?ZqTU1e9{b5pir!6WfY99JWpVvaOd1mgYnEoC2ij06F1`{uy
zLX;kR04~mVV*DoI$RV?a3J?sr&vv8P4m~%f2i_u?UHcq=`LPq`*jlWcOmN#}+F|~!
z0%k%QgP{a#!Hwg0+C(XFMB_25wYH|=+LI_~+XRQ|7s}$WC4OBv-8NsPyS$IK*nC)4
zzC)A-Q{UD)_S2^F2rN0*rb>z@np<9uMq`ugt2!c2odAs<>dCLkRXPvP#wRCR`Lt>#
z9@VaQt8Qu&pv~4QqsWWbe&Q%eEh-$p>-PHe^mM&<p4;4YQ+D8NfqZB><mBXxI}2$q
zPW+goSW+I&ca8?sn9v2ebBquX5glyw1Q-oQ5<1fC_2n)$8zsO%tJA_`btXH{jwf;E
zH}o9rTx2@SK<qtgCL7(p|Lowy`d|hJtc9k+kYlkkT5|#$@yRaOJ%L%M18I~J;?BJd
z4;MtcV-(=`@*81;B-}u^E<JaW(uLzXp;%stxiNKuAC~CN@{wFv*!wS{o@>d%V^T4s
zoK>BVmS<6lkVhjkMn*>Ofsv#vtMv4R+SAkZnVA{#B-yl5^^r))0{bF$M2MYMtK;q!
zU>`?THwwAx%|ZWxG`PVNEpEZ8!l@P}numoJB8n9`kO4Kuug8OufXR(_vy=V^XeMfE
z?@!j7z<}>;`FDkl;0sI2B!5-eZ*&oFA3ss1up_d7@BpUP{rotTW$e)Ej*?**pv_=?
zVcVpq$9+JPou1bh(VX8>JQv*x9r&03{lZVGiX{2lcWbwRruqv(H~?y(2(6XC&kV)6
zf2y-lc7_IIuA8--Kd|Y;_;O}s5W_mW`Jn>MZyP;Y@yJ1<esm~#{P;TB+Gtn;EhfY9
zcs>2ysjSAq+pj;NVBQi6@?e3gmcz2U8ED0xo1Gb}F0Izb!3bKrIJh|)sM{TVTWAu5
z^WrjJe#-_!%A<RC<KlmEpqdgun7WSZR@9UPOf$VsTl(1E3AnBCgFz?pe>5t1MsZ=G
z#UD<2R@5_+wV<tyXwll07U<u0;7uf93BY&WD~|?zbC?&oby;&a@bTbyzFqymTS&Wb
z2#q+ul)J0kf4&LoVqcgDHq-^T{hXISD^>Cyhxc`-xx8TA#7#9~2%Z0aScGP)0)zfm
zZ~bNs>_4kQP&!nUxSni^a0!g-mc%f79mN9&2M1%|Rf5#AcFS0HneL$73t%vj$-C;b
zH?hiHotNivb2tlz>mEs>9~bP%1bknf?z+|;h|85}$Tb-?N~P3gYg=3S`f<XTxf%6e
z$K;qhs3yLiwHxZrL0jDp=%<MQtneW)bdnaUdTHr`dp#A&y5jZrq7V3rQyQYT<<?L9
zfc0%iXzNr*FMcewXU0<mBHvDXUq+i?y1g(uti<QKvhTK!bb<T(Q_~RnKF>m~_(00t
zZ|Tk#qvg1?&Ulwl@9x1|KU@8McLEEzo~{hDr;X_^gQ6^1)z@v!Zf<V=2yI8E0q5s^
zm>JL#`Kj(+P?LITZS8mOnjo+Mt+puCe%p!OBRYBK;9x_b=yUFDaosltd^l_pt4yJ{
z48R_m0n6i>Lt305p3u0k9)5lRix*7VK*5}{?C@`5n@t`J$FwmQfW=~}aH|G2UHEyd
z+V%n<-(Gr)y}C4b-qHCmmcv7#C@Gza9P$SSIL<i6UQP8pSGIV|^1Ig&vbVbLI~aBu
z4*J{5#byhBf-%@_$Gg6eA>)Q2{}{%=DcdHc(^bObaSfx+K#Bx;{+mh2jse>}Q>rHA
z9Wj$gtF{AOnb3L2*Q8z(z?}xy@z+;Ry*y<af%uV19IDSBM9Hxu#!-lcBR3Rr)@Ovb
zdxJ)c60wR}?nYet3F>W#7ImsXC;#$j0QF^)=V18NtDE?Oi_y<W6Ap=J^G;y_^|DRO
zcpjz7IEJ<z=aZGA*)YEQ3X|BC=Y$^=<5uT&Ca6zr_rtU=hSc)l6IJU}B~X1^rjo?F
z6Xb56KLL?mr;O-;r(?@*S%bu3VbFsqh@F8VHgae_31w3Oa=zJz4xHN9DD1MO88pdr
zI*A1psQ6y3JR_iCWQD`=XcjBwFhQFdB;TJ5pf7QMRHcRr?3m2a6*cDhfxjkfgEc68
z4;fN~fIBLCJ|+6VX7cw5wVZ6?4Pp~Vzd-CZ6yQe+C|I&U)Z-8z4%m|1K}0|hwdmLn
zBSLsK40NJxMp3oK0BYo_=wN-b#(z&a5TDc0A0(>c)-hBi_I^&$^VI(rtb`=83}OU)
z15=absmn8nKDSF#`AhRWyR2u{N)|*8o2UZ9Hf$bHC;<-`=OzV*U$p=%HcK3w*8aDz
zx2klrna_cNumyFMpLT7+g^5>=8`{qEbgw|L-KpTn3(0N6&$cyGfOoUU={6M#MIUZB
z)wk=5q^)@V9khoSIAIblI^ge~qrI#EQ8~_!_&90!IO!b}VBh`4#i1<1A~?cenyxUD
zxWf0y+#z;$dOARwreV?!y<m#w1%+CN&v>vt(<!jeP(9rJzKea{CGO;)rQ2tmh)YDs
zc{K(XxaJA!N|5!F{uV7jpC3vnx)Of<{j%`tOVkL{@g+*UJI$@*0(yY@?pi{ClZMCN
z)|RzI<Vr?H^I%a5X<8KpluW13fx=X2D{#Qu#ZE$rf@qS(baCAJ{u<<L%q&UNg+_t(
z6ETMITDyl7Os==v19CxC%ic#gz$mQWM>83Lwy4Yq9|e3BJ8pIq)8^P8BKFT4QC8%s
zB0)ed9$qSmf>4%lMZ7oil^giCZL{0fBbC`fFSn=A8~GeE3}2>Ti}j^gno^%8l+9_!
zrr5$iwB2&@9T2R>02}!N4={CHPfhRLN95jpDq5o}5^sD#Qk6ALr_PU)e#q`rDKCHq
zj?+5KTd5G5_6;Ep_Oqtvuu}7#p6iG|(;G;h6{!??qhe`E3`d^aY%m)ESfQ3|M9P3j
z$aUZ@*b!<D$Ddm9DOX>G`}5eEwK5H&Q7D6SyYlZ&nwd6uz%bonm;#0NkGTMO3OMG1
zNPl2aWP%rk0!xnC=S)gGa+1Ns;3GCf>E?jpF`0cK#C=66R5GM*hv(IFCDuURFZW&s
z8v|8G92Q9k(IBzz?>Fm3-It6nMV!*@*6{B|g9wE>1q((3462Td)}9|0r_2?JA_7u)
zLtX?@wzYE$j}d*vLNGeC9_rhk=u6H516YISlJTAXVj3w|Mj)<!)3mdFVKd&K9uYBx
zQ=m<Or*Gm^I?M{lE+{G*;2DP(_=C#0E^%o#kDXHID%|w<j7FDYp$4Uu|2T=o*kHq8
z<FIfahQ32>B-oD~*bp&xCYurwsu=bQgM$y~7S3h!5yw)JJIL$W@qbO^PE>XI-z1#F
zRBGa7*B>rPGUzcIT$*U4E-S%RwUXxj-rbJO+@+uBS_YHeZ~zKeg}+rfQx52Sj&nM`
zgB70ND_Hv}m`CWNR+dRT+NI>zP5719dI&&N^hcwryuYYJJBlgWk+1z7ENY>JAG+TG
zu(%w~Oz$<L32Ct7#Qn9(Wc|~LxbLu>C|48<Hkr5@*olUMW?<prS*lFJSn|g|o@Wz_
zC04V3J+>B@pb<<t`yP@5atQu91|V0fiBP^MX^d<9dYasx@sj$9gax5Ml!H(<4(b-z
z(Qfe7e9?F9LT%J#OtzPOu4634fG`a%pA9?-1JSogf%P0GIq?cj2Feuh&?8sy<e!34
zwGvt2@8WF;@sMBF(JyBN8=o!?w9f=jm_6{y6f-#Pa~@j0CB)B=cmX>E-{*NDcDmrb
z%`b9lU0r$|%!v-+#V30`?n%2k#3sn^Yn6Ap{O9o*)3Z>5da*>|TNdfo^lLT6S#$K^
z(QPKjq_6f1iWYSY34~7UG>{>g9@$dBzsqhoGDKf_YIZso=V=9Q6oAKmqgyNbC|?<M
z_+nGumYqk0%!eR`l3=9VTGn(!aVC;d?XM3ua4UFIt5W)}Vtt>_^BDYD0tcRlL3+l)
zpN$Zi90QSZ8wSW-#7s)grN*%stt%UpBsA^?*_g1Ug@s^{puz>{bFfdrvpQ7G#02EE
zS1bF+g@hIw68tTho_~ysQ$Z2xd|EwYilUCbDstyQ9c*FGyuHdr5I8FP0}n{HGoF~h
zbRU|BWG!x+#ob(L0NtkJXu7?j<__l5t_lu7?oe%)VVeibH^U;Wv&Z*!b<t7HJ$G=v
zcUrcv!VIK7|2PzK6WcqC3Ika8Qj5bhUaw2+;Dn{5hAa$S`Csq1Q2{efj%Q6;go1|O
z4L>-;thplOndSjtdnhL5lZ`7Dww1NDGfek{iD1IGnUsm)e6Fqk!}L6vW%e%)YD(k?
zEM&aBE*NC{@Af37_R&KhPVaF5gUt!-lL68ni?%>_-or8xLO{(bKWmTTnm6E!tF9i1
z&Bf4e{&Xw^*IiZc8It5XuKvTuT)n;^N!1KGG{0<FDS<J7BGEM(60#m`ZS5c-%1m`T
zXlH78#^J-3c8n6z*F)N2X%@oq4zA7h<Piq2h7wZZL}pG-^?>h5o2%|<knc86nGlk<
zIKn$&JX<O_z>;#9QH32H!F@kteoV<=lvmS@HNctmN&zrv`{1QbMwBLNC)Jh;@{qM?
z3d>kcgMygff(HptUl0d|Bhn2E$NIB?^MDxJy5tG%9oX*7G<F~OL4$PaY7?oH2tU@~
zz122t->DzFak!4qyFd`;<lvC@fiy1F8i&j_X$W}V+am);wF{Mb%73<`-*c!>@G6x|
z|6RC+fNWRObvnIUy!X<~C8_>FQ5sV+gVq*|@Fb`!ZrH>h#%>`&48t=OC5@X6;Q7R{
zXNAZP6je<1@zRC@7!&*lG6);B9?L!$z$kM%r3L(@iqge=+VeWX@~Lqo#Tj2XyPkug
z;=v|u1ajz{<~&?Cq$<QDax(6d6g*If6ZW)y!J}-b^)rn?oG&Z*vOSmtI(I_yEy?-q
zxiGMS_MK6${l2g$S1y^sfxx(o|JZaH1i}2YeqEAUDeJIiAXb*BN(&D7vTNr}G*9Fw
z_FMDcMuywzb5SBrHe@(%KP!alr)!^vF2Lh<)UYnq{NPE6%Y0(mJKW){d@yvmYT*BC
zqn3Bs7DawRn}uI0MMZ1tl#F@7lM{wLdP$e%QRZiU;-#gi4Aoe_-9(p_Arcg|e3t{D
zTof_D-`Bjvf{vvkQC~1tn?Et3h)WFVX*=umT4{k~9|_#dsP$1Fz9ZtgW>Q$KHI|wV
zen+(b)U+bH{<3zrfBW?`_bZp}vrwldEtVm9rq;W62jY|$N8)TKMe3YBK&I20+Q{5n
zGTG~SNSpuBs_U|iQR+t%I}*;bg$uZeho@(CM597gEX-l-T)U*m`*eFp-BfLI8okmK
z47$|~SZ3EQSb}@&<rS}2JU}o6@nOh^uhAHs{V?Up&O$?~RpSsv^{}eJRxNT4<M`8;
zPz76(-?9n_zCV@%0L+p9v;e@9_E1ys=LDG#06sYDNr#H~^;aDkD|~UtQ7c^zIKbf*
z0`0O&_S&x|u6|!c=%2$OVPwXW-=3^mRcSXV!gilDt=<~Y5U>6D!y$!h!VoS&sbRZP
zL!m}(d3rZhtdC+v`T1+>dN6IEFqCu{j3#QbznZIb1G@1vbSU(_P8!w93ZOH?Ipll^
zZIE48Hp)edhMq@}Wp)C$#J^*?qR-)Ht84#c<xOQfILa!`83kCF&Sm$&$Y>76qhrf%
zu-#hg#78jQX!<9F@hMNe8jy^xr;<;{tLv?+2)@5kRvzIb^S-`ip1}Lj@PriQzt2t7
zAd=~25q*2Q)82a{2J-d!9IQ0S5kKK;W1)lubcF4LF&J@C6GwN2#dY0QUFL<nH{i&W
zo%Y7!zPcW>gzPiaK`Va{U;u>$Ou&l65DAzdne!#+gPyO=a<*!CqN+Lr{w&n-GnF|$
zt~Yw!iFHm(yh?Aw3L6`5Cy0g$UC*<OO1vDFS5xAkRxaBQkqE*1qP(Ye2mVd7_w#vf
zBD@DCcp=1?!0XGLc9UlC#q1}k=*Z?&xFH|uh50zb7e1$DbDIa6`u&pX+jfkemx>QB
z$F)>ghkY{AMVAyk;55&T%e73LnFVWsP*#>|{|0aqD_Z@&-pXjclH}%ZvaPMZ^adFk
zcS~`Y6D!Gd-LF{#QS7Y|x;=|Pg(@NJm9KCGmrlTvz4c0AmK@*G?>XvXpN7X4kMXZ=
zf`-eth0c5@Y=dKdQ$K@5DUxN2VjE9vG%B>4`0q24lkxE}LdKyOb<z(GX(p4`2^l!;
zdi#Cb|6b{QIN?h@bkR?ERPUd5Lb4A=u1KjU3%xuQN4V6p8)?(zvlD+gzdYXToiweV
zp00GgkpyLDualh|6DOwnA0_!$?|E1;w;eb2ctP`U{RGc8IuHx8F@`e1&SxEWb;>k>
z&<kHco8*LQ?WQWXe2c5S@om(qrwUVo($mvZ?smNZ7@i}NGvx6c-f2R4jAJ#nF-*pV
zTZ1`9`7;{g1X#FbiEPzG<N?jz(A@X#D`7ln8poPGCN=ABkjtaP{Fa&MA7xp4o=mOb
zgaj{CQ<&&HrBqQdF@}b=zpu8vn4jvN&5gE*lD;U7s7<Z?0t?I}DBfi>*6YkfvVMn-
zLBLlAL4EVpnxNw&F^_Dhh9P0<;979HZsI@U3N;AUK~G@vD|YEmjuCJs%Vr;RX!=-v
zd0YU~=614_NRO{Ua<s3kgDe<Yn1CB4uE`$<BtDu>fFRZSU9Xq{9U(rQw@bAy#zS25
z^Ro&}xTqrdvucM9Qab;3c{fQj>*E}w-!0SA^dK-_<<o2Mi?B+z&&l@E@)>L_HsiIh
z6Gol65k3tJxiakwET7wNXS4J?7<?EV8);2z%)V4@RF83{fRmX5V+#m}YsYH5m;Fd>
zT&=fKcUr-wR(^P_$(OZPsxE7@*51NO9Cl1hQ|-9UF3vDYM`F6?Q6rj{^ToJU!9?rC
z$$X4QgrH4Zdnh<mFn(eeAHtS4xB(~%Rm@hW!ifxRI|yEku?smK6r~7iG3{RxyJc|M
zxn>$oj_o?W>{&B`MP<eL)8zB_Tghon`SII6CCQ$+5JS44<32B?)735?pHSA@*8-^+
zE)%Dg(InN<rKKO&*Vn?byr~rhB~q9#j|x%)%^8D#ksvm&R>eE@Sp&Axv@-TRWmzG;
zo-rnH$o9C2NgT#d#KG?vN4qCSJMwb1KwvJNicK&kE`lHDf(9h^byr;0qtSmym)!~{
zFwABtNL{Nd=3o$7qb`2i-iX<Mxzn~=&6cN1c5Z*=OHvib%w$;k5Qr<9TC0gJij0ej
zfQyEZ+kk@s7-->B#vym}qJpAC^KyYdei#=AR*sphwwbBCPQ`~A=j|;mY0P@<nl?)f
zrP*i>99WA6ze>mtJg9I)c!+}&aUQ%$s~~>wMIIC_?PCUvuotcI+c}DCZak<9DEGPf
z@gv(TBCWH#V)WbXcAd}%pV<qx$q9_(sY1VHn-<iOs1T3gZ2ZNwx$(>!<xM`jz{Q0(
zX9)zhi^7GV@AR0Rc?Bf2YgME9=tGy^8NkxWY4RHmkmIhQ0E^7K_gMX7FdOw6dMz_o
z?fOxK+|e?$--Ku@Mn?Mxjf+*oTie<?s;Zd2<bdff5ug|*5X)Zo!-4aXjGGIuV(lLu
zhz_!0A{r>?$;rynGFFz_N5E-Mes*fA_c6Pu!~Mc&7Ao)gUahxkf$U(YprBCGs_-pb
z>Fy;vm*K%%&&9=scXf3&8{&bLDV9ndD3lL>_j4I^sqv_Vmp%N)UiRuP;%-6>U^(dy
z|K-7B1&&nmMXBfRqdHo*hB5ZViX@8E4yM_ya!jJsXu%zuA?#(5J=4(ss!>~Kx=`az
zmk5jW)n}x`>b1taN09VwE*7KgIIH33kH*7}>?1*LvoQiDD1H4M$2gKO*wB80QRo1z
zrAn^K>-m+y7~gozKL@ushtc56iarf7R|^(Y*+F(?jzm9a8k=vuSZ5mJG`Kf2H`mL8
zzNRhp!ZE@2CDCbu(dQR(qUsJG2CdJmUXB;>n4xSS_J}!~HJU2Z;&KCPIcij69B!{<
zDt)Y!Us_L@$83+%!Dg*0SeNf&gj?DFF0?GCq<7(h!$g%f33)(#B;1dDo&Bc!@QuHw
zCW&!@-R>{_2!ZiTdwm0j>G<I+1PWw^>%oFw?J<y!ccW7}GzcP{CcKy3|L$ey^lE(G
za=?xm5YBd+Fip`-COy7>sxuw^!M~vvCJq}X9f%pLUnS(nuE*B3ARJZG9`8R$!(+Z_
z@17e=opmi#K>HI&ZSfhm9bE8W{p9~>KN3q$BSXhi;7%UVaVHI;`||S}Ta9c7KKW-{
zKNhARqX^qH&63CQa8|$T-ChN`%-#BkNbm5Oe^8yZ9x=fHNAp!L($EpB4|OCN*|p=E
za`23!A7)+(reH-VvhiT#rokA!J?W1|&l@MPj+}3!$pS{GtdkrHGqbZOT?}ws6R#f+
zb4Qs!TOJ(-LVKd6+v(SA`H#}?H!1Et`{?%f9*`CrUdn%aSseYC8*lZw0qtnjjA5ma
zm+oAU+VISEv%TTkeNMVeEYzgw2S?`k83&0TRd`h!yhGAhT%E^Xc<#7TTnvT!aeT+#
z&`44aEe$6vPFOC~{cGGpY>3p(y*;x;i}-0jOXRBv+CIDEUOsruSL#|->36OiTsRH9
z3wk<ji(%FU9V=PQR~Rbho!_UKXNTGI5T~m4eU~y-tW=d%p&{N2Q%98;^4J`quQmxY
zaWv$Q6OQF;5)#QMK6p%!ETG>X@G}30_BKTW7##Tdcvf#Ou`^DvFsafrOmC>l?#dh>
zNYWUa;%OFPv(+Tf5dyTT(dzNNW~nh@v+M}L`Imyt4JY;WFdG{4W9*i;7}G4MQU0uE
zvr|PvTGKQAs6oBACTw9)7RF#};ADCE8;w^NC6my$vMlsQt!L)u*(oXA*O2C`_18DR
zl$R!SoF?p+dt+&qvt{340VZgf>J=6A!8S*S2JcuM15*)|hbT!c#kv?4MVu;KAIpC-
z1Y=(#afp7c?dmcNxe<W}*d@>NLrd0uduS+BdSXKt1RW{S1F0Mq8w@(1>b4F@IU?|Q
zvY*>bPb=qRKXuupQMiZ4y3{MnwiIoT^$>jN>2ZiJd%?v)MJ-H)5Aj#+<v_>gmLt*;
zh-V4c6g<kKZ%X3LEO7?i`BIF|>wnlDj7k7%+|Jgd*Fc!~#E^tw!(3$=c=LCN>=}sI
ztUjQaZ}#cPzyquHx5L;m)$hNG$cxkwz}oJ!B|;t5)_)--=_fQiw~Y5MNJ95LkIGbz
z8CpM5gRHrTD#FpC8;}(P%w{VF>bz?5CuyK8A8L`jn$>)@Zd>hHh^zH_HhA}H)0s~f
zOEhq_H%M9hH1J|uK`iu)@khfxTF(QwU3f0sZ=Y?lNVng+BppG`cEeSO^mab<XS;7p
zSkwf_(axK3Nb?D=yupRaBM4&Xkxus1=r9q4HR8zPI92hXX>o5i43IK8SG`wF`xoQ+
z!l>4>LP^t-hin0_{+;23Z@Rj=)qELEwjI0)qrVof_{FyzXo@y?F!;d%5RV?~{L2?Q
z(E}bsf?z+WQB;21V^E6n$GI=i;=Woy*^D<Lowvq$J$8Ri{62|wE7FB7AImvVmoenZ
zhyFQ$Lw7!Cn<rLPlos!JMR1c;emc-p3rmzdWxThhLWd3iX(hf$jvHZq!mM7BpY-nk
z<X+@%rz;O!Uvqr2S@DVIN)uIAn$F^yPBiAKbe}W=($I<UM36dm8R;{|!FGC%z3FQ?
zOiQc6{rJ1>$2*b6^Sio4nHk6^1#Y_1DxUU5A<ftlQ<1LXpK8hC<i1j$=-wMVG=jLf
zwB_6wU0MB6+R85;z&>lwO+HWDgcu=SWVdjYmB!HY3*K>bI@UQQt6OAf#tPNMZ?-@L
zv4%&(VNu|Ok$;SN6C}o1|Ke-o1etirxjb8Fut<PrqQkg$p}D0c%VaWoB;e`xq)n3*
zR2U0Z0y(ufK<jj}MK6Z}i_o`}Z60!3><CHhC`li@r~y}!qr=vM($Z3HuWwK-1FP$?
zrdH{**WGd0Zp6Ub#Gd0BA~r5I4}^uM%j;yRvHXQ1%rG{DC2H?C&s^(uO;Iw5%bt8C
zvCIANmhKJpdzqNOY~f=LVs#Mzy}=1tpSBZwcDWVo#*ZLw9=qV!r>VI)YWczb9gFEq
zI)PRTtvO9B2?1I{2)~l}D)i@!e}8-`ukKuGe%Q;<icRuqINXP_3Ug34YKK9qu5gQe
z)$QD%^0NISWgSB<FgR6j4z5a_vzjhe$op3Qoi{)LyP~o2hIpdoE3|+5FfvAeE2)G_
z#7XL2p{s1%CPA+)7O*NTM=l9{;U$-|S#oj0O38*v%Ky_Nn|r?~1*-hbudHO;u_OL9
zeHIhy4pp=KX>8==SkPq<^1L^kTw5cxv>|z>j=sHhot&C-oVv;R{b<1&{vaB>%CI>e
zqKzQ1MD1C1Gq&|kqTU@YZB3)g;B-jDAsx-VTN(%ZBH-yRg4sP=W*}dS0bc=pH3kBK
z$};qn+W6>DbpDgzLXV7Uf8xYF1TlN}JTHQOyN=vp=`@v;3_VBS)%|}^vHvHf2kw2O
YID`P*yI)_SqJKa}LQ%X*)WH9L08=sy2LJ#7


From e4365fa24c021fb91be45f03f88c52dca62d8347 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Wed, 18 Mar 2015 17:10:29 +0100
Subject: [PATCH 18/95] [IMP] better modularity

---
 .../src/js/web_widget_x2many_2d_matrix.js      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 12a56c8cb..d4828b47c 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -110,12 +110,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                         // setup data structure
                         _.each(rows, function(row)
                         {
-                            var x = self.get_field_value(row, self.field_x_axis),
-                                y = self.get_field_value(row, self.field_y_axis);
-                            self.by_x_axis[x] = self.by_x_axis[x] || {};
-                            self.by_y_axis[y] = self.by_y_axis[y] || {};
-                            self.by_x_axis[x][y] = row;
-                            self.by_y_axis[y][x] = row;
+                            self.add_xy_row(row);
                             _.each(read_many2one, function(rows, field)
                             {
                                 if(!_.isArray(row[field]))
@@ -154,6 +149,17 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             });
         },
 
+        // to whatever needed to setup internal data structure
+        add_xy_row: function(row)
+        {
+            var x = this.get_field_value(row, this.field_x_axis),
+                y = this.get_field_value(row, this.field_y_axis);
+            this.by_x_axis[x] = this.by_x_axis[x] || {};
+            this.by_y_axis[y] = this.by_y_axis[y] || {};
+            this.by_x_axis[x][y] = row;
+            this.by_y_axis[y][x] = row;
+        },
+
         // get x axis values in the correct order
         get_x_axis_values: function()
         {

From 7d5d0d130fa13130497828f1f313e941459744da Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 16 Apr 2015 09:59:47 +0200
Subject: [PATCH 19/95] [FIX] support rerendering after virtual ids change

this is necessary for correct operation after creating new records
---
 .../static/src/js/web_widget_x2many_2d_matrix.js           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index d4828b47c..e1021457a 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -143,6 +143,13 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                                     });
                                 }));
                         })
+                        if(self.is_started && !self.no_rerender)
+                        {
+                            self.renderElement();
+                            self.$el.find('.edit').on(
+                                    'change', self.proxy(self.xy_value_change));
+                            self.effective_readonly_change();
+                        }
                         return jQuery.when.apply(jQuery, deferrends);
                     });
                 });

From c671d3525d4aa020b04b9aa1fa8d7c891987f8f9 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 16 Apr 2015 10:15:39 +0200
Subject: [PATCH 20/95] [FIX] also reinitialize totals

---
 .../static/src/js/web_widget_x2many_2d_matrix.js                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index e1021457a..5d4ce7854 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -146,6 +146,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                         if(self.is_started && !self.no_rerender)
                         {
                             self.renderElement();
+                            self.compute_totals();
+                            self.setup_many2one_axes();
                             self.$el.find('.edit').on(
                                     'change', self.proxy(self.xy_value_change));
                             self.effective_readonly_change();

From 462173a5459aa2dce81228539d6dd32ac8f2c69b Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Fri, 22 May 2015 19:45:36 +0200
Subject: [PATCH 21/95] Add bug tracker link on README.rst

---
 web_widget_x2many_2d_matrix/README.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 0b145aaf6..a6b436e17 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -56,6 +56,16 @@ Known issues / Roadmap
 
 * it would be worth trying to instantiate the proper field widget and let it render the input
 
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/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
+`here <https://github.com/OCA/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
 Credits
 =======
 

From d8749699a99bbaff24ab98eae71b201125ce5512 Mon Sep 17 00:00:00 2001
From: Markus Schneider <markus.schneider@initos.com>
Date: Thu, 4 Jun 2015 14:30:25 +0200
Subject: [PATCH 22/95] add OCA to author

---
 web_widget_x2many_2d_matrix/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index 1cbc4aad7..95a3299b2 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -21,7 +21,8 @@
 {
     "name": "2D matrix for x2many fields",
     "version": "1.0",
-    "author": "Therp BV",
+    "author": "Therp BV, "
+              "Odoo Community Association (OCA)",,
     "license": "AGPL-3",
     "category": "Hidden/Dependency",
     "summary": "Show list fields as a matrix",

From dfc4bd1cba35125dd5dffae11212ef21de4963b1 Mon Sep 17 00:00:00 2001
From: Markus Schneider <markus.schneider@initos.com>
Date: Fri, 5 Jun 2015 00:33:22 +0200
Subject: [PATCH 23/95] remove comma

---
 web_widget_x2many_2d_matrix/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index 95a3299b2..2e43203a8 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -22,7 +22,7 @@
     "name": "2D matrix for x2many fields",
     "version": "1.0",
     "author": "Therp BV, "
-              "Odoo Community Association (OCA)",,
+              "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Hidden/Dependency",
     "summary": "Show list fields as a matrix",

From ea5424c48471718a928533a416495a3d1b848c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Fri, 9 Oct 2015 10:03:39 +0200
Subject: [PATCH 24/95] [UPD] prefix versions with 8.0

---
 web_widget_x2many_2d_matrix/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index 2e43203a8..0b652e3cd 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     "name": "2D matrix for x2many fields",
-    "version": "1.0",
+    "version": "8.0.1.0.0",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",

From 395c381b17b6ca2f2d4ba4796d3cd6a84711cd38 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Wed, 14 Oct 2015 02:57:05 +0200
Subject: [PATCH 25/95] [MIG] Make modules uninstallable

---
 web_widget_x2many_2d_matrix/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index 0b652e3cd..e48c3a6e6 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -38,7 +38,7 @@
     "test": [
     ],
     "auto_install": False,
-    "installable": True,
+    'installable': False,
     "application": False,
     "external_dependencies": {
         'python': [],

From d5af1023521d156df68070074d16eb488cd66c90 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Mon, 23 Nov 2015 23:43:23 -0500
Subject: [PATCH 26/95] OCA Transbot updated translations from Transifex

---
 web_widget_x2many_2d_matrix/i18n/ar.po    | 27 +++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/de.po    | 27 +++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/es.po    | 26 ++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/fi.po    | 27 +++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/fr.po    | 26 ++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/hr.po    | 27 +++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/it.po    | 26 ++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 26 ++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/sl.po    | 26 ++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/tr.po    | 27 +++++++++++++++++++++++
 10 files changed, 265 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/i18n/ar.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/de.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/es.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/fi.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/fr.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/hr.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/it.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/pt_BR.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/sl.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/tr.po

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
new file mode 100644
index 000000000..7a85d2bde
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# SaFi J. <safi2266@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-16 07:41+0000\n"
+"PO-Revision-Date: 2015-12-16 17:24+0000\n"
+"Last-Translator: SaFi J. <safi2266@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/oca/OCA-web-8-0/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
new file mode 100644
index 000000000..337d2b944
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Rudolf Schnapka <rs@techno-flex.de>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-10 07:31+0000\n"
+"PO-Revision-Date: 2016-01-18 20:15+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-web-8-0/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
new file mode 100644
index 000000000..10ba2f9f8
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-23 13:46+0000\n"
+"PO-Revision-Date: 2015-11-07 11:29+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-web-8-0/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
new file mode 100644
index 000000000..df37d34a7
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-10 07:31+0000\n"
+"PO-Revision-Date: 2016-02-01 09:54+0000\n"
+"Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/oca/OCA-web-8-0/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
new file mode 100644
index 000000000..7ed8bc355
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-06 15:50+0000\n"
+"PO-Revision-Date: 2015-11-07 11:22+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
new file mode 100644
index 000000000..f209e2941
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-25 00:51+0000\n"
+"PO-Revision-Date: 2016-08-19 11:47+0000\n"
+"Last-Translator: Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>\n"
+"Language-Team: Croatian (http://www.transifex.com/oca/OCA-web-8-0/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
new file mode 100644
index 000000000..5b5d0bf31
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-17 07:30+0000\n"
+"PO-Revision-Date: 2015-11-07 11:22+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
new file mode 100644
index 000000000..c56e07fa6
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-11 02:18+0000\n"
+"PO-Revision-Date: 2016-03-05 16:20+0000\n"
+"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
new file mode 100644
index 000000000..07ae09c5d
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-23 13:46+0000\n"
+"PO-Revision-Date: 2015-11-08 05:48+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-web-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
new file mode 100644
index 000000000..635773bda
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Ahmet Altınışık <aaltinisik@altinkaya.com.tr>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: web (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-08 21:34+0000\n"
+"PO-Revision-Date: 2015-12-30 22:00+0000\n"
+"Last-Translator: Ahmet Altınışık <aaltinisik@altinkaya.com.tr>\n"
+"Language-Team: Turkish (http://www.transifex.com/oca/OCA-web-8-0/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Toplam"

From b981ecd72fa9fd2963e7d489b358d2609e5eeb11 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 18 Jan 2016 16:41:25 +0100
Subject: [PATCH 27/95] [IMP] web_widget_x2many_2d_matrix: Several improvements

* README update to newest OCA template
* Example in README
* Massive performance boost for big matrices, specially on Firefox
* Assign id on row in order to find it back in all cases
* Fix #321, choked on cached writes
---
 web_widget_x2many_2d_matrix/README.rst        |  48 ++++++--
 .../src/js/web_widget_x2many_2d_matrix.js     | 114 ++++++++++++------
 2 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index a6b436e17..7c880b131 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License: AGPL-3
+
+===========================
 2D matrix for x2many fields
 ===========================
 
@@ -51,12 +55,41 @@ show_row_totals
 show_column_totals
     If field_value is a numeric field, calculate column totals
 
+Example
+=======
+
+You need a data structure already filled with values. Let's assume we want to use this widget in a wizard that lets the user fill in planned hours for one task per project per user. In this case, we can use ``project.task`` as our data model and point to it from our wizard. The crucial part is that we fill the field in the default function::
+
+ class MyWizard(models.TransientModel):
+    _name = 'my.wizard'
+
+    def _default_task_ids(self):
+        # your list of project should come from the context, some selection
+        # in a previous wizard or wherever else
+        projects = self.env['project.project'].browse([1, 2, 3])
+        # same with users
+        users = self.env['res.users'].browse([1, 2, 3])
+        return [
+            (0, 0, {'project_id': p.id, 'user_id': u.id, 'planned_hours': 0})
+            # if the project doesn't have a task for the user, create a new one
+            if not p.task_ids.filtered(lambda x: x.user_id == u) else
+            # otherwise, return the task
+            (4, p.task_ids.filtered(lambda x: x.user_id == u)[0].id)
+            for p in projects
+            for u in users
+        ]
+
+    task_ids = fields.Many2many('project.task', default=_default_task_ids)
+
+Now in our wizard, we can use::
+
+<field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours" />
+
 Known issues / Roadmap
 ======================
 
 * it would be worth trying to instantiate the proper field widget and let it render the input
 
-
 Bug Tracker
 ===========
 
@@ -65,7 +98,6 @@ 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
 `here <https://github.com/OCA/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
-
 Credits
 =======
 
@@ -77,12 +109,14 @@ Contributors
 Maintainer
 ----------
 
-.. image:: http://odoo-community.org/logo.png
-    :alt: Odoo Community Association
-    :target: http://odoo-community.org
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
 
 This module is maintained by the OCA.
 
-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.
+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.
 
-To contribute to this module, please visit http://odoo-community.org.
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 5d4ce7854..4dbcb4cc9 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -31,6 +31,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         // those will be filled with rows from the dataset
         by_x_axis: {},
         by_y_axis: {},
+        by_id: {},
+        // configuration values
         field_x_axis: 'x',
         field_label_x_axis: 'x',
         field_y_axis: 'y',
@@ -81,7 +83,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
 
             self.by_x_axis = {};
             self.by_y_axis = {};
-                
+            self.by_id = {};
+
             return jQuery.when(result).then(function()
             {
                 return self.dataset._model.call('fields_get').then(function(fields)
@@ -90,7 +93,35 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                     self.is_numeric = fields[self.field_value].type == 'float';
                     self.show_row_totals &= self.is_numeric;
                     self.show_column_totals &= self.is_numeric;
-                }).then(function()
+                })
+                // if there are cached writes on the parent dataset, read below
+                // only returns the written data, which is not enough to properly
+                // set up our data structure. Read those ids here and patch the
+                // cache
+                .then(function()
+                {
+                    var ids_written = _.map(
+                        self.dataset.to_write, function(x) { return x.id });
+                    if(!ids_written.length)
+                    {
+                        return;
+                    }
+                    return (new instance.web.Query(self.dataset._model))
+                    .filter([['id', 'in', ids_written]])
+                    .all()
+                    .then(function(rows)
+                    {
+                        _.each(rows, function(row)
+                        {
+                            var cache = _.find(
+                                self.dataset.cache,
+                                function(x) { return x.id == row.id }
+                            );
+                            _.extend(cache.values, row, _.clone(cache.values));
+                        })
+                    })
+                })
+                .then(function()
                 {
                     return self.dataset.read_ids(self.dataset.ids).then(function(rows)
                     {
@@ -158,15 +189,31 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             });
         },
 
-        // to whatever needed to setup internal data structure
+        // do whatever needed to setup internal data structure
         add_xy_row: function(row)
         {
             var x = this.get_field_value(row, this.field_x_axis),
                 y = this.get_field_value(row, this.field_y_axis);
+            // row is a *copy* of a row in dataset.cache, fetch
+            // a reference to this row in order to have the
+            // internal data structure point to the same data
+            // the dataset manipulates
+            _.every(this.dataset.cache, function(cached_row)
+            {
+                if(cached_row.id == row.id)
+                {
+                    row = cached_row.values;
+                    // new rows don't have that
+                    row.id = cached_row.id;
+                    return false;
+                }
+                return true;
+            });
             this.by_x_axis[x] = this.by_x_axis[x] || {};
             this.by_y_axis[y] = this.by_y_axis[y] || {};
             this.by_x_axis[x][y] = row;
             this.by_y_axis[y][x] = row;
+            this.by_id[row.id] = row;
         },
 
         // get x axis values in the correct order
@@ -255,39 +302,38 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             var self = this,
                 grand_total = 0,
                 totals_x = {},
-                totals_y = {};
-            return self.dataset.read_ids(self.dataset.ids).then(function(rows)
+                totals_y = {},
+                rows = this.by_id,
+                deferred = jQuery.Deferred();
+            _.each(rows, function(row)
             {
-                _.each(rows, function(row)
-                {
-                    var key_x = self.get_field_value(row, self.field_x_axis),
-                        key_y = self.get_field_value(row, self.field_y_axis);
-                    totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
-                    totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
-                    grand_total += self.get_field_value(row, self.field_value);
-                });
-            }).then(function()
-            {
-                _.each(totals_y, function(total, y)
-                {
-                    self.$el.find(
-                        _.str.sprintf('td.row_total[data-y="%s"]', y)).text(
-                            self.format_xy_value(total));
-                });
-                _.each(totals_x, function(total, x)
-                {
-                    self.$el.find(
-                        _.str.sprintf('td.column_total[data-x="%s"]', x)).text(
-                            self.format_xy_value(total));
-                });
-                self.$el.find('.grand_total').text(
-                    self.format_xy_value(grand_total))
-                return {
-                    totals_x: totals_x,
-                    totals_y: totals_y,
-                    grand_total: grand_total,
-                };
+                var key_x = self.get_field_value(row, self.field_x_axis),
+                    key_y = self.get_field_value(row, self.field_y_axis);
+                totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
+                totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
+                grand_total += self.get_field_value(row, self.field_value);
             });
+            _.each(totals_y, function(total, y)
+            {
+                self.$el.find(
+                    _.str.sprintf('td.row_total[data-y="%s"]', y)).text(
+                        self.format_xy_value(total));
+            });
+            _.each(totals_x, function(total, x)
+            {
+                self.$el.find(
+                    _.str.sprintf('td.column_total[data-x="%s"]', x)).text(
+                        self.format_xy_value(total));
+            });
+            self.$el.find('.grand_total').text(
+                self.format_xy_value(grand_total))
+            deferred.resolve({
+                totals_x: totals_x,
+                totals_y: totals_y,
+                grand_total: grand_total,
+                rows: rows,
+            });
+            return deferred;
         },
 
         setup_many2one_axes: function()

From 07e12b3f3eb2002b0c43facb0b2ad809e24572b4 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Wed, 14 Sep 2016 09:32:56 +0200
Subject: [PATCH 28/95] [IMP] web_widget_x2many_2d_matrix: New option
 field_att_<name>

Declare as many options prefixed with this string as you need for binding
a field value with an HTML node attribute (disabled, class, style...)
called as the `<name>` passed in the option.

NOTE: This doesn't prevent to require to fill the full matrix with
all the combination records.
---
 web_widget_x2many_2d_matrix/README.rst        | 38 ++++++++++++----
 web_widget_x2many_2d_matrix/__openerp__.py    | 35 +++------------
 .../src/js/web_widget_x2many_2d_matrix.js     | 45 ++++++++++---------
 .../src/xml/web_widget_x2many_2d_matrix.xml   |  2 +-
 4 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 7c880b131..83c29328c 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -1,5 +1,6 @@
 .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-    :alt: License: AGPL-3
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
 
 ===========================
 2D matrix for x2many fields
@@ -8,7 +9,8 @@
 This module allows to show an x2many field with 3-tuples
 ($x_value, $y_value, $value) in a table
 
-          $x_value1   $x_value2 
+========= =========== ===========
+\          $x_value1   $x_value2
 ========= =========== ===========
 $y_value1 $value(1/1) $value(2/1)
 $y_value2 $value(1/2) $value(2/2)
@@ -23,7 +25,9 @@ result could look like this:
 .. image:: /web_widget_x2many_2d_matrix/static/description/screenshot.png
     :alt: Screenshot
 
-The beauty of this is that you have an arbitrary amount of columns with this widget, trying to get this in standard x2many lists involves some quite agly hacks.
+The beauty of this is that you have an arbitrary amount of columns with this
+widget, trying to get this in standard x2many lists involves some quite ugly
+hacks.
 
 Usage
 =====
@@ -54,11 +58,23 @@ show_row_totals
     If field_value is a numeric field, calculate row totals
 show_column_totals
     If field_value is a numeric field, calculate column totals
+field_att_<name>
+    Declare as many options prefixed with this string as you need for binding
+    a field value with an HTML node attribute (disabled, class, style...)
+    called as the `<name>` passed in the option.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/162/8.0
 
 Example
 =======
 
-You need a data structure already filled with values. Let's assume we want to use this widget in a wizard that lets the user fill in planned hours for one task per project per user. In this case, we can use ``project.task`` as our data model and point to it from our wizard. The crucial part is that we fill the field in the default function::
+You need a data structure already filled with values. Let's assume we want to
+use this widget in a wizard that lets the user fill in planned hours for one
+task per project per user. In this case, we can use ``project.task`` as our
+data model and point to it from our wizard. The crucial part is that we fill
+the field in the default function::
 
  class MyWizard(models.TransientModel):
     _name = 'my.wizard'
@@ -85,6 +101,11 @@ Now in our wizard, we can use::
 
 <field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours" />
 
+Note that all values in the matrix must exist, so you need to create them
+previously if not present, but you can control visually the editability of
+the fields in the matrix through `field_att_disabled` option with a control
+field.
+
 Known issues / Roadmap
 ======================
 
@@ -93,10 +114,10 @@ Known issues / Roadmap
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/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
-`here <https://github.com/OCA/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/web/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.
 
 Credits
 =======
@@ -105,6 +126,7 @@ Contributors
 ------------
 
 * Holger Brunn <hbrunn@therp.nl>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index e48c3a6e6..87dc3541c 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -1,27 +1,13 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright 2015 Holger Brunn <hbrunn@therp.nl>
+# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 {
     "name": "2D matrix for x2many fields",
-    "version": "8.0.1.0.0",
+    "version": "8.0.1.1.0",
     "author": "Therp BV, "
+              "Tecnativa,"
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Hidden/Dependency",
@@ -35,12 +21,5 @@
     "qweb": [
         'static/src/xml/web_widget_x2many_2d_matrix.xml',
     ],
-    "test": [
-    ],
-    "auto_install": False,
-    'installable': False,
-    "application": False,
-    "external_dependencies": {
-        'python': [],
-    },
+    "installable": True,
 }
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 4dbcb4cc9..5f6147f4d 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -1,23 +1,6 @@
-//-*- coding: utf-8 -*-
-//############################################################################
-//
-//   OpenERP, Open Source Management Solution
-//   This module copyright (C) 2015 Therp BV <http://therp.nl>.
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as
-//   published by the Free Software Foundation, either version 3 of the
-//   License, or (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//############################################################################
+/* Copyright 2015 Holger Brunn <hbrunn@therp.nl>
+ * Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
 openerp.web_widget_x2many_2d_matrix = function(instance)
 {
@@ -44,6 +27,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         show_column_totals: true,
         // this will be filled with the model's fields_get
         fields: {},
+        // Store fields used to fill HTML attributes
+        fields_att: {},
 
         // read parameters
         init: function(field_manager, node)
@@ -53,6 +38,12 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
             this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
             this.field_value = node.attrs.field_value || this.field_value;
+            for (var property in node.attrs) {
+                if (property.startsWith("field_att_")) {
+                    this.fields_att[property.substring(10)] = node.attrs[property];
+                }
+            }
+            this.field_editability = node.attrs.field_editability || this.field_editability;
             this.show_row_totals = node.attrs.show_row_totals || this.show_row_totals;
             this.show_column_totals = node.attrs.show_column_totals || this.show_column_totals;
             return this._super.apply(this, arguments);
@@ -261,6 +252,20 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             return this.by_x_axis[x][y]['id'];
         },
 
+        get_xy_att: function(x, y)
+        {
+            var vals = {};
+            for (var att in this.fields_att) {
+                var val = this.get_field_value(
+                    this.by_x_axis[x][y], this.fields_att[att]);
+                // Discard empty values
+                if (val) {
+                    vals[att] = val;
+                }
+            }
+            return vals;
+        },
+
         // return the value of a coordinate
         get_xy_value: function(x, y)
         {
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index 35f1669bc..ca6b687f5 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -16,7 +16,7 @@
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input class="edit" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" />
+                                <input class="edit" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
                                 <span class="read"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>

From fe7b4c3a852498779f4bf77c66b3bc6c35f47a2a Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Fri, 16 Sep 2016 14:35:54 +0200
Subject: [PATCH 29/95] [MIG] web_widget_x2many_2d_matrix: Migration to 9.0

---
 web_widget_x2many_2d_matrix/README.rst        |  9 ++++
 web_widget_x2many_2d_matrix/__openerp__.py    |  2 +-
 .../src/js/web_widget_x2many_2d_matrix.js     | 53 ++++++++++++-------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 83c29328c..dc8a480f1 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -110,6 +110,15 @@ Known issues / Roadmap
 ======================
 
 * it would be worth trying to instantiate the proper field widget and let it render the input
+* If you pass values with an onchange, you need to overwrite the model's method
+  `onchange` for making the widget work::
+
+ @api.multi
+ def onchange(self, values, field_name, field_onchange):
+     if "one2many_field" in field_onchange:
+         for sub in [<field_list>]:
+             field_onchange.setdefault("one2many_field." + sub, u"")
+     return super(model, self).onchange(values, field_name, field_onchange)
 
 Bug Tracker
 ===========
diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index 87dc3541c..a8f4e8cf0 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "2D matrix for x2many fields",
-    "version": "8.0.1.1.0",
+    "version": "9.0.1.0.0",
     "author": "Therp BV, "
               "Tecnativa,"
               "Odoo Community Association (OCA)",
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 5f6147f4d..4087e88e3 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -2,12 +2,16 @@
  * Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
-openerp.web_widget_x2many_2d_matrix = function(instance)
-{
-    instance.web.form.widgets.add(
-        'x2many_2d_matrix',
-        'instance.web_widget_x2many_2d_matrix.FieldX2Many2dMatrix');
-    instance.web_widget_x2many_2d_matrix.FieldX2Many2dMatrix = instance.web.form.FieldOne2Many.extend({
+odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
+    "use strict";
+
+    var core = require('web.core');
+    var formats = require('web.formats');
+    var FieldOne2Many = core.form_widget_registry.get('one2many');
+    var Model = require('web.Model');
+    var data = require('web.data');
+
+    var WidgetX2Many2dMatrix = FieldOne2Many.extend({
         template: 'FieldX2Many2dMatrix',
         widget_class: 'oe_form_field_x2many_2d_matrix',
 
@@ -46,7 +50,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             this.field_editability = node.attrs.field_editability || this.field_editability;
             this.show_row_totals = node.attrs.show_row_totals || this.show_row_totals;
             this.show_column_totals = node.attrs.show_column_totals || this.show_column_totals;
-            return this._super.apply(this, arguments);
+            return this._super(field_manager, node);
         },
 
         // return a field's value, id in case it's a one2many field
@@ -67,10 +71,10 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         },
 
         // setup our datastructure for simple access in the template
-        set_value: function()
+        set_value: function(value_)
         {
             var self = this,
-                result = this._super.apply(this, arguments);
+                result = this._super(value_);
 
             self.by_x_axis = {};
             self.by_y_axis = {};
@@ -150,7 +154,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                             {
                                 return;
                             }
-                            var model = new instance.web.Model(self.fields[field].relation);
+                            var model = new Model(self.fields[field].relation);
                             deferrends.push(model.call(
                                 'name_get',
                                 [_.map(_.keys(rows), function(key) {return parseInt(key)})])
@@ -171,7 +175,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
                             self.compute_totals();
                             self.setup_many2one_axes();
                             self.$el.find('.edit').on(
-                                    'change', self.proxy(self.xy_value_change));
+                                'change', self.proxy(self.xy_value_change));
                             self.effective_readonly_change();
                         }
                         return jQuery.when.apply(jQuery, deferrends);
@@ -290,14 +294,14 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
         // parse a value from user input
         parse_xy_value: function(val)
         {
-            return instance.web.parse_value(
+            return formats.parse_value(
                 val, {'type': this.fields[this.field_value].type});
         },
 
         // format a value from the database for display
         format_xy_value: function(val)
         {
-            return instance.web.format_value(
+            return formats.format_value(
                 val, {'type': this.fields[this.field_value].type});
         },
 
@@ -381,7 +385,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             this.on("change:effective_readonly",
                     this, this.proxy(this.effective_readonly_change));
             this.effective_readonly_change();
-            return this._super.apply(this, arguments);
+            return this._super();
         },
 
         xy_value_change: function(e)
@@ -423,9 +427,20 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
             return this.$el.find('.oe_form_invalid').length == 0;
         },
 
-        // deactivate view related functions
-        load_views: function() {},
-        reload_current_view: function() {},
-        get_active_view: function() {},
+        load_views: function() {
+            // Needed for removing the initial empty tree view when the widget
+            // is loaded
+            var self = this,
+                result = this._super();
+
+            return $.when(result).then(function()
+            {
+                self.set_value(false);
+            });
+        },
     });
-}
+
+    core.form_widget_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+
+    return WidgetX2Many2dMatrix;
+});

From 7e25a97cef2cc87a258c00102cce6cf445465cf2 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Fri, 16 Sep 2016 17:56:53 +0200
Subject: [PATCH 30/95] [IMP] web_widget_x2many_2d_matrix: Use new JS
 modularized API.

---
 .../static/src/js/web_widget_x2many_2d_matrix.js   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 4087e88e3..e570949d8 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -10,6 +10,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
     var FieldOne2Many = core.form_widget_registry.get('one2many');
     var Model = require('web.Model');
     var data = require('web.data');
+    var _ = require('_');
+    var $ = require('$');
 
     var WidgetX2Many2dMatrix = FieldOne2Many.extend({
         template: 'FieldX2Many2dMatrix',
@@ -80,7 +82,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             self.by_y_axis = {};
             self.by_id = {};
 
-            return jQuery.when(result).then(function()
+            return $.when(result).then(function()
             {
                 return self.dataset._model.call('fields_get').then(function(fields)
                 {
@@ -101,7 +103,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                     {
                         return;
                     }
-                    return (new instance.web.Query(self.dataset._model))
+                    return (new data.Query(self.dataset._model))
                     .filter([['id', 'in', ids_written]])
                     .all()
                     .then(function(rows)
@@ -178,7 +180,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                                 'change', self.proxy(self.xy_value_change));
                             self.effective_readonly_change();
                         }
-                        return jQuery.when.apply(jQuery, deferrends);
+                        return $.when.apply($, deferrends);
                     });
                 });
             });
@@ -313,7 +315,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 totals_x = {},
                 totals_y = {},
                 rows = this.by_id,
-                deferred = jQuery.Deferred();
+                deferred = $.Deferred();
             _.each(rows, function(row)
             {
                 var key_x = self.get_field_value(row, self.field_x_axis),
@@ -369,7 +371,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 type: 'ir.actions.act_window',
                 name: this.fields[field].string,
                 res_model: this.fields[field].relation,
-                res_id: jQuery(e.currentTarget).data(id_attribute),
+                res_id: $(e.currentTarget).data(id_attribute),
                 views: [[false, 'form']],
                 target: 'current',
             })
@@ -390,7 +392,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
 
         xy_value_change: function(e)
         {
-            var $this = jQuery(e.currentTarget),
+            var $this = $(e.currentTarget),
                 val = $this.val();
             if(this.validate_xy_value(val))
             {

From 2655123d5bb7ef78b63152ce3ab8b6f4a151c211 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Wed, 21 Sep 2016 18:24:51 +0200
Subject: [PATCH 31/95] [IMP] web_widget_x2many_2d_matrix: Include
 x_axis_clickable and y_axis_clickable attrs

XML attributes for the widget that allows to configure if the axis will be clickable
or not in case the source field is a many2one field.
---
 web_widget_x2many_2d_matrix/README.rst        | 12 +++++++++--
 .../src/js/web_widget_x2many_2d_matrix.js     | 20 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index dc8a480f1..6628a81ea 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -52,12 +52,20 @@ field_label_x_axis
     Use another field to display in the table header
 field_label_y_axis
     Use another field to display in the table header
+x_axis_clickable
+    It indicates if the X axis allows to be clicked for navigating to the field
+    (if it's a many2one field). True by default
+y_axis_clickable
+    It indicates if the Y axis allows to be clicked for navigating to the field
+    (if it's a many2one field). True by default
 field_value
     Show this field as value
 show_row_totals
-    If field_value is a numeric field, calculate row totals
+    If field_value is a numeric field, it indicates if you want to calculate
+    row totals. True by default
 show_column_totals
-    If field_value is a numeric field, calculate column totals
+    If field_value is a numeric field, it indicates if you want to calculate
+    column totals. True by default
 field_att_<name>
     Declare as many options prefixed with this string as you need for binding
     a field value with an HTML node attribute (disabled, class, style...)
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index e570949d8..c56315930 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -27,6 +27,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         field_y_axis: 'y',
         field_label_y_axis: 'y',
         field_value: 'value',
+        x_axis_clickable: true,
+        y_axis_clickable: true,
         // information about our datatype
         is_numeric: false,
         show_row_totals: true,
@@ -36,6 +38,14 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         // Store fields used to fill HTML attributes
         fields_att: {},
 
+        parse_boolean: function(val)
+        {
+            if (val.toLowerCase() === 'true' || val === '1') {
+                return true;
+            }
+            return false;
+        },
+
         // read parameters
         init: function(field_manager, node)
         {
@@ -43,6 +53,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis;
             this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
             this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
+            this.x_axis_clickable = node.attrs.x_axis_clickable != undefined ? this.parse_boolean(node.attrs.x_axis_clickable) : this.x_axis_clickable;
+            this.y_axis_clickable = node.attrs.y_axis_clickable != undefined ? this.parse_boolean(node.attrs.y_axis_clickable) : this.y_axis_clickable;
             this.field_value = node.attrs.field_value || this.field_value;
             for (var property in node.attrs) {
                 if (property.startsWith("field_att_")) {
@@ -50,8 +62,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 }
             }
             this.field_editability = node.attrs.field_editability || this.field_editability;
-            this.show_row_totals = node.attrs.show_row_totals || this.show_row_totals;
-            this.show_column_totals = node.attrs.show_column_totals || this.show_column_totals;
+            this.show_row_totals = node.attrs.show_row_totals != undefined ? this.parse_boolean(node.attrs.show_row_totals) : this.show_row_totals;
+            this.show_column_totals = node.attrs.show_column_totals != undefined ? this.parse_boolean(node.attrs.show_column_totals) : this.show_column_totals;
             return this._super(field_manager, node);
         },
 
@@ -349,14 +361,14 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
 
         setup_many2one_axes: function()
         {
-            if(this.fields[this.field_x_axis].type == 'many2one')
+            if(this.fields[this.field_x_axis].type == 'many2one' && this.x_axis_clickable)
             {
                 this.$el.find('th[data-x]').addClass('oe_link')
                 .click(_.partial(
                     this.proxy(this.many2one_axis_click),
                     this.field_x_axis, 'x'));
             }
-            if(this.fields[this.field_y_axis].type == 'many2one')
+            if(this.fields[this.field_y_axis].type == 'many2one' && this.y_axis_clickable)
             {
                 this.$el.find('tr[data-y] th').addClass('oe_link')
                 .click(_.partial(

From 07518433d1b9fe2f000a301d006ed8d0afa36555 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Wed, 21 Sep 2016 20:39:15 +0200
Subject: [PATCH 32/95] [FIX] web_widget_x2many_2d_matrix: Use existing value
 in load_views

---
 .../static/src/js/web_widget_x2many_2d_matrix.js                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index c56315930..782ed21a8 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -449,7 +449,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
 
             return $.when(result).then(function()
             {
-                self.set_value(false);
+                self.set_value(self.get_value());
             });
         },
     });

From 9fb5f933f884ba5fdf816a52de9ec0b489a0cd14 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 22 Sep 2016 09:45:23 +0200
Subject: [PATCH 33/95] [IMP] web_widget_x2many_2d_matrix: Better options
 parsing

---
 .../static/src/js/web_widget_x2many_2d_matrix.js          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 782ed21a8..3e182047b 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -53,8 +53,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis;
             this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
             this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
-            this.x_axis_clickable = node.attrs.x_axis_clickable != undefined ? this.parse_boolean(node.attrs.x_axis_clickable) : this.x_axis_clickable;
-            this.y_axis_clickable = node.attrs.y_axis_clickable != undefined ? this.parse_boolean(node.attrs.y_axis_clickable) : this.y_axis_clickable;
+            this.x_axis_clickable = this.parse_boolean(node.attrs.x_axis_clickable || '1');
+            this.y_axis_clickable = this.parse_boolean(node.attrs.y_axis_clickable || '1');
             this.field_value = node.attrs.field_value || this.field_value;
             for (var property in node.attrs) {
                 if (property.startsWith("field_att_")) {
@@ -62,8 +62,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 }
             }
             this.field_editability = node.attrs.field_editability || this.field_editability;
-            this.show_row_totals = node.attrs.show_row_totals != undefined ? this.parse_boolean(node.attrs.show_row_totals) : this.show_row_totals;
-            this.show_column_totals = node.attrs.show_column_totals != undefined ? this.parse_boolean(node.attrs.show_column_totals) : this.show_column_totals;
+            this.show_row_totals = this.parse_boolean(node.attrs.show_row_totals || '1');
+            this.show_column_totals = this.parse_boolean(node.attrs.show_column_totals || '1');
             return this._super(field_manager, node);
         },
 

From b13cd24692d92471215031a495baba6ec69e7c6b Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 22 Sep 2016 09:48:03 +0200
Subject: [PATCH 34/95] [IMP+ web_widget_x2many_2d_matrix: Add roadmap

---
 web_widget_x2many_2d_matrix/README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 6628a81ea..85d5dd712 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -117,7 +117,9 @@ field.
 Known issues / Roadmap
 ======================
 
-* it would be worth trying to instantiate the proper field widget and let it render the input
+* It would be worth trying to instantiate the proper field widget and let it render the input
+* Let the widget deal with the missing values of the full Cartesian product,
+  instead of being forced to pre-fill all the possible values.
 * If you pass values with an onchange, you need to overwrite the model's method
   `onchange` for making the widget work::
 

From 4feb82659e9eb8df43cb082eac7603407a569abb Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 22 Sep 2016 12:09:34 +0200
Subject: [PATCH 35/95] [IMP] web_widget_x2many_2d_matrix: Remove unneeded code

---
 .../src/js/web_widget_x2many_2d_matrix.js     | 45 -------------------
 1 file changed, 45 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 3e182047b..8d2e3fc68 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -134,55 +134,11 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 {
                     return self.dataset.read_ids(self.dataset.ids).then(function(rows)
                     {
-                        var read_many2one = {},
-                            many2one_fields = [
-                                self.field_x_axis, self.field_y_axis,
-                                self.field_label_x_axis, self.field_label_y_axis
-                            ];
-                        // prepare to read many2one names if necessary (we can get (id, name) or just id as value)
-                        _.each(many2one_fields, function(field)
-                        {
-                            if(self.fields[field].type == 'many2one')
-                            {
-                                read_many2one[field] = {};
-                            }
-                        });
                         // setup data structure
                         _.each(rows, function(row)
                         {
                             self.add_xy_row(row);
-                            _.each(read_many2one, function(rows, field)
-                            {
-                                if(!_.isArray(row[field]))
-                                {
-                                    rows[row[field]] = rows[row[field]] || []
-                                    rows[row[field]].push(row);
-                                }
-                            });
                         });
-                        // read many2one fields if necessary
-                        var deferrends = [];
-                        _.each(read_many2one, function(rows, field)
-                        {
-                            if(_.isEmpty(rows))
-                            {
-                                return;
-                            }
-                            var model = new Model(self.fields[field].relation);
-                            deferrends.push(model.call(
-                                'name_get',
-                                [_.map(_.keys(rows), function(key) {return parseInt(key)})])
-                                .then(function(names)
-                                {
-                                    _.each(names, function(name)
-                                    {
-                                        _.each(rows[name[0]], function(row)
-                                        {
-                                            row[field] = name;
-                                        });
-                                    });
-                                }));
-                        })
                         if(self.is_started && !self.no_rerender)
                         {
                             self.renderElement();
@@ -192,7 +148,6 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                                 'change', self.proxy(self.xy_value_change));
                             self.effective_readonly_change();
                         }
-                        return $.when.apply($, deferrends);
                     });
                 });
             });

From ccdf5710aba95866cb0c08e9456a3ee077778fbb Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 22 Sep 2016 12:11:40 +0200
Subject: [PATCH 36/95] [FIX] web_widget_x2many_2d_matrix: Init correctly the
 view

---
 .../static/src/js/web_widget_x2many_2d_matrix.js                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 8d2e3fc68..8a51b3a6b 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -404,7 +404,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
 
             return $.when(result).then(function()
             {
-                self.set_value(self.get_value());
+                self.renderElement();
             });
         },
     });

From dd84edd3e1e2f897c67275be8e8539e833b47c8a Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 6 Oct 2016 16:12:54 +0200
Subject: [PATCH 37/95] [MIG] Make modules uninstallable

---
 web_widget_x2many_2d_matrix/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__openerp__.py
index a8f4e8cf0..8b55c97d5 100644
--- a/web_widget_x2many_2d_matrix/__openerp__.py
+++ b/web_widget_x2many_2d_matrix/__openerp__.py
@@ -21,5 +21,5 @@
     "qweb": [
         'static/src/xml/web_widget_x2many_2d_matrix.xml',
     ],
-    "installable": True,
+    'installable': False,
 }

From 146252808d2a3f3c9e15df0e9e4d78c3ef0c6218 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 6 Oct 2016 16:13:01 +0200
Subject: [PATCH 38/95] [MIG] Rename manifest files

---
 web_widget_x2many_2d_matrix/{__openerp__.py => __manifest__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename web_widget_x2many_2d_matrix/{__openerp__.py => __manifest__.py} (100%)

diff --git a/web_widget_x2many_2d_matrix/__openerp__.py b/web_widget_x2many_2d_matrix/__manifest__.py
similarity index 100%
rename from web_widget_x2many_2d_matrix/__openerp__.py
rename to web_widget_x2many_2d_matrix/__manifest__.py

From 976ea30892609df35066ad4fce32733b14ec9114 Mon Sep 17 00:00:00 2001
From: jesusVMayor <jesus@comunitea.com>
Date: Mon, 24 Apr 2017 12:28:47 +0200
Subject: [PATCH 39/95] Migration of web_widget_x2many_2d_matrix to 10.0

---
 web_widget_x2many_2d_matrix/__manifest__.py                | 4 ++--
 .../static/src/css/web_widget_x2many_2d_matrix.css         | 2 +-
 .../static/src/js/web_widget_x2many_2d_matrix.js           | 7 +++----
 .../static/src/xml/web_widget_x2many_2d_matrix.xml         | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 8b55c97d5..b4651c074 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "2D matrix for x2many fields",
-    "version": "9.0.1.0.0",
+    "version": "10.0.1.0.0",
     "author": "Therp BV, "
               "Tecnativa,"
               "Odoo Community Association (OCA)",
@@ -21,5 +21,5 @@
     "qweb": [
         'static/src/xml/web_widget_x2many_2d_matrix.xml',
     ],
-    'installable': False,
+    "installable": True,
 }
diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
index d33d4f21b..14ed1c536 100644
--- a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
+++ b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
@@ -2,7 +2,7 @@
 {
     cursor: pointer;
 }
-.openerp .oe_form_field_x2many_2d_matrix .oe_list_content > tbody > tr > td.oe_list_field_cell
+.oe_form_field_x2many_2d_matrix .oe_list_content > tbody > tr > td.oe_list_field_cell
 {
     white-space: normal;
 }
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 8a51b3a6b..43fa84bb4 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -10,8 +10,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
     var FieldOne2Many = core.form_widget_registry.get('one2many');
     var Model = require('web.Model');
     var data = require('web.data');
-    var _ = require('_');
-    var $ = require('$');
+    var $ = require('jquery');
 
     var WidgetX2Many2dMatrix = FieldOne2Many.extend({
         template: 'FieldX2Many2dMatrix',
@@ -383,10 +382,10 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         effective_readonly_change: function()
         {
             this.$el
-            .find('tbody td.oe_list_field_cell span.oe_form_field .edit')
+            .find('tbody .read')
             .toggle(!this.get('effective_readonly'));
             this.$el
-            .find('tbody td.oe_list_field_cell span.oe_form_field .read')
+            .find('tbody .read')
             .toggle(this.get('effective_readonly'));
             this.$el.find('.edit').first().focus();
         },
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index ca6b687f5..a1a0d5215 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -1,7 +1,7 @@
 <templates>
     <t t-name="FieldX2Many2dMatrix">
         <div t-att-class="widget.widget_class">
-            <table class="oe_list_content">
+            <table class="o_list_view table table-condensed table-striped">
                 <thead>
                     <tr class="oe_list_header_columns">
                         <th />
@@ -14,9 +14,9 @@
                 <tbody>
                     <tr t-foreach="widget.get_y_axis_values()" t-as="y" t-att-data-y="y">
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'oe_list_field_cell' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
+                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input class="edit" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
+                                <input class="edit o_form_input" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
                                 <span class="read"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>

From 0111e0ce6716713a7f0353de06a9447524c5cf9c Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Fri, 28 Apr 2017 20:01:00 +0200
Subject: [PATCH 40/95] [IMP] web_widget_x2many_2d_matrix: Update example

There are now more required fields for a task.
---
 web_widget_x2many_2d_matrix/README.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 85d5dd712..40098bff1 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -84,6 +84,8 @@ task per project per user. In this case, we can use ``project.task`` as our
 data model and point to it from our wizard. The crucial part is that we fill
 the field in the default function::
 
+ from odoo import fields, models
+ 
  class MyWizard(models.TransientModel):
     _name = 'my.wizard'
 
@@ -94,7 +96,13 @@ the field in the default function::
         # same with users
         users = self.env['res.users'].browse([1, 2, 3])
         return [
-            (0, 0, {'project_id': p.id, 'user_id': u.id, 'planned_hours': 0})
+            (0, 0, {
+                'project_id': p.id, 
+                'user_id': u.id, 
+                'planned_hours': 0,
+                'message_needaction': False,
+                'date_deadline': fields.Date.today(),
+            })
             # if the project doesn't have a task for the user, create a new one
             if not p.task_ids.filtered(lambda x: x.user_id == u) else
             # otherwise, return the task

From 8662743ae42a1ca83ca7461fb1a30a872debfaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Pigeon?= <cedric.pigeon@acsone.eu>
Date: Wed, 21 Jun 2017 16:56:59 +0200
Subject: [PATCH 41/95] [10.0] web_widget_x2many_2d_matrix: update README

---
 web_widget_x2many_2d_matrix/README.rst | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 40098bff1..d81d100cc 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -40,7 +40,14 @@ This assumes that my_field refers to a model with the fields `x`, `y` and
 `value`. If your fields are named differently, pass the correct names as
 attributes::
 
-<field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3" />
+ <field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3">
+     <tree>
+         <field name="my_field"/>
+         <field name="my_field1"/>
+         <field name="my_field2"/>
+         <field name="my_field3"/>
+     </tree>
+ </field>
 
 You can pass the following parameters:
 
@@ -115,7 +122,14 @@ the field in the default function::
 
 Now in our wizard, we can use::
 
-<field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours" />
+ <field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours">
+     <tree>
+         <field name="task_ids"/>
+         <field name="project_id"/>
+         <field name="user_id"/>
+         <field name="planned_hours"/>
+     </tree>
+ </field>
 
 Note that all values in the matrix must exist, so you need to create them
 previously if not present, but you can control visually the editability of

From 307e93007e69cc86ff4880a5a80d6adae3ad0182 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Thu, 31 Aug 2017 01:03:06 +1000
Subject: [PATCH 42/95] [FIX] web_widget_x2many_2d_matrix: fixes (#712)

* Patches to make module operational.
* Minor fix to Readonly Switch
* Fix to render to set change attribute.
* Totals recompute.

Fixes #697
---
 web_widget_x2many_2d_matrix/__manifest__.py               | 2 +-
 .../static/src/js/web_widget_x2many_2d_matrix.js          | 8 ++++++--
 .../static/src/xml/web_widget_x2many_2d_matrix.xml        | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index b4651c074..69b703cd5 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "2D matrix for x2many fields",
-    "version": "10.0.1.0.0",
+    "version": "10.0.1.0.1",
     "author": "Therp BV, "
               "Tecnativa,"
               "Odoo Community Association (OCA)",
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index 43fa84bb4..ec88f1eaf 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -131,7 +131,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 })
                 .then(function()
                 {
-                    return self.dataset.read_ids(self.dataset.ids).then(function(rows)
+                    return self.dataset.read_ids(self.dataset.ids, self.fields).then(function(rows)
                     {
                         // setup data structure
                         _.each(rows, function(row)
@@ -369,6 +369,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 $this.val(this.format_xy_value(value));
 
                 this.dataset.write($this.data('id'), data);
+                this.by_id[$this.data('id')][this.field_value] = value;
                 $this.parent().removeClass('oe_form_invalid');
                 this.compute_totals();
             }
@@ -382,7 +383,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         effective_readonly_change: function()
         {
             this.$el
-            .find('tbody .read')
+            .find('tbody .edit')
             .toggle(!this.get('effective_readonly'));
             this.$el
             .find('tbody .read')
@@ -404,6 +405,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             return $.when(result).then(function()
             {
                 self.renderElement();
+                self.compute_totals();
+                self.$el.find('.edit').on(
+                        'change', self.proxy(self.xy_value_change));
             });
         },
     });
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
index a1a0d5215..b7aaaefe1 100644
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
@@ -16,8 +16,8 @@
                         <th><t t-esc="widget.get_y_axis_label(y)" /></th>
                         <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
                             <span t-att-class="widget.get_xy_value_class()">
-                                <input class="edit o_form_input" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
-                                <span class="read"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
+                                <input class="edit o_form_input oe_edit_only" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
+                                <span class="read oe_read_only"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
                             </span>
                         </td>
                         <td t-if="widget.show_row_totals" class="row_total oe_number" t-att-data-y="y"/>

From c635192ba233805cdb2e4a897cfd62cd191936dd Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Wed, 17 Jan 2018 10:50:20 +0100
Subject: [PATCH 43/95] OCA Transbot updated translations from Transifex

---
 web_widget_x2many_2d_matrix/i18n/lt.po    | 27 +++++++++++++++++++++++
 web_widget_x2many_2d_matrix/i18n/nl_NL.po | 27 +++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/i18n/lt.po
 create mode 100644 web_widget_x2many_2d_matrix/i18n/nl_NL.po

diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
new file mode 100644
index 000000000..d9620d989
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Viktoras Norkus <viktoras@bmx.lt>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-25 01:58+0000\n"
+"PO-Revision-Date: 2018-01-25 01:58+0000\n"
+"Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
+"Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
new file mode 100644
index 000000000..27efab7f5
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_widget_x2many_2d_matrix
+# 
+# Translators:
+# Peter Hageman <hageman.p@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-03 03:50+0000\n"
+"PO-Revision-Date: 2018-01-03 03:50+0000\n"
+"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: nl_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
+#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#, python-format
+msgid "Total"
+msgstr "Totaal"

From 130909c7c4a3e362917e689da919e256229f4465 Mon Sep 17 00:00:00 2001
From: Artem Kostyuk <a.kostyuk@mobilunity.com>
Date: Thu, 15 Feb 2018 09:45:16 +0200
Subject: [PATCH 44/95] [11][MIG] web_widget_x2many_2d_matrix WIP

---
 web_widget_x2many_2d_matrix/README.rst        |  6 +-
 web_widget_x2many_2d_matrix/__init__.py       |  1 -
 web_widget_x2many_2d_matrix/__manifest__.py   |  7 +-
 web_widget_x2many_2d_matrix/i18n/lt.po        |  4 +-
 web_widget_x2many_2d_matrix/i18n/nl_NL.po     |  4 +-
 .../src/js/web_widget_x2many_2d_matrix.js     | 65 ++++++++++++-------
 6 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index d81d100cc..6fb555b94 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -80,7 +80,7 @@ field_att_<name>
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/162/8.0
+   :target: https://runbot.odoo-community.org/runbot/162/11.0
 
 Example
 =======
@@ -104,6 +104,7 @@ the field in the default function::
         users = self.env['res.users'].browse([1, 2, 3])
         return [
             (0, 0, {
+                'name': 'Sample task name',
                 'project_id': p.id, 
                 'user_id': u.id, 
                 'planned_hours': 0,
@@ -158,7 +159,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues
 <https://github.com/OCA/web/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.
+help us smash it by providing a detailed and welcomed feedback.
 
 Credits
 =======
@@ -168,6 +169,7 @@ Contributors
 
 * Holger Brunn <hbrunn@therp.nl>
 * Pedro M. Baeza <pedro.baeza@tecnativa.com>
+* Artem Kostyuk <a.kostyuk@mobilunity.com>
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix/__init__.py b/web_widget_x2many_2d_matrix/__init__.py
index faef9dac0..919541c6c 100644
--- a/web_widget_x2many_2d_matrix/__init__.py
+++ b/web_widget_x2many_2d_matrix/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 69b703cd5..41f69a75e 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -1,14 +1,13 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Holger Brunn <hbrunn@therp.nl>
 # Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 {
     "name": "2D matrix for x2many fields",
-    "version": "10.0.1.0.1",
+    "version": "11.0.1.0.0",
     "author": "Therp BV, "
-              "Tecnativa,"
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/web",
     "license": "AGPL-3",
     "category": "Hidden/Dependency",
     "summary": "Show list fields as a matrix",
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index d9620d989..57a65fc55 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -6,10 +6,10 @@
 # Viktoras Norkus <viktoras@bmx.lt>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-01-25 01:58+0000\n"
-"PO-Revision-Date: 2018-01-25 01:58+0000\n"
+"PO-Revision-Date: 2018-02-15 12:40+0200\n"
 "Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index 27efab7f5..e1fde063c 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -6,10 +6,10 @@
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-01-03 03:50+0000\n"
-"PO-Revision-Date: 2018-01-03 03:50+0000\n"
+"PO-Revision-Date: 2018-02-15 12:39+0200\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
 "MIME-Version: 1.0\n"
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
index ec88f1eaf..2c0a0cd92 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
@@ -6,13 +6,15 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
     "use strict";
 
     var core = require('web.core');
-    var formats = require('web.formats');
-    var FieldOne2Many = core.form_widget_registry.get('one2many');
-    var Model = require('web.Model');
+    var FieldManagerMixin = require('web.FieldManagerMixin');
+    var Widget = require('web.Widget');
+    var fieldRegistry = require('web.field_registry');
+    var widgetRegistry = require('web.widget_registry');
+    var widgetOne2many = widgetRegistry.get('one2many');
     var data = require('web.data');
     var $ = require('jquery');
 
-    var WidgetX2Many2dMatrix = FieldOne2Many.extend({
+    var WidgetX2Many2dMatrix = widgetOne2Many.extend(FieldManagerMixin, {
         template: 'FieldX2Many2dMatrix',
         widget_class: 'oe_form_field_x2many_2d_matrix',
 
@@ -46,28 +48,39 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         },
 
         // read parameters
-        init: function(field_manager, node)
-        {
-            this.field_x_axis = node.attrs.field_x_axis || this.field_x_axis;
-            this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis;
-            this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
-            this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
-            this.x_axis_clickable = this.parse_boolean(node.attrs.x_axis_clickable || '1');
-            this.y_axis_clickable = this.parse_boolean(node.attrs.y_axis_clickable || '1');
-            this.field_value = node.attrs.field_value || this.field_value;
-            for (var property in node.attrs) {
+        init: function (parent, fieldname, record, therest) {
+            var res = this._super(parent, fieldname, record, therest);
+            FieldManagerMixin.init.call(this);
+            var node = record.fieldsInfo[therest.viewType][fieldname];
+
+            this.field_x_axis = node.field_x_axis || this.field_x_axis;
+            this.field_y_axis = node.field_y_axis || this.field_y_axis;
+            this.field_label_x_axis = node.field_label_x_axis || this.field_x_axis;
+            this.field_label_y_axis = node.field_label_y_axis || this.field_y_axis;
+            this.x_axis_clickable = this.parse_boolean(node.x_axis_clickable || '1');
+            this.y_axis_clickable = this.parse_boolean(node.y_axis_clickable || '1');
+            this.field_value = node.field_value || this.field_value;
+            for (var property in node) {
                 if (property.startsWith("field_att_")) {
-                    this.fields_att[property.substring(10)] = node.attrs[property];
+                    this.fields_att[property.substring(10)] = node[property];
                 }
             }
-            this.field_editability = node.attrs.field_editability || this.field_editability;
-            this.show_row_totals = this.parse_boolean(node.attrs.show_row_totals || '1');
-            this.show_column_totals = this.parse_boolean(node.attrs.show_column_totals || '1');
-            return this._super(field_manager, node);
+            this.field_editability = node.field_editability || this.field_editability;
+            this.show_row_totals = this.parse_boolean(node.show_row_totals || '1');
+            this.show_column_totals = this.parse_boolean(node.show_column_totals || '1');
+            this.init_fields();
+            // this.set_value(undefined);
+
+            return res;
+        },
+
+        init_fields: function() {
+            return;
         },
 
         // return a field's value, id in case it's a one2many field
         get_field_value: function(row, field, many2one_as_name)
+        // FIXME looks silly
         {
             if(this.fields[field].type == 'many2one' && _.isArray(row[field]))
             {
@@ -262,15 +275,13 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         // parse a value from user input
         parse_xy_value: function(val)
         {
-            return formats.parse_value(
-                val, {'type': this.fields[this.field_value].type});
+                return val;
         },
 
         // format a value from the database for display
         format_xy_value: function(val)
         {
-            return formats.format_value(
-                val, {'type': this.fields[this.field_value].type});
+                return val;
         },
 
         // compute totals
@@ -412,7 +423,11 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         },
     });
 
-    core.form_widget_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+    fieldRegistry.add(
+        'x2many_2d_matrix', WidgetX2Many2dMatrix
+    );
 
-    return WidgetX2Many2dMatrix;
+    return {
+        WidgetX2Many2dMatrix: WidgetX2Many2dMatrix
+    };
 });

From d2dafcbdeb9b16d3a59d20bab5bedad7fa112a86 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 19 Feb 2018 17:48:06 +0100
Subject: [PATCH 45/95] [MIG+REF][11] web_widget_x2many_2d_matrix

The widget has been completely refactored
to benefit from the new MVC paradigm introduced in v11.
---
 web_widget_x2many_2d_matrix/README.rst        |  53 +--
 web_widget_x2many_2d_matrix/__manifest__.py   |   7 +-
 .../static/description/icon.png               | Bin 5139 -> 2477 bytes
 .../static/description/screenshot.png         | Bin 19577 -> 22639 bytes
 .../src/css/web_widget_x2many_2d_matrix.css   |   9 +-
 .../static/src/js/2d_matrix_renderer.js       | 416 +++++++++++++++++
 .../src/js/web_widget_x2many_2d_matrix.js     | 433 ------------------
 .../static/src/js/widget_x2many_2d_matrix.js  | 172 +++++++
 .../src/xml/web_widget_x2many_2d_matrix.xml   |  36 --
 .../views/{templates.xml => assets.xml}       |   3 +-
 10 files changed, 614 insertions(+), 515 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
 delete mode 100644 web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
 delete mode 100644 web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
 rename web_widget_x2many_2d_matrix/views/{templates.xml => assets.xml} (72%)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 6fb555b94..52eb81b13 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -9,12 +9,13 @@
 This module allows to show an x2many field with 3-tuples
 ($x_value, $y_value, $value) in a table
 
-========= =========== ===========
-\          $x_value1   $x_value2
-========= =========== ===========
-$y_value1 $value(1/1) $value(2/1)
-$y_value2 $value(1/2) $value(2/2)
-========= =========== ===========
++-----------+-------------+-------------+
+|           | $x_value1   | $x_value2   |
++===========+=============+=============+
+| $y_value1 | $value(1/1) | $value(2/1) |
++-----------+-------------+-------------+
+| $y_value2 | $value(1/2) | $value(2/2) |
++-----------+-------------+-------------+
 
 where `value(n/n)` is editable.
 
@@ -59,12 +60,6 @@ field_label_x_axis
     Use another field to display in the table header
 field_label_y_axis
     Use another field to display in the table header
-x_axis_clickable
-    It indicates if the X axis allows to be clicked for navigating to the field
-    (if it's a many2one field). True by default
-y_axis_clickable
-    It indicates if the Y axis allows to be clicked for navigating to the field
-    (if it's a many2one field). True by default
 field_value
     Show this field as value
 show_row_totals
@@ -73,10 +68,6 @@ show_row_totals
 show_column_totals
     If field_value is a numeric field, it indicates if you want to calculate
     column totals. True by default
-field_att_<name>
-    Declare as many options prefixed with this string as you need for binding
-    a field value with an HTML node attribute (disabled, class, style...)
-    called as the `<name>` passed in the option.
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
@@ -92,7 +83,7 @@ data model and point to it from our wizard. The crucial part is that we fill
 the field in the default function::
 
  from odoo import fields, models
- 
+
  class MyWizard(models.TransientModel):
     _name = 'my.wizard'
 
@@ -105,8 +96,8 @@ the field in the default function::
         return [
             (0, 0, {
                 'name': 'Sample task name',
-                'project_id': p.id, 
-                'user_id': u.id, 
+                'project_id': p.id,
+                'user_id': u.id,
                 'planned_hours': 0,
                 'message_needaction': False,
                 'date_deadline': fields.Date.today(),
@@ -132,26 +123,17 @@ Now in our wizard, we can use::
      </tree>
  </field>
 
-Note that all values in the matrix must exist, so you need to create them
-previously if not present, but you can control visually the editability of
-the fields in the matrix through `field_att_disabled` option with a control
-field.
 
 Known issues / Roadmap
 ======================
 
-* It would be worth trying to instantiate the proper field widget and let it render the input
-* Let the widget deal with the missing values of the full Cartesian product,
-  instead of being forced to pre-fill all the possible values.
-* If you pass values with an onchange, you need to overwrite the model's method
-  `onchange` for making the widget work::
+* 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 to open related records.
+
+* Support limit total records in the matrix. Ref: https://github.com/OCA/web/issues/901
 
- @api.multi
- def onchange(self, values, field_name, field_onchange):
-     if "one2many_field" in field_onchange:
-         for sub in [<field_list>]:
-             field_onchange.setdefault("one2many_field." + sub, u"")
-     return super(model, self).onchange(values, field_name, field_onchange)
 
 Bug Tracker
 ===========
@@ -170,6 +152,9 @@ Contributors
 * Holger Brunn <hbrunn@therp.nl>
 * Pedro M. Baeza <pedro.baeza@tecnativa.com>
 * Artem Kostyuk <a.kostyuk@mobilunity.com>
+* Simone Orsi <simone.orsi@camptocamp.com>
+* Timon Tschanz <timon.tschanz@camptocamp.com>
+
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 41f69a75e..31fa2d5a9 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -1,11 +1,13 @@
 # Copyright 2015 Holger Brunn <hbrunn@therp.nl>
 # Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
     "version": "11.0.1.0.0",
     "author": "Therp BV, "
               "Tecnativa, "
+              "Camptocamp, "
               "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web",
     "license": "AGPL-3",
@@ -15,10 +17,7 @@
         'web',
     ],
     "data": [
-        'views/templates.xml',
-    ],
-    "qweb": [
-        'static/src/xml/web_widget_x2many_2d_matrix.xml',
+        'views/assets.xml',
     ],
     "installable": True,
 }
diff --git a/web_widget_x2many_2d_matrix/static/description/icon.png b/web_widget_x2many_2d_matrix/static/description/icon.png
index d7cdcec3b4f3db5e2af2745392b116e16a2e40b4..a501fbf835ea6ee937588af1c15a104e6a97bf27 100644
GIT binary patch
literal 2477
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

literal 5139
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

diff --git a/web_widget_x2many_2d_matrix/static/description/screenshot.png b/web_widget_x2many_2d_matrix/static/description/screenshot.png
index 47c2a40d62b23f3b5c4b97dbc699f20dc5baa5ba..922e2961351acf706cef3946526403daa48108ee 100644
GIT binary patch
literal 22639
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

literal 19577
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
N87T!sy5wEY{{ynT<+%U=

diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
index 14ed1c536..907f507d2 100644
--- a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
+++ b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
@@ -1,8 +1,3 @@
-.oe_form_field_x2many_2d_matrix th.oe_link
-{
-    cursor: pointer;
-}
-.oe_form_field_x2many_2d_matrix .oe_list_content > tbody > tr > td.oe_list_field_cell
-{
-    white-space: normal;
+.o_field_x2many_2d_matrix .row-total {
+  font-weight: bold;
 }
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
new file mode 100644
index 000000000..898ac0d58
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -0,0 +1,416 @@
+/* Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
+
+odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (require) {
+  "use strict";
+
+  // heavily inspired by Odoo's `ListRenderer`
+  var BasicRenderer = require('web.BasicRenderer');
+  var config = require('web.config');
+  var field_utils = require('web.field_utils');
+  var utils = require('web.utils');
+  var FIELD_CLASSES = {
+    // copied from ListRenderer
+    float: 'o_list_number',
+    integer: 'o_list_number',
+    monetary: 'o_list_number',
+    text: 'o_list_text',
+  };
+
+  var X2Many2dMatrixRenderer = BasicRenderer.extend({
+
+    init: function (parent, state, params) {
+      this._super.apply(this, arguments);
+      this.editable = params.editable;
+      this.columns = params.matrix_data.columns;
+      this.rows = params.matrix_data.rows;
+      this.matrix_data = params.matrix_data;
+    },
+    /**
+     * Main render function for the matrix widget.  It is rendered as a table. For now,
+     * this method does not wait for the field widgets to be ready.
+     *
+     * @override
+     * @private
+     * returns {Deferred} this deferred is resolved immediately
+     */
+    _renderView: function () {
+      var self = this;
+
+      this.$el
+        .removeClass('table-responsive')
+        .empty();
+
+      var $table = $('<table>').addClass('o_list_view table table-condensed table-striped');
+      this.$el
+        .addClass('table-responsive')
+        .append($table);
+
+      this._computeColumnAggregates();
+      this._computeRowAggregates();
+
+      $table
+        .append(this._renderHeader())
+        .append(this._renderBody());
+      if (self.matrix_data.show_column_totals) {
+        $table.append(this._renderFooter());
+      }
+      return this._super();
+    },
+    /**
+     * Render the table body. Looks for the table body and renders the rows in it.
+     * Also it sets the tabindex on every input element.
+     *
+     * @private
+     * return {jQueryElement} The table body element that was just filled.
+     */
+    _renderBody: function () {
+      var $body = $('<tbody>').append(this._renderRows());
+      _.each($body.find('input'), function (td, i) {
+        $(td).attr('tabindex', i);
+      });
+      return $body;
+    },
+    /**
+     * Render the table head of our matrix. Looks for the first table head
+     * and inserts the header into it.
+     *
+     * @private
+     * @return {jQueryElement} The thead element that was inserted into.
+     */
+    _renderHeader: function () {
+      var $tr = $('<tr>').append('<th/>');
+      $tr= $tr.append(_.map(this.columns, this._renderHeaderCell.bind(this)));
+      if (this.matrix_data.show_row_totals) {
+        $tr.append($('<th/>', {class: 'total'}));
+      }
+      return $('<thead>').append($tr);
+    },
+    /**
+     * Render a single header cell. Creates a th and adds the description as text.
+     *
+     * @private
+     * @param {jQueryElement} node
+     * @returns {jQueryElement} the created <th> node.
+     */
+    _renderHeaderCell: function (node) {
+      var name = node.attrs.name;
+      var field = this.state.fields[name];
+      var $th = $('<th>');
+      if (!field) {
+          return $th;
+      }
+      var description;
+      if (node.attrs.widget) {
+        description = this.state.fieldsInfo.list[name].Widget.prototype.description;
+      }
+      if (description === undefined) {
+        description = node.attrs.string || field.string;
+      }
+      $th.text(description).data('name', name);
+
+      if (field.type === 'float' || field.type === 'integer' || field.type === 'monetary') {
+        $th.addClass('text-right');
+      }
+
+      if (config.debug) {
+        var fieldDescr = {
+          field: field,
+          name: name,
+          string: description || name,
+          record: this.state,
+          attrs: node.attrs,
+        };
+        this._addFieldTooltip(fieldDescr, $th);
+      }
+      return $th;
+    },
+    /**
+     * Proxy call to function rendering single row.
+     *
+     * @private
+     * @returns {String} a string with the generated html.
+     *
+     */
+
+    _renderRows: function () {
+      return _.map(this.rows, this._renderRow.bind(this));
+    },
+    /**
+     * Render a single row with all its columns. Renders all the cells and then wraps them with a <tr>.
+     * If aggregate is set on the row it also will generate the aggregate cell.
+     *
+     * @private
+     * @param {Object} row: The row that will be rendered.
+     * @returns {jQueryElement} the <tr> element that has been rendered.
+     */
+    _renderRow: function (row) {
+      var self = this;
+      var $tr = $('<tr/>', {class: 'o_data_row'});
+      $tr = $tr.append(self._renderLabelCell(row.data[0]));
+      var $cells = _.map(this.columns, function (node, index) {
+        var record = row.data[index];
+        // make the widget use our field value for each cell
+        node.attrs.name = self.matrix_data.field_value;
+        return self._renderBodyCell(record, node, index, {mode:''});
+      });
+      $tr = $tr.append($cells);
+      if (row.aggregate) {
+        $tr.append(self._renderAggregateRowCell(row));
+      }
+      return $tr;
+    },
+    /**
+     * Renders the label for a specific row.
+     *
+     * @private
+     * @params {Object} record: Contains the information about the record.
+     * @params {jQueryElement} the cell that was rendered.
+     */
+    _renderLabelCell: function(record) {
+      var $td = $('<td>');
+      var value = record.data[this.matrix_data.field_y_axis];
+      if (value.type == 'record') {
+        // we have a related record
+        value = value.data.display_name;
+      }
+      // get 1st column filled w/ Y label
+      $td.text(value);
+      return $td;
+    },
+    /**
+     * Create a cell and fill it with the aggregate value.
+     *
+     * @private
+     * @param {Object} row: the row object to aggregate.
+     * @returns {jQueryElement} The rendered cell.
+     */
+    _renderAggregateRowCell: function (row) {
+      var $cell = $('<td/>', {class: 'row-total text-right'});
+      this._apply_aggregate_value($cell, row.aggregate);
+      return $cell;
+    },
+    /**
+     * Render a single body Cell.
+     * Gets the field and renders the widget. We force the edit mode, since
+     * we always want the widget to be editable.
+     *
+     * @private
+     * @param {Object} record: Contains the data for this cell
+     * @param {jQueryElement} node: The HTML of the field.
+     * @param {int} colIndex: The index of the current column.
+     * @param {Object} options: The obtions used for the widget
+     * @returns {jQueryElement} the rendered cell.
+     */
+    _renderBodyCell: function (record, node, colIndex, options) {
+      var tdClassName = 'o_data_cell';
+      if (node.tag === 'button') {
+        tdClassName += ' o_list_button';
+      } else if (node.tag === 'field') {
+        var typeClass = FIELD_CLASSES[this.state.fields[node.attrs.name].type];
+        if (typeClass) {
+          tdClassName += (' ' + typeClass);
+        }
+        if (node.attrs.widget) {
+          tdClassName += (' o_' + node.attrs.widget + '_cell');
+        }
+      }
+      // TODO roadmap: here we should collect possible extra params
+      // the user might want to attach to each single cell.
+      var $td = $('<td>', {
+        'class': tdClassName,
+        'data-form-id': record.id,
+        'data-id': record.data.id,
+      });
+      // We register modifiers on the <td> element so that it gets the correct
+      // modifiers classes (for styling)
+      var modifiers = this._registerModifiers(node, record, $td, _.pick(options, 'mode'));
+      // If the invisible modifiers is true, the <td> element is left empty.
+      // Indeed, if the modifiers was to change the whole cell would be
+      // rerendered anyway.
+      if (modifiers.invisible && !(options && options.renderInvisible)) {
+          return $td;
+      }
+      options.mode = 'edit';  // enforce edit mode
+      var widget = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
+      this._handleAttributes(widget.$el, node);
+      return $td.append(widget.$el);
+    },
+    /**
+     * Wraps the column aggregate with a tfoot element
+     *
+     * @private
+     * @returns {jQueryElement} The footer element with the cells in it.
+     */
+    _renderFooter: function () {
+      var $cells = this._renderAggregateColCells();
+      if ($cells) {
+        return $('<tfoot>').append($('<tr>').append('<td/>').append($cells));
+      }
+      return;
+    },
+    /**
+     * Render the Aggregate cells for the column.
+     *
+     * @private
+     * @returns {List} the rendered cells
+     */
+    _renderAggregateColCells: function () {
+      var self = this;
+      return _.map(this.columns, function (column, index) {
+        var $cell = $('<td>', {class: 'col-total text-right'});
+        if (column.aggregate) {
+          self._apply_aggregate_value($cell, column.aggregate);
+        }
+        return $cell;
+      });
+    },
+    /**
+     * Compute the column aggregates.
+     * This function is called everytime the value is changed.
+     *
+     * @private
+     */
+    _computeColumnAggregates: function () {
+      if (!this.matrix_data.show_column_totals) {
+        return;
+      }
+      var self = this,
+          fname = this.matrix_data.field_value,
+          field = this.state.fields[fname];
+      if (!field) { return; }
+      var type = field.type;
+      if (type !== 'integer' && type !== 'float' && type !== 'monetary') {
+        return;
+      }
+      _.each(self.columns, function (column, index) {
+        column.aggregate = {
+          fname: fname,
+          ftype: type,
+          // TODO: translate
+          help: 'Sum',
+          value: 0
+        };
+        _.each(self.rows, function (row) {
+          // var record = _.findWhere(self.state.data, {id: col.data.id});
+          column.aggregate.value += row.data[index].data[fname];
+        });
+      });
+    },
+        /**
+     * Compute the row aggregates.
+     * This function is called everytime the value is changed.
+     *
+     * @private
+     */
+    _computeRowAggregates: function () {
+      if (!this.matrix_data.show_row_totals) {
+        return;
+      }
+      var self = this,
+          fname = this.matrix_data.field_value,
+          field = this.state.fields[fname];
+      if (!field) { return; }
+      var type = field.type;
+      if (type !== 'integer' && type !== 'float' && type !== 'monetary') {
+          return;
+      }
+      _.each(self.rows, function (row) {
+        row.aggregate = {
+          fname: fname,
+          ftype: type,
+          // TODO: translate
+          help: 'Sum',
+          value: 0
+        };
+        _.each(row.data, function (col) {
+          row.aggregate.value += col.data[fname];
+        });
+      });
+    },
+    /**
+     * Takes the given Value, formats it and adds it to the given cell.
+     *
+     * @private
+     * @param {jQueryElement} $cell: The Cell where the aggregate should be added.
+     * @param {Object} aggregate: The object which contains the information about the aggregate value
+     */
+    _apply_aggregate_value: function ($cell, aggregate) {
+      var field = this.state.fields[aggregate.fname],
+          formatter = field_utils.format[field.type];
+      var formattedValue = formatter(aggregate.value, field, {escape: true, });
+      $cell.addClass('total').attr('title', aggregate.help).html(formattedValue);
+    },
+    /**
+     * Check if the change was successful and then update the grid.
+     * This function is required on relational fields.
+     *
+     * @params {Object} state: Contains the current state of the field & all the data
+     * @params {String} id: the id of the updated object.
+     * @params {Array} fields: The fields we have in the view.
+     * @params {Object} ev: The event object.
+     * @returns {Deferred} The deferred object thats gonna be resolved when the change is made.
+     */
+    confirmUpdate: function (state, id, fields, ev) {
+      var self = this;
+      this.state = state;
+      return this.confirmChange(state, id, fields, ev).then(function () {
+        self._refresh(id);
+      });
+    },
+    /**
+     * Refresh our grid.
+     *
+     * @private
+     */
+    _refresh: function (id) {
+      this._updateRow(id);
+      this._refreshColTotals();
+      this._refreshRowTotals();
+    },
+    /**
+     *Update row data in our internal rows.
+     *
+     * @params {String} id: The id of the row that needs to be updated.
+     */
+    _updateRow: function (id) {
+      var self = this,
+          record = _.findWhere(self.state.data, {id: id});
+      _.each(self.rows, function(row) {
+        _.each(row.data, function(col, i) {
+          if (col.id == id) {
+            row.data[i] = record;
+          }
+        });
+      });
+    },
+    /**
+     * Update the row total.
+     */
+    _refreshColTotals: function () {
+      this._computeColumnAggregates();
+      this.$('tfoot').replaceWith(this._renderFooter());
+    },
+    /**
+     * Update the column total.
+     */
+    _refreshRowTotals: function () {
+      var self = this;
+      this._computeRowAggregates();
+      var $rows = self.$el.find('tr.o_data_row');
+      _.each(self.rows, function(row, i) {
+        if (row.aggregate) {
+          $($rows[i]).find('.row-total')
+            .replaceWith(self._renderAggregateRowCell(row));
+        }
+      });
+    },
+    /*
+    x2m fields expect this
+    */
+    getEditableRecordID: function (){ return false;}
+
+  });
+
+  return X2Many2dMatrixRenderer;
+});
diff --git a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
deleted file mode 100644
index 2c0a0cd92..000000000
--- a/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
+++ /dev/null
@@ -1,433 +0,0 @@
-/* Copyright 2015 Holger Brunn <hbrunn@therp.nl>
- * Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
- * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
-
-odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
-    "use strict";
-
-    var core = require('web.core');
-    var FieldManagerMixin = require('web.FieldManagerMixin');
-    var Widget = require('web.Widget');
-    var fieldRegistry = require('web.field_registry');
-    var widgetRegistry = require('web.widget_registry');
-    var widgetOne2many = widgetRegistry.get('one2many');
-    var data = require('web.data');
-    var $ = require('jquery');
-
-    var WidgetX2Many2dMatrix = widgetOne2Many.extend(FieldManagerMixin, {
-        template: 'FieldX2Many2dMatrix',
-        widget_class: 'oe_form_field_x2many_2d_matrix',
-
-        // those will be filled with rows from the dataset
-        by_x_axis: {},
-        by_y_axis: {},
-        by_id: {},
-        // configuration values
-        field_x_axis: 'x',
-        field_label_x_axis: 'x',
-        field_y_axis: 'y',
-        field_label_y_axis: 'y',
-        field_value: 'value',
-        x_axis_clickable: true,
-        y_axis_clickable: true,
-        // information about our datatype
-        is_numeric: false,
-        show_row_totals: true,
-        show_column_totals: true,
-        // this will be filled with the model's fields_get
-        fields: {},
-        // Store fields used to fill HTML attributes
-        fields_att: {},
-
-        parse_boolean: function(val)
-        {
-            if (val.toLowerCase() === 'true' || val === '1') {
-                return true;
-            }
-            return false;
-        },
-
-        // read parameters
-        init: function (parent, fieldname, record, therest) {
-            var res = this._super(parent, fieldname, record, therest);
-            FieldManagerMixin.init.call(this);
-            var node = record.fieldsInfo[therest.viewType][fieldname];
-
-            this.field_x_axis = node.field_x_axis || this.field_x_axis;
-            this.field_y_axis = node.field_y_axis || this.field_y_axis;
-            this.field_label_x_axis = node.field_label_x_axis || this.field_x_axis;
-            this.field_label_y_axis = node.field_label_y_axis || this.field_y_axis;
-            this.x_axis_clickable = this.parse_boolean(node.x_axis_clickable || '1');
-            this.y_axis_clickable = this.parse_boolean(node.y_axis_clickable || '1');
-            this.field_value = node.field_value || this.field_value;
-            for (var property in node) {
-                if (property.startsWith("field_att_")) {
-                    this.fields_att[property.substring(10)] = node[property];
-                }
-            }
-            this.field_editability = node.field_editability || this.field_editability;
-            this.show_row_totals = this.parse_boolean(node.show_row_totals || '1');
-            this.show_column_totals = this.parse_boolean(node.show_column_totals || '1');
-            this.init_fields();
-            // this.set_value(undefined);
-
-            return res;
-        },
-
-        init_fields: function() {
-            return;
-        },
-
-        // return a field's value, id in case it's a one2many field
-        get_field_value: function(row, field, many2one_as_name)
-        // FIXME looks silly
-        {
-            if(this.fields[field].type == 'many2one' && _.isArray(row[field]))
-            {
-                if(many2one_as_name)
-                {
-                    return row[field][1];
-                }
-                else
-                {
-                    return row[field][0];
-                }
-            }
-            return row[field];
-        },
-
-        // setup our datastructure for simple access in the template
-        set_value: function(value_)
-        {
-            var self = this,
-                result = this._super(value_);
-
-            self.by_x_axis = {};
-            self.by_y_axis = {};
-            self.by_id = {};
-
-            return $.when(result).then(function()
-            {
-                return self.dataset._model.call('fields_get').then(function(fields)
-                {
-                    self.fields = fields;
-                    self.is_numeric = fields[self.field_value].type == 'float';
-                    self.show_row_totals &= self.is_numeric;
-                    self.show_column_totals &= self.is_numeric;
-                })
-                // if there are cached writes on the parent dataset, read below
-                // only returns the written data, which is not enough to properly
-                // set up our data structure. Read those ids here and patch the
-                // cache
-                .then(function()
-                {
-                    var ids_written = _.map(
-                        self.dataset.to_write, function(x) { return x.id });
-                    if(!ids_written.length)
-                    {
-                        return;
-                    }
-                    return (new data.Query(self.dataset._model))
-                    .filter([['id', 'in', ids_written]])
-                    .all()
-                    .then(function(rows)
-                    {
-                        _.each(rows, function(row)
-                        {
-                            var cache = _.find(
-                                self.dataset.cache,
-                                function(x) { return x.id == row.id }
-                            );
-                            _.extend(cache.values, row, _.clone(cache.values));
-                        })
-                    })
-                })
-                .then(function()
-                {
-                    return self.dataset.read_ids(self.dataset.ids, self.fields).then(function(rows)
-                    {
-                        // setup data structure
-                        _.each(rows, function(row)
-                        {
-                            self.add_xy_row(row);
-                        });
-                        if(self.is_started && !self.no_rerender)
-                        {
-                            self.renderElement();
-                            self.compute_totals();
-                            self.setup_many2one_axes();
-                            self.$el.find('.edit').on(
-                                'change', self.proxy(self.xy_value_change));
-                            self.effective_readonly_change();
-                        }
-                    });
-                });
-            });
-        },
-
-        // do whatever needed to setup internal data structure
-        add_xy_row: function(row)
-        {
-            var x = this.get_field_value(row, this.field_x_axis),
-                y = this.get_field_value(row, this.field_y_axis);
-            // row is a *copy* of a row in dataset.cache, fetch
-            // a reference to this row in order to have the
-            // internal data structure point to the same data
-            // the dataset manipulates
-            _.every(this.dataset.cache, function(cached_row)
-            {
-                if(cached_row.id == row.id)
-                {
-                    row = cached_row.values;
-                    // new rows don't have that
-                    row.id = cached_row.id;
-                    return false;
-                }
-                return true;
-            });
-            this.by_x_axis[x] = this.by_x_axis[x] || {};
-            this.by_y_axis[y] = this.by_y_axis[y] || {};
-            this.by_x_axis[x][y] = row;
-            this.by_y_axis[y][x] = row;
-            this.by_id[row.id] = row;
-        },
-
-        // get x axis values in the correct order
-        get_x_axis_values: function()
-        {
-            return _.keys(this.by_x_axis);
-        },
-
-        // get y axis values in the correct order
-        get_y_axis_values: function()
-        {
-            return _.keys(this.by_y_axis);
-        },
-
-        // get the label for a value on the x axis
-        get_x_axis_label: function(x)
-        {
-            return this.get_field_value(
-                _.first(_.values(this.by_x_axis[x])),
-                this.field_label_x_axis, true);
-        },
-
-        // get the label for a value on the y axis
-        get_y_axis_label: function(y)
-        {
-            return this.get_field_value(
-                _.first(_.values(this.by_y_axis[y])),
-                this.field_label_y_axis, true);
-        },
-
-        // return the class(es) the inputs should have
-        get_xy_value_class: function()
-        {
-            var classes = 'oe_form_field oe_form_required';
-            if(this.is_numeric)
-            {
-                classes += ' oe_form_field_float';
-            }
-            return classes;
-        },
-
-        // return row id of a coordinate
-        get_xy_id: function(x, y)
-        {
-            return this.by_x_axis[x][y]['id'];
-        },
-
-        get_xy_att: function(x, y)
-        {
-            var vals = {};
-            for (var att in this.fields_att) {
-                var val = this.get_field_value(
-                    this.by_x_axis[x][y], this.fields_att[att]);
-                // Discard empty values
-                if (val) {
-                    vals[att] = val;
-                }
-            }
-            return vals;
-        },
-
-        // return the value of a coordinate
-        get_xy_value: function(x, y)
-        {
-            return this.get_field_value(
-                this.by_x_axis[x][y], this.field_value);
-        },
-
-        // validate a value
-        validate_xy_value: function(val)
-        {
-            try
-            {
-                this.parse_xy_value(val);
-            }
-            catch(e)
-            {
-                return false;
-            }
-            return true;
-        },
-
-        // parse a value from user input
-        parse_xy_value: function(val)
-        {
-                return val;
-        },
-
-        // format a value from the database for display
-        format_xy_value: function(val)
-        {
-                return val;
-        },
-
-        // compute totals
-        compute_totals: function()
-        {
-            var self = this,
-                grand_total = 0,
-                totals_x = {},
-                totals_y = {},
-                rows = this.by_id,
-                deferred = $.Deferred();
-            _.each(rows, function(row)
-            {
-                var key_x = self.get_field_value(row, self.field_x_axis),
-                    key_y = self.get_field_value(row, self.field_y_axis);
-                totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
-                totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
-                grand_total += self.get_field_value(row, self.field_value);
-            });
-            _.each(totals_y, function(total, y)
-            {
-                self.$el.find(
-                    _.str.sprintf('td.row_total[data-y="%s"]', y)).text(
-                        self.format_xy_value(total));
-            });
-            _.each(totals_x, function(total, x)
-            {
-                self.$el.find(
-                    _.str.sprintf('td.column_total[data-x="%s"]', x)).text(
-                        self.format_xy_value(total));
-            });
-            self.$el.find('.grand_total').text(
-                self.format_xy_value(grand_total))
-            deferred.resolve({
-                totals_x: totals_x,
-                totals_y: totals_y,
-                grand_total: grand_total,
-                rows: rows,
-            });
-            return deferred;
-        },
-
-        setup_many2one_axes: function()
-        {
-            if(this.fields[this.field_x_axis].type == 'many2one' && this.x_axis_clickable)
-            {
-                this.$el.find('th[data-x]').addClass('oe_link')
-                .click(_.partial(
-                    this.proxy(this.many2one_axis_click),
-                    this.field_x_axis, 'x'));
-            }
-            if(this.fields[this.field_y_axis].type == 'many2one' && this.y_axis_clickable)
-            {
-                this.$el.find('tr[data-y] th').addClass('oe_link')
-                .click(_.partial(
-                    this.proxy(this.many2one_axis_click),
-                    this.field_y_axis, 'y'));
-            }
-        },
-
-        many2one_axis_click: function(field, id_attribute, e)
-        {
-            this.do_action({
-                type: 'ir.actions.act_window',
-                name: this.fields[field].string,
-                res_model: this.fields[field].relation,
-                res_id: $(e.currentTarget).data(id_attribute),
-                views: [[false, 'form']],
-                target: 'current',
-            })
-        },
-
-        start: function()
-        {
-            var self = this;
-            this.$el.find('.edit').on(
-                'change', self.proxy(this.xy_value_change));
-            this.compute_totals();
-            this.setup_many2one_axes();
-            this.on("change:effective_readonly",
-                    this, this.proxy(this.effective_readonly_change));
-            this.effective_readonly_change();
-            return this._super();
-        },
-
-        xy_value_change: function(e)
-        {
-            var $this = $(e.currentTarget),
-                val = $this.val();
-            if(this.validate_xy_value(val))
-            {
-                var data = {}, value = this.parse_xy_value(val);
-                data[this.field_value] = value;
-
-                $this.siblings('.read').text(this.format_xy_value(value));
-                $this.val(this.format_xy_value(value));
-
-                this.dataset.write($this.data('id'), data);
-                this.by_id[$this.data('id')][this.field_value] = value;
-                $this.parent().removeClass('oe_form_invalid');
-                this.compute_totals();
-            }
-            else
-            {
-                $this.parent().addClass('oe_form_invalid');
-            }
-
-        },
-
-        effective_readonly_change: function()
-        {
-            this.$el
-            .find('tbody .edit')
-            .toggle(!this.get('effective_readonly'));
-            this.$el
-            .find('tbody .read')
-            .toggle(this.get('effective_readonly'));
-            this.$el.find('.edit').first().focus();
-        },
-
-        is_syntax_valid: function()
-        {
-            return this.$el.find('.oe_form_invalid').length == 0;
-        },
-
-        load_views: function() {
-            // Needed for removing the initial empty tree view when the widget
-            // is loaded
-            var self = this,
-                result = this._super();
-
-            return $.when(result).then(function()
-            {
-                self.renderElement();
-                self.compute_totals();
-                self.$el.find('.edit').on(
-                        'change', self.proxy(self.xy_value_change));
-            });
-        },
-    });
-
-    fieldRegistry.add(
-        'x2many_2d_matrix', WidgetX2Many2dMatrix
-    );
-
-    return {
-        WidgetX2Many2dMatrix: WidgetX2Many2dMatrix
-    };
-});
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
new file mode 100644
index 000000000..4b1a73f9c
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -0,0 +1,172 @@
+/* Copyright 2015 Holger Brunn <hbrunn@therp.nl>
+ * Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+ * Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
+
+odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
+  "use strict";
+
+  var core = require('web.core');
+  // var FieldManagerMixin = require('web.FieldManagerMixin');
+  var field_registry = require('web.field_registry');
+  var relational_fields = require('web.relational_fields');
+  var weContext = require('web_editor.context');
+  // var Helpers = require('web_widget_x2many_2d_matrix.helpers');
+  var AbstractField = require('web.AbstractField');
+  var X2Many2dMatrixRenderer = require('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer');
+
+  var WidgetX2Many2dMatrix = relational_fields.FieldOne2Many.extend({
+    widget_class: 'o_form_field_x2many_2d_matrix',
+    /**
+     * Initialize the widget & parameters.
+     *
+     * @param {Object} parent: contains the form view.
+     * @param {String} name: the name of the field.
+     * @param {Object} record: Contains the information about the database records.
+     * @param {Object} options: Contains the view options.
+     */
+    init: function (parent, name, record, options) {
+        this._super(parent, name, record, options);
+        this.init_params();
+    },
+
+    /**
+     * Initialize the widget specific parameters.
+     * Sets the axis and the values.
+     */
+    init_params: function () {
+        var node = this.attrs;
+        this.by_x_axis = {};
+        this.by_y_axis = {};
+        this.field_x_axis = node.field_x_axis || this.field_x_axis;
+        this.field_y_axis = node.field_y_axis || this.field_y_axis;
+        this.field_label_x_axis = node.field_label_x_axis || this.field_x_axis;
+        this.field_label_y_axis = node.field_label_y_axis || this.field_y_axis;
+        this.x_axis_clickable = this.parse_boolean(node.x_axis_clickable || '1');
+        this.y_axis_clickable = this.parse_boolean(node.y_axis_clickable || '1');
+        this.field_value = node.field_value || this.field_value;
+        // TODO: is this really needed? Holger?
+        for (var property in node) {
+          if (property.startsWith("field_att_")) {
+              this.fields_att[property.substring(10)] = node[property];
+          }
+        }
+        // and this?
+        this.field_editability = node.field_editability || this.field_editability;
+        this.show_row_totals = this.parse_boolean(node.show_row_totals || '1');
+        this.show_column_totals = this.parse_boolean(node.show_column_totals || '1');
+        this.init_matrix();
+    },
+    /**
+     * Initializes the Value matrix.
+     * Puts the values in the grid. If we have related items we use the display name.
+     */
+    init_matrix: function(){
+      var self = this,
+          records = self.recordData[this.name].data;
+      _.each(records, function(record) {
+        var x = record.data[self.field_x_axis],
+            y = record.data[self.field_y_axis];
+        if (x.type == 'record') {
+          // we have a related record
+          x = x.data.display_name;
+        }
+        if (y.type == 'record') {
+          // we have a related record
+          y = y.data.display_name;
+        }
+        self.by_x_axis[x] = self.by_x_axis[x] || {};
+        self.by_y_axis[y] = self.by_y_axis[y] || {};
+        self.by_x_axis[x][y] = record;
+        self.by_y_axis[y][x] = record;
+      });
+      // init columns
+      self.columns = [];
+      $.each(self.by_x_axis, function(x){
+        self.columns.push(self._make_column(x));
+      });
+      self.rows = [];
+      $.each(self.by_y_axis, function(y){
+        self.rows.push(self._make_row(y));
+      });
+      self.matrix_data = {
+        'field_value': self.field_value,
+        'field_x_axis': self.field_x_axis,
+        'field_y_axis': self.field_y_axis,
+        'columns': self.columns,
+        'rows': self.rows,
+        'show_row_totals': self.show_row_totals,
+        'show_column_totals': self.show_column_totals
+      };
+
+    },
+    /**
+     * Create scaffold for a column.
+     *
+     * @params {String} x: The string used as a column title
+     */
+    _make_column: function(x){
+      return {
+        // simulate node parsed on xml arch
+        'tag': 'field',
+        'attrs': {
+          'name': this.field_x_axis,
+          'string': x
+        }
+      };
+    },
+    /**
+     * Create scaffold for a row.
+     *
+     * @params {String} x: The string used as a row title
+     */
+    _make_row: function(y){
+      var self = this;
+      // use object so that we can attach more data if needed
+      var row = {'data': []};
+      $.each(self.by_x_axis, function(x) {
+        row.data.push(self.by_y_axis[y][x]);
+      });
+      return row;
+    },
+    /**
+     *Parse a String containing a Python bool or 1 and convert it to a proper bool.
+     *
+     * @params {String} val: the string to be parsed.
+     * @returns {Boolean} The parsed boolean.
+     */
+    parse_boolean: function(val) {
+        if (val.toLowerCase() === 'true' || val === '1') {
+            return true;
+        }
+        return false;
+    },
+    /**
+     *Create the matrix renderer and add its output to our element
+     *
+     * @returns {Deferred} A deferred object to be completed when it finished rendering.
+     */
+    _render: function () {
+      if (!this.view) {
+        return this._super();
+      }
+      var arch = this.view.arch,
+          viewType = 'list';
+      this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
+          arch: arch,
+          editable: true,
+          viewType: viewType,
+          matrix_data: this.matrix_data
+      });
+      this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
+      return this.renderer.appendTo(this.$el);
+    }
+
+  });
+
+  field_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+
+  return {
+    WidgetX2Many2dMatrix: WidgetX2Many2dMatrix
+  };
+});
diff --git a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml b/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
deleted file mode 100644
index b7aaaefe1..000000000
--- a/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<templates>
-    <t t-name="FieldX2Many2dMatrix">
-        <div t-att-class="widget.widget_class">
-            <table class="o_list_view table table-condensed table-striped">
-                <thead>
-                    <tr class="oe_list_header_columns">
-                        <th />
-                        <th t-foreach="widget.get_x_axis_values()" t-as="x" t-att-data-x="x">
-                            <t t-esc="widget.get_x_axis_label(x)" />
-                        </th>
-                        <th t-if="widget.show_row_totals">Total</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr t-foreach="widget.get_y_axis_values()" t-as="y" t-att-data-y="y">
-                        <th><t t-esc="widget.get_y_axis_label(y)" /></th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" t-att-class="'' + (widget.is_numeric ? ' oe_number' : '')" t-att-data-x="x">
-                            <span t-att-class="widget.get_xy_value_class()">
-                                <input class="edit o_form_input oe_edit_only" t-att-data-id="widget.get_xy_id(x, y)" t-att-value="widget.format_xy_value(widget.get_xy_value(x, y))" t-att="widget.get_xy_att(x, y)"/>
-                                <span class="read oe_read_only"><t t-esc="widget.format_xy_value(widget.get_xy_value(x, y))" /></span>
-                            </span>
-                        </td>
-                        <td t-if="widget.show_row_totals" class="row_total oe_number" t-att-data-y="y"/>
-                    </tr>
-                </tbody>
-                <tfoot t-if="widget.show_column_totals">
-                    <tr>
-                        <th>Total</th>
-                        <td t-foreach="widget.get_x_axis_values()" t-as="x" class="oe_list_footer oe_number column_total" t-att-data-x="x" />
-                        <td class="grand_total oe_number" />
-                    </tr>
-                </tfoot>
-            </table>
-        </div>
-    </t>
-</templates>
diff --git a/web_widget_x2many_2d_matrix/views/templates.xml b/web_widget_x2many_2d_matrix/views/assets.xml
similarity index 72%
rename from web_widget_x2many_2d_matrix/views/templates.xml
rename to web_widget_x2many_2d_matrix/views/assets.xml
index 06934cc33..ba820435c 100644
--- a/web_widget_x2many_2d_matrix/views/templates.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -3,7 +3,8 @@
     <data>
         <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js"></script>
+                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
+                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
                 <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
             </xpath>
         </template>

From ca213cd38e8f87f369cad93612d53c6e5e65bbc3 Mon Sep 17 00:00:00 2001
From: Akim Juillerat <akim.juillerat@camptocamp.com>
Date: Tue, 17 Apr 2018 19:35:30 +0200
Subject: [PATCH 46/95] [11.0] x2m matrix widget: Fix display of widget when
 called in onchange

Add nicer message when there are no values to display
---
 web_widget_x2many_2d_matrix/__manifest__.py         |  2 +-
 .../static/src/js/2d_matrix_renderer.js             | 13 ++++++++++---
 .../static/src/js/widget_x2many_2d_matrix.js        | 10 +++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 31fa2d5a9..feb60f5dd 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
-    "version": "11.0.1.0.0",
+    "version": "11.0.1.0.1",
     "author": "Therp BV, "
               "Tecnativa, "
               "Camptocamp, "
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 898ac0d58..c6a192f07 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -9,6 +9,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
   var config = require('web.config');
   var field_utils = require('web.field_utils');
   var utils = require('web.utils');
+  var core = require('web.core');
+  var _t = core._t
   var FIELD_CLASSES = {
     // copied from ListRenderer
     float: 'o_list_number',
@@ -37,9 +39,14 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
     _renderView: function () {
       var self = this;
 
-      this.$el
-        .removeClass('table-responsive')
-        .empty();
+      // Display a nice message if there's no data to display
+      this.$el.empty();
+      if (!self.rows.length){
+        var $alert = $('<div>', {'class': 'alert alert-info'});
+        $alert.text(_t('Sorry no matrix data to display.'));
+        this.$el.append($alert);
+        return this._super();
+      }
 
       var $table = $('<table>').addClass('o_list_view table table-condensed table-striped');
       this.$el
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 4b1a73f9c..56d2598fe 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -55,7 +55,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         this.field_editability = node.field_editability || this.field_editability;
         this.show_row_totals = this.parse_boolean(node.show_row_totals || '1');
         this.show_column_totals = this.parse_boolean(node.show_column_totals || '1');
-        this.init_matrix();
+
     },
     /**
      * Initializes the Value matrix.
@@ -64,6 +64,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
     init_matrix: function(){
       var self = this,
           records = self.recordData[this.name].data;
+      // Wipe the content if something still exists
+      this.by_x_axis = {};
+      this.by_y_axis = {};
       _.each(records, function(record) {
         var x = record.data[self.field_x_axis],
             y = record.data[self.field_y_axis];
@@ -150,6 +153,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
       if (!this.view) {
         return this._super();
       }
+      // Ensure widget is re initiated when rendering
+      this.init_matrix();
       var arch = this.view.arch,
           viewType = 'list';
       this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
@@ -159,7 +164,10 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
           matrix_data: this.matrix_data
       });
       this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
+      // Remove previous rendered and add the newly created one
+      this.$el.find('div:not(.o_x2m_control_panel)').remove();
       return this.renderer.appendTo(this.$el);
+
     }
 
   });

From 15e39d44b27428824f13bc25cef33ad4c505dc02 Mon Sep 17 00:00:00 2001
From: mreficent <miquel.raich@eficent.com>
Date: Wed, 2 May 2018 14:28:12 +0200
Subject: [PATCH 47/95] [FIX] Make matrix editable depending of the status of
 the parent

---
 web_widget_x2many_2d_matrix/__manifest__.py                     | 2 +-
 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index feb60f5dd..d3743de27 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
-    "version": "11.0.1.0.1",
+    "version": "11.0.1.0.2",
     "author": "Therp BV, "
               "Tecnativa, "
               "Camptocamp, "
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index c6a192f07..092278a56 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -238,7 +238,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
       if (modifiers.invisible && !(options && options.renderInvisible)) {
           return $td;
       }
-      options.mode = 'edit';  // enforce edit mode
+      options.mode = this.getParent().mode;  // enforce mode of the parent
       var widget = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
       this._handleAttributes(widget.$el, node);
       return $td.append(widget.$el);

From c7d68fe08f84b9399671c4733c7c9445f762a768 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sun, 24 Jun 2018 10:28:19 +0000
Subject: [PATCH 48/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 web_widget_x2many_2d_matrix/i18n/ar.po        | 20 ++++++++++-------
 web_widget_x2many_2d_matrix/i18n/de.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/es.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/fi.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/fr.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/hr.po        | 20 ++++++++++-------
 web_widget_x2many_2d_matrix/i18n/it.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/lt.po        | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/nl_NL.po     | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/pt_BR.po     | 17 ++++++++------
 web_widget_x2many_2d_matrix/i18n/sl.po        | 20 ++++++++++-------
 web_widget_x2many_2d_matrix/i18n/tr.po        | 17 ++++++++------
 .../i18n/web_widget_x2many_2d_matrix.pot      | 22 +++++++++++++++++++
 13 files changed, 148 insertions(+), 87 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
index 7a85d2bde..6b12b83b8 100644
--- a/web_widget_x2many_2d_matrix/i18n/ar.po
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # SaFi J. <safi2266@gmail.com>, 2015
 msgid ""
@@ -11,17 +11,21 @@ msgstr ""
 "POT-Creation-Date: 2015-12-16 07:41+0000\n"
 "PO-Revision-Date: 2015-12-16 17:24+0000\n"
 "Last-Translator: SaFi J. <safi2266@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/oca/OCA-web-8-0/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "المجموع الاجمالي"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
index 337d2b944..53c95477e 100644
--- a/web_widget_x2many_2d_matrix/i18n/de.po
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2016
 msgid ""
@@ -11,17 +11,20 @@ msgstr ""
 "POT-Creation-Date: 2016-01-10 07:31+0000\n"
 "PO-Revision-Date: 2016-01-18 20:15+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
-"Language-Team: German (http://www.transifex.com/oca/OCA-web-8-0/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Gesamt"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
index 10ba2f9f8..467451467 100644
--- a/web_widget_x2many_2d_matrix/i18n/es.po
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,17 +10,20 @@ msgstr ""
 "POT-Creation-Date: 2015-11-23 13:46+0000\n"
 "PO-Revision-Date: 2015-11-07 11:29+0000\n"
 "Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/oca/OCA-web-8-0/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Total"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
index df37d34a7..50321d78a 100644
--- a/web_widget_x2many_2d_matrix/i18n/fi.po
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016
 msgid ""
@@ -11,17 +11,20 @@ msgstr ""
 "POT-Creation-Date: 2016-01-10 07:31+0000\n"
 "PO-Revision-Date: 2016-02-01 09:54+0000\n"
 "Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/oca/OCA-web-8-0/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Yhteensä"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index 7ed8bc355..73c195491 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,17 +10,20 @@ msgstr ""
 "POT-Creation-Date: 2016-05-06 15:50+0000\n"
 "PO-Revision-Date: 2015-11-07 11:22+0000\n"
 "Last-Translator: <>\n"
-"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Total"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index f209e2941..7a9c1d999 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>, 2016
 msgid ""
@@ -11,17 +11,21 @@ msgstr ""
 "POT-Creation-Date: 2016-08-25 00:51+0000\n"
 "PO-Revision-Date: 2016-08-19 11:47+0000\n"
 "Last-Translator: Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>\n"
-"Language-Team: Croatian (http://www.transifex.com/oca/OCA-web-8-0/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Ukupno"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index 5b5d0bf31..09f323628 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,17 +10,20 @@ msgstr ""
 "POT-Creation-Date: 2016-03-17 07:30+0000\n"
 "PO-Revision-Date: 2015-11-07 11:22+0000\n"
 "Last-Translator: <>\n"
-"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Totale"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index 57a65fc55..c2c47a021 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Viktoras Norkus <viktoras@bmx.lt>, 2018
 msgid ""
@@ -12,16 +12,19 @@ msgstr ""
 "PO-Revision-Date: 2018-02-15 12:40+0200\n"
 "Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Suma"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index e1fde063c..5a792ed3d 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
@@ -11,17 +11,20 @@ msgstr ""
 "POT-Creation-Date: 2018-01-03 03:50+0000\n"
 "PO-Revision-Date: 2018-02-15 12:39+0200\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Totaal"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Totaal"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index c56e07fa6..810d4e1c9 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,17 +10,20 @@ msgstr ""
 "POT-Creation-Date: 2016-03-11 02:18+0000\n"
 "PO-Revision-Date: 2016-03-05 16:20+0000\n"
 "Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/"
+"language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Total"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
index 07ae09c5d..83c518e00 100644
--- a/web_widget_x2many_2d_matrix/i18n/sl.po
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,17 +10,21 @@ msgstr ""
 "POT-Creation-Date: 2015-11-23 13:46+0000\n"
 "PO-Revision-Date: 2015-11-08 05:48+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
-"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-web-8-0/language/sl/)\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Skupaj"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
index 635773bda..0e192ed2a 100644
--- a/web_widget_x2many_2d_matrix/i18n/tr.po
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * web_widget_x2many_2d_matrix
-# 
+#
 # Translators:
 # Ahmet Altınışık <aaltinisik@altinkaya.com.tr>, 2015
 msgid ""
@@ -11,17 +11,20 @@ msgstr ""
 "POT-Creation-Date: 2016-01-08 21:34+0000\n"
 "PO-Revision-Date: 2015-12-30 22:00+0000\n"
 "Last-Translator: Ahmet Altınışık <aaltinisik@altinkaya.com.tr>\n"
-"Language-Team: Turkish (http://www.transifex.com/oca/OCA-web-8-0/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:11
-#: code:addons/web_widget_x2many_2d_matrix/static/src/xml/web_widget_x2many_2d_matrix.xml:28
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
-msgid "Total"
-msgstr "Toplam"
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#~ msgid "Total"
+#~ msgstr "Toplam"
diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
new file mode 100644
index 000000000..05da1c2ce
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -0,0 +1,22 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* web_widget_x2many_2d_matrix
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#, python-format
+msgid "Sorry no matrix data to display."
+msgstr ""
+

From 90f7159b80485b52e54eac8260815d6b989a7c46 Mon Sep 17 00:00:00 2001
From: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>
Date: Fri, 3 Aug 2018 13:20:58 +0000
Subject: [PATCH 49/95] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100,0% (1 of 1 strings)

Translation: web-11.0/web-11.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_widget_x2many_2d_matrix/pt_BR/
---
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index 810d4e1c9..e9999626d 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -8,22 +8,23 @@ msgstr ""
 "Project-Id-Version: web (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-03-11 02:18+0000\n"
-"PO-Revision-Date: 2016-03-05 16:20+0000\n"
-"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"PO-Revision-Date: 2018-08-03 13:20+0000\n"
+"Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/"
 "language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.1.1\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
 #, python-format
 msgid "Sorry no matrix data to display."
-msgstr ""
+msgstr "Desculpe não há dados de matriz para exibir."
 
 #~ msgid "Total"
 #~ msgstr "Total"

From 36913cd8962b9f634915152fe365021a9950c5c6 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Tue, 21 Aug 2018 13:45:09 +0100
Subject: [PATCH 50/95] [FIX] web_widget_x2many_2d_matrix: Fix linters

---
 web_widget_x2many_2d_matrix/README.rst        |   2 +-
 .../static/src/js/2d_matrix_renderer.js       | 893 ++++++++++--------
 .../static/src/js/widget_x2many_2d_matrix.js  | 343 +++----
 3 files changed, 661 insertions(+), 577 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 52eb81b13..aba2f90a7 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -154,7 +154,7 @@ Contributors
 * Artem Kostyuk <a.kostyuk@mobilunity.com>
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Timon Tschanz <timon.tschanz@camptocamp.com>
-
+* Jairo Llopis <jairo.llopis@tecnativa.com>
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 092278a56..6cb66ac28 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -2,422 +2,491 @@
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
 odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (require) {
-  "use strict";
+    "use strict";
 
-  // heavily inspired by Odoo's `ListRenderer`
-  var BasicRenderer = require('web.BasicRenderer');
-  var config = require('web.config');
-  var field_utils = require('web.field_utils');
-  var utils = require('web.utils');
-  var core = require('web.core');
-  var _t = core._t
-  var FIELD_CLASSES = {
-    // copied from ListRenderer
-    float: 'o_list_number',
-    integer: 'o_list_number',
-    monetary: 'o_list_number',
-    text: 'o_list_text',
-  };
+    // heavily inspired by Odoo's `ListRenderer`
+    var BasicRenderer = require('web.BasicRenderer');
+    var config = require('web.config');
+    var core = require('web.core');
+    var field_utils = require('web.field_utils');
+    var _t = core._t;
+    var FIELD_CLASSES = {
+        // copied from ListRenderer
+        float: 'o_list_number',
+        integer: 'o_list_number',
+        monetary: 'o_list_number',
+        text: 'o_list_text',
+    };
 
-  var X2Many2dMatrixRenderer = BasicRenderer.extend({
+    var X2Many2dMatrixRenderer = BasicRenderer.extend({
 
-    init: function (parent, state, params) {
-      this._super.apply(this, arguments);
-      this.editable = params.editable;
-      this.columns = params.matrix_data.columns;
-      this.rows = params.matrix_data.rows;
-      this.matrix_data = params.matrix_data;
-    },
-    /**
-     * Main render function for the matrix widget.  It is rendered as a table. For now,
-     * this method does not wait for the field widgets to be ready.
-     *
-     * @override
-     * @private
-     * returns {Deferred} this deferred is resolved immediately
-     */
-    _renderView: function () {
-      var self = this;
-
-      // Display a nice message if there's no data to display
-      this.$el.empty();
-      if (!self.rows.length){
-        var $alert = $('<div>', {'class': 'alert alert-info'});
-        $alert.text(_t('Sorry no matrix data to display.'));
-        this.$el.append($alert);
-        return this._super();
-      }
-
-      var $table = $('<table>').addClass('o_list_view table table-condensed table-striped');
-      this.$el
-        .addClass('table-responsive')
-        .append($table);
-
-      this._computeColumnAggregates();
-      this._computeRowAggregates();
-
-      $table
-        .append(this._renderHeader())
-        .append(this._renderBody());
-      if (self.matrix_data.show_column_totals) {
-        $table.append(this._renderFooter());
-      }
-      return this._super();
-    },
-    /**
-     * Render the table body. Looks for the table body and renders the rows in it.
-     * Also it sets the tabindex on every input element.
-     *
-     * @private
-     * return {jQueryElement} The table body element that was just filled.
-     */
-    _renderBody: function () {
-      var $body = $('<tbody>').append(this._renderRows());
-      _.each($body.find('input'), function (td, i) {
-        $(td).attr('tabindex', i);
-      });
-      return $body;
-    },
-    /**
-     * Render the table head of our matrix. Looks for the first table head
-     * and inserts the header into it.
-     *
-     * @private
-     * @return {jQueryElement} The thead element that was inserted into.
-     */
-    _renderHeader: function () {
-      var $tr = $('<tr>').append('<th/>');
-      $tr= $tr.append(_.map(this.columns, this._renderHeaderCell.bind(this)));
-      if (this.matrix_data.show_row_totals) {
-        $tr.append($('<th/>', {class: 'total'}));
-      }
-      return $('<thead>').append($tr);
-    },
-    /**
-     * Render a single header cell. Creates a th and adds the description as text.
-     *
-     * @private
-     * @param {jQueryElement} node
-     * @returns {jQueryElement} the created <th> node.
-     */
-    _renderHeaderCell: function (node) {
-      var name = node.attrs.name;
-      var field = this.state.fields[name];
-      var $th = $('<th>');
-      if (!field) {
-          return $th;
-      }
-      var description;
-      if (node.attrs.widget) {
-        description = this.state.fieldsInfo.list[name].Widget.prototype.description;
-      }
-      if (description === undefined) {
-        description = node.attrs.string || field.string;
-      }
-      $th.text(description).data('name', name);
-
-      if (field.type === 'float' || field.type === 'integer' || field.type === 'monetary') {
-        $th.addClass('text-right');
-      }
-
-      if (config.debug) {
-        var fieldDescr = {
-          field: field,
-          name: name,
-          string: description || name,
-          record: this.state,
-          attrs: node.attrs,
-        };
-        this._addFieldTooltip(fieldDescr, $th);
-      }
-      return $th;
-    },
-    /**
-     * Proxy call to function rendering single row.
-     *
-     * @private
-     * @returns {String} a string with the generated html.
-     *
-     */
-
-    _renderRows: function () {
-      return _.map(this.rows, this._renderRow.bind(this));
-    },
-    /**
-     * Render a single row with all its columns. Renders all the cells and then wraps them with a <tr>.
-     * If aggregate is set on the row it also will generate the aggregate cell.
-     *
-     * @private
-     * @param {Object} row: The row that will be rendered.
-     * @returns {jQueryElement} the <tr> element that has been rendered.
-     */
-    _renderRow: function (row) {
-      var self = this;
-      var $tr = $('<tr/>', {class: 'o_data_row'});
-      $tr = $tr.append(self._renderLabelCell(row.data[0]));
-      var $cells = _.map(this.columns, function (node, index) {
-        var record = row.data[index];
-        // make the widget use our field value for each cell
-        node.attrs.name = self.matrix_data.field_value;
-        return self._renderBodyCell(record, node, index, {mode:''});
-      });
-      $tr = $tr.append($cells);
-      if (row.aggregate) {
-        $tr.append(self._renderAggregateRowCell(row));
-      }
-      return $tr;
-    },
-    /**
-     * Renders the label for a specific row.
-     *
-     * @private
-     * @params {Object} record: Contains the information about the record.
-     * @params {jQueryElement} the cell that was rendered.
-     */
-    _renderLabelCell: function(record) {
-      var $td = $('<td>');
-      var value = record.data[this.matrix_data.field_y_axis];
-      if (value.type == 'record') {
-        // we have a related record
-        value = value.data.display_name;
-      }
-      // get 1st column filled w/ Y label
-      $td.text(value);
-      return $td;
-    },
-    /**
-     * Create a cell and fill it with the aggregate value.
-     *
-     * @private
-     * @param {Object} row: the row object to aggregate.
-     * @returns {jQueryElement} The rendered cell.
-     */
-    _renderAggregateRowCell: function (row) {
-      var $cell = $('<td/>', {class: 'row-total text-right'});
-      this._apply_aggregate_value($cell, row.aggregate);
-      return $cell;
-    },
-    /**
-     * Render a single body Cell.
-     * Gets the field and renders the widget. We force the edit mode, since
-     * we always want the widget to be editable.
-     *
-     * @private
-     * @param {Object} record: Contains the data for this cell
-     * @param {jQueryElement} node: The HTML of the field.
-     * @param {int} colIndex: The index of the current column.
-     * @param {Object} options: The obtions used for the widget
-     * @returns {jQueryElement} the rendered cell.
-     */
-    _renderBodyCell: function (record, node, colIndex, options) {
-      var tdClassName = 'o_data_cell';
-      if (node.tag === 'button') {
-        tdClassName += ' o_list_button';
-      } else if (node.tag === 'field') {
-        var typeClass = FIELD_CLASSES[this.state.fields[node.attrs.name].type];
-        if (typeClass) {
-          tdClassName += (' ' + typeClass);
-        }
-        if (node.attrs.widget) {
-          tdClassName += (' o_' + node.attrs.widget + '_cell');
-        }
-      }
-      // TODO roadmap: here we should collect possible extra params
-      // the user might want to attach to each single cell.
-      var $td = $('<td>', {
-        'class': tdClassName,
-        'data-form-id': record.id,
-        'data-id': record.data.id,
-      });
-      // We register modifiers on the <td> element so that it gets the correct
-      // modifiers classes (for styling)
-      var modifiers = this._registerModifiers(node, record, $td, _.pick(options, 'mode'));
-      // If the invisible modifiers is true, the <td> element is left empty.
-      // Indeed, if the modifiers was to change the whole cell would be
-      // rerendered anyway.
-      if (modifiers.invisible && !(options && options.renderInvisible)) {
-          return $td;
-      }
-      options.mode = this.getParent().mode;  // enforce mode of the parent
-      var widget = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
-      this._handleAttributes(widget.$el, node);
-      return $td.append(widget.$el);
-    },
-    /**
-     * Wraps the column aggregate with a tfoot element
-     *
-     * @private
-     * @returns {jQueryElement} The footer element with the cells in it.
-     */
-    _renderFooter: function () {
-      var $cells = this._renderAggregateColCells();
-      if ($cells) {
-        return $('<tfoot>').append($('<tr>').append('<td/>').append($cells));
-      }
-      return;
-    },
-    /**
-     * Render the Aggregate cells for the column.
-     *
-     * @private
-     * @returns {List} the rendered cells
-     */
-    _renderAggregateColCells: function () {
-      var self = this;
-      return _.map(this.columns, function (column, index) {
-        var $cell = $('<td>', {class: 'col-total text-right'});
-        if (column.aggregate) {
-          self._apply_aggregate_value($cell, column.aggregate);
-        }
-        return $cell;
-      });
-    },
-    /**
-     * Compute the column aggregates.
-     * This function is called everytime the value is changed.
-     *
-     * @private
-     */
-    _computeColumnAggregates: function () {
-      if (!this.matrix_data.show_column_totals) {
-        return;
-      }
-      var self = this,
-          fname = this.matrix_data.field_value,
-          field = this.state.fields[fname];
-      if (!field) { return; }
-      var type = field.type;
-      if (type !== 'integer' && type !== 'float' && type !== 'monetary') {
-        return;
-      }
-      _.each(self.columns, function (column, index) {
-        column.aggregate = {
-          fname: fname,
-          ftype: type,
-          // TODO: translate
-          help: 'Sum',
-          value: 0
-        };
-        _.each(self.rows, function (row) {
-          // var record = _.findWhere(self.state.data, {id: col.data.id});
-          column.aggregate.value += row.data[index].data[fname];
-        });
-      });
-    },
         /**
-     * Compute the row aggregates.
-     * This function is called everytime the value is changed.
-     *
-     * @private
-     */
-    _computeRowAggregates: function () {
-      if (!this.matrix_data.show_row_totals) {
-        return;
-      }
-      var self = this,
-          fname = this.matrix_data.field_value,
-          field = this.state.fields[fname];
-      if (!field) { return; }
-      var type = field.type;
-      if (type !== 'integer' && type !== 'float' && type !== 'monetary') {
-          return;
-      }
-      _.each(self.rows, function (row) {
-        row.aggregate = {
-          fname: fname,
-          ftype: type,
-          // TODO: translate
-          help: 'Sum',
-          value: 0
-        };
-        _.each(row.data, function (col) {
-          row.aggregate.value += col.data[fname];
-        });
-      });
-    },
-    /**
-     * Takes the given Value, formats it and adds it to the given cell.
-     *
-     * @private
-     * @param {jQueryElement} $cell: The Cell where the aggregate should be added.
-     * @param {Object} aggregate: The object which contains the information about the aggregate value
-     */
-    _apply_aggregate_value: function ($cell, aggregate) {
-      var field = this.state.fields[aggregate.fname],
-          formatter = field_utils.format[field.type];
-      var formattedValue = formatter(aggregate.value, field, {escape: true, });
-      $cell.addClass('total').attr('title', aggregate.help).html(formattedValue);
-    },
-    /**
-     * Check if the change was successful and then update the grid.
-     * This function is required on relational fields.
-     *
-     * @params {Object} state: Contains the current state of the field & all the data
-     * @params {String} id: the id of the updated object.
-     * @params {Array} fields: The fields we have in the view.
-     * @params {Object} ev: The event object.
-     * @returns {Deferred} The deferred object thats gonna be resolved when the change is made.
-     */
-    confirmUpdate: function (state, id, fields, ev) {
-      var self = this;
-      this.state = state;
-      return this.confirmChange(state, id, fields, ev).then(function () {
-        self._refresh(id);
-      });
-    },
-    /**
-     * Refresh our grid.
-     *
-     * @private
-     */
-    _refresh: function (id) {
-      this._updateRow(id);
-      this._refreshColTotals();
-      this._refreshRowTotals();
-    },
-    /**
-     *Update row data in our internal rows.
-     *
-     * @params {String} id: The id of the row that needs to be updated.
-     */
-    _updateRow: function (id) {
-      var self = this,
-          record = _.findWhere(self.state.data, {id: id});
-      _.each(self.rows, function(row) {
-        _.each(row.data, function(col, i) {
-          if (col.id == id) {
-            row.data[i] = record;
-          }
-        });
-      });
-    },
-    /**
-     * Update the row total.
-     */
-    _refreshColTotals: function () {
-      this._computeColumnAggregates();
-      this.$('tfoot').replaceWith(this._renderFooter());
-    },
-    /**
-     * Update the column total.
-     */
-    _refreshRowTotals: function () {
-      var self = this;
-      this._computeRowAggregates();
-      var $rows = self.$el.find('tr.o_data_row');
-      _.each(self.rows, function(row, i) {
-        if (row.aggregate) {
-          $($rows[i]).find('.row-total')
-            .replaceWith(self._renderAggregateRowCell(row));
-        }
-      });
-    },
-    /*
-    x2m fields expect this
-    */
-    getEditableRecordID: function (){ return false;}
+         * @override
+         */
+        init: function (parent, state, params) {
+            this._super.apply(this, arguments);
+            this.editable = params.editable;
+            this.columns = params.matrix_data.columns;
+            this.rows = params.matrix_data.rows;
+            this.matrix_data = params.matrix_data;
+        },
 
-  });
+        /**
+         * Main render function for the matrix widget.
+         *
+         * It is rendered as a table. For now,
+         * this method does not wait for the field widgets to be ready.
+         *
+         * @override
+         * @private
+         * @returns {Deferred} this deferred is resolved immediately
+         */
+        _renderView: function () {
+            var self = this;
 
-  return X2Many2dMatrixRenderer;
+            // Display a nice message if there's no data to display
+            this.$el.empty();
+            if (!self.rows.length) {
+                var $alert = $('<div>', {'class': 'alert alert-info'});
+                $alert.text(_t('Sorry no matrix data to display.'));
+                this.$el.append($alert);
+                return this._super();
+            }
+
+            var $table = $('<table>').addClass(
+                'o_list_view table table-condensed table-striped'
+            );
+            this.$el
+                .addClass('table-responsive')
+                .append($table);
+
+            this._computeColumnAggregates();
+            this._computeRowAggregates();
+
+            $table
+                .append(this._renderHeader())
+                .append(this._renderBody());
+            if (self.matrix_data.show_column_totals) {
+                $table.append(this._renderFooter());
+            }
+            return this._super();
+        },
+
+        /**
+         * Render the table body.
+         *
+         * Looks for the table body and renders the rows in it.
+         * Also it sets the tabindex on every input element.
+         *
+         * @private
+         * @returns {jQueryElement} The table body element just filled.
+         */
+        _renderBody: function () {
+            var $body = $('<tbody>').append(this._renderRows());
+            _.each($body.find('input'), function (td, i) {
+                $(td).attr('tabindex', i);
+            });
+            return $body;
+        },
+
+        /**
+         * Render the table head of our matrix. Looks for the first table head
+         * and inserts the header into it.
+         *
+         * @private
+         * @returns {jQueryElement} The thead element that was inserted into.
+         */
+        _renderHeader: function () {
+            var $tr = $('<tr>').append('<th/>');
+            $tr = $tr.append(_.map(
+                this.columns,
+                this._renderHeaderCell.bind(this)
+            ));
+            if (this.matrix_data.show_row_totals) {
+                $tr.append($('<th/>', {class: 'total'}));
+            }
+            return $('<thead>').append($tr);
+        },
+
+        /**
+         * Render a single header cell.
+         *
+         * Creates a th and adds the description as text.
+         *
+         * @private
+         * @param {jQueryElement} node
+         * @returns {jQueryElement} the created <th> node.
+         */
+        _renderHeaderCell: function (node) {
+            var name = node.attrs.name;
+            var field = this.state.fields[name];
+            var $th = $('<th>');
+            if (!field) {
+                return $th;
+            }
+            var description = null;
+            if (node.attrs.widget) {
+                description = this.state.fieldsInfo.list[name]
+                    .Widget.prototype.description;
+            }
+            if (_.isNull(description)) {
+                description = node.attrs.string || field.string;
+            }
+            $th.text(description).data('name', name);
+
+            if (
+                field.type === 'float' || field.type === 'integer' ||
+                field.type === 'monetary'
+            ) {
+                $th.addClass('text-right');
+            }
+
+            if (config.debug) {
+                var fieldDescr = {
+                    field: field,
+                    name: name,
+                    string: description || name,
+                    record: this.state,
+                    attrs: node.attrs,
+                };
+                this._addFieldTooltip(fieldDescr, $th);
+            }
+            return $th;
+        },
+
+        /**
+         * Proxy call to function rendering single row.
+         *
+         * @private
+         * @returns {String} a string with the generated html.
+         *
+         */
+        _renderRows: function () {
+            return _.map(this.rows, this._renderRow.bind(this));
+        },
+
+        /**
+         * Render a single row with all its columns.
+         * Renders all the cells and then wraps them with a <tr>.
+         * If aggregate is set on the row it also will generate
+         * the aggregate cell.
+         *
+         * @private
+         * @param {Object} row: The row that will be rendered.
+         * @returns {jQueryElement} the <tr> element that has been rendered.
+         */
+        _renderRow: function (row) {
+            var self = this;
+            var $tr = $('<tr/>', {class: 'o_data_row'});
+            $tr = $tr.append(self._renderLabelCell(row.data[0]));
+            var $cells = _.map(this.columns, function (node, index) {
+                var record = row.data[index];
+                // make the widget use our field value for each cell
+                node.attrs.name = self.matrix_data.field_value;
+                return self._renderBodyCell(record, node, index, {mode:''});
+            });
+            $tr = $tr.append($cells);
+            if (row.aggregate) {
+                $tr.append(self._renderAggregateRowCell(row));
+            }
+            return $tr;
+        },
+
+        /**
+         * Renders the label for a specific row.
+         *
+         * @private
+         * @param {Object} record Contains the information about the record.
+         * @returns {jQueryElement} the cell that was rendered.
+         */
+        _renderLabelCell: function (record) {
+            var $td = $('<td>');
+            var value = record.data[this.matrix_data.field_y_axis];
+            if (value.type === 'record') {
+                // we have a related record
+                value = value.data.display_name;
+            }
+            // get 1st column filled w/ Y label
+            $td.text(value);
+            return $td;
+        },
+
+        /**
+         * Create a cell and fill it with the aggregate value.
+         *
+         * @private
+         * @param {Object} row: the row object to aggregate.
+         * @returns {jQueryElement} The rendered cell.
+         */
+        _renderAggregateRowCell: function (row) {
+            var $cell = $('<td/>', {class: 'row-total text-right'});
+            this._apply_aggregate_value($cell, row.aggregate);
+            return $cell;
+        },
+
+        /**
+         * Render a single body Cell.
+         * Gets the field and renders the widget. We force the edit mode, since
+         * we always want the widget to be editable.
+         *
+         * @private
+         * @param {Object} record: Contains the data for this cell
+         * @param {jQueryElement} node: The HTML of the field.
+         * @param {int} colIndex: The index of the current column.
+         * @param {Object} options: The obtions used for the widget
+         * @returns {jQueryElement} the rendered cell.
+         */
+        _renderBodyCell: function (record, node, colIndex, options) {
+            var tdClassName = 'o_data_cell';
+            if (node.tag === 'button') {
+                tdClassName += ' o_list_button';
+            } else if (node.tag === 'field') {
+                var typeClass = FIELD_CLASSES[
+                    this.state.fields[node.attrs.name].type
+                ];
+                if (typeClass) {
+                    tdClassName += ' ' + typeClass;
+                }
+                if (node.attrs.widget) {
+                    tdClassName += ' o_' + node.attrs.widget + '_cell';
+                }
+            }
+            // TODO roadmap: here we should collect possible extra params
+            // the user might want to attach to each single cell.
+            var $td = $('<td>', {
+                'class': tdClassName,
+                'data-form-id': record.id,
+                'data-id': record.data.id,
+            });
+            // We register modifiers on the <td> element so that it gets
+            // the correct modifiers classes (for styling)
+            var modifiers = this._registerModifiers(
+                node,
+                record,
+                $td,
+                _.pick(options, 'mode')
+            );
+            // If the invisible modifiers is true, the <td> element is
+            // left empty. Indeed, if the modifiers was to change the
+            // whole cell would be rerendered anyway.
+            if (modifiers.invisible && !(options && options.renderInvisible)) {
+                return $td;
+            }
+            // enforce mode of the parent
+            options.mode = this.getParent().mode;
+            var widget = this._renderFieldWidget(
+                node, record, _.pick(options, 'mode')
+            );
+            this._handleAttributes(widget.$el, node);
+            return $td.append(widget.$el);
+        },
+
+        /**
+         * Wraps the column aggregate with a tfoot element
+         *
+         * @private
+         * @returns {jQueryElement} The footer element with the cells in it.
+         */
+        _renderFooter: function () {
+            var $cells = this._renderAggregateColCells();
+            if ($cells) {
+                return $('<tfoot>').append(
+                    $('<tr>').append('<td/>').append($cells)
+                );
+            }
+        },
+
+        /**
+         * Render the Aggregate cells for the column.
+         *
+         * @private
+         * @returns {List} the rendered cells
+         */
+        _renderAggregateColCells: function () {
+            var self = this;
+            return _.map(this.columns, function (column) {
+                var $cell = $('<td>', {class: 'col-total text-right'});
+                if (column.aggregate) {
+                    self._apply_aggregate_value($cell, column.aggregate);
+                }
+                return $cell;
+            });
+        },
+
+        /**
+         * Compute the column aggregates.
+         * This function is called everytime the value is changed.
+         *
+         * @private
+         */
+        _computeColumnAggregates: function () {
+            if (!this.matrix_data.show_column_totals) {
+                return;
+            }
+            var fname = this.matrix_data.field_value,
+                field = this.state.fields[fname];
+            if (!field) {
+                return;
+            }
+            var type = field.type;
+            if (!_.inArray(type, ['integer', 'float', 'monetary'])) {
+                return;
+            }
+            _.each(this.columns, function (column, index) {
+                column.aggregate = {
+                    fname: fname,
+                    ftype: type,
+                    help: _t('Sum'),
+                    value: 0,
+                };
+                _.each(this.rows, function (row) {
+                    column.aggregate.value += row.data[index].data[fname];
+                });
+            });
+        },
+
+        /**
+         * Compute the row aggregates.
+         *
+         * This function is called everytime the value is changed.
+         *
+         * @private
+         */
+        _computeRowAggregates: function () {
+            if (!this.matrix_data.show_row_totals) {
+                return;
+            }
+            var fname = this.matrix_data.field_value,
+                field = this.state.fields[fname];
+            if (!field) {
+                return;
+            }
+            var type = field.type;
+            if (!_.inArray(type, ['integer', 'float', 'monetary'])) {
+                return;
+            }
+            _.each(this.rows, function (row) {
+                row.aggregate = {
+                    fname: fname,
+                    ftype: type,
+                    help: _t('Sum'),
+                    value: 0,
+                };
+                _.each(row.data, function (col) {
+                    row.aggregate.value += col.data[fname];
+                });
+            });
+        },
+
+        /**
+         * Takes the given Value, formats it and adds it to the given cell.
+         *
+         * @private
+         *
+         * @param {jQueryElement} $cell
+         * The Cell where the aggregate should be added.
+         *
+         * @param {Object} aggregate
+         * The object which contains the information about the aggregate value
+         */
+        _apply_aggregate_value: function ($cell, aggregate) {
+            var field = this.state.fields[aggregate.fname],
+                formatter = field_utils.format[field.type];
+            var formattedValue = formatter(
+                aggregate.value, field, {escape: true}
+            );
+            $cell.addClass('total').attr('title', aggregate.help)
+                .html(formattedValue);
+        },
+
+        /**
+         * Check if the change was successful and then update the grid.
+         * This function is required on relational fields.
+         *
+         * @param {Object} state
+         * Contains the current state of the field & all the data
+         *
+         * @param {String} id
+         * the id of the updated object.
+         *
+         * @param {Array} fields
+         * The fields we have in the view.
+         *
+         * @param {Object} ev
+         * The event object.
+         *
+         * @returns {Deferred}
+         * The deferred object thats gonna be resolved when the change is made.
+         */
+        confirmUpdate: function (state, id, fields, ev) {
+            var self = this;
+            this.state = state;
+            return this.confirmChange(state, id, fields, ev).then(function () {
+                self._refresh(id);
+            });
+        },
+
+        /**
+         * Refresh our grid.
+         *
+         * @private
+         * @param {String} id Datapoint ID
+         */
+        _refresh: function (id) {
+            this._updateRow(id);
+            this._refreshColTotals();
+            this._refreshRowTotals();
+        },
+
+        /**
+         *Update row data in our internal rows.
+         *
+         * @param {String} id: The id of the row that needs to be updated.
+         */
+        _updateRow: function (id) {
+            var record = _.findWhere(this.state.data, {id: id});
+            _.each(this.rows, function (row) {
+                _.each(row.data, function (col, i) {
+                    if (col.id === id) {
+                        row.data[i] = record;
+                    }
+                });
+            });
+        },
+
+        /**
+         * Update the row total.
+         */
+        _refreshColTotals: function () {
+            this._computeColumnAggregates();
+            this.$('tfoot').replaceWith(this._renderFooter());
+        },
+
+        /**
+         * Update the column total.
+         */
+        _refreshRowTotals: function () {
+            var self = this;
+            this._computeRowAggregates();
+            var $rows = self.$el.find('tr.o_data_row');
+            _.each(self.rows, function (row, i) {
+                if (row.aggregate) {
+                    $($rows[i]).find('.row-total')
+                        .replaceWith(self._renderAggregateRowCell(row));
+                }
+            });
+        },
+
+        /**
+         * X2many fields expect this
+         *
+         * @returns {null}
+         */
+        getEditableRecordID: function () {
+            return null;
+        },
+
+    });
+
+    return X2Many2dMatrixRenderer;
 });
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 56d2598fe..420c624cb 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -4,177 +4,192 @@
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
 odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
-  "use strict";
+    "use strict";
 
-  var core = require('web.core');
-  // var FieldManagerMixin = require('web.FieldManagerMixin');
-  var field_registry = require('web.field_registry');
-  var relational_fields = require('web.relational_fields');
-  var weContext = require('web_editor.context');
-  // var Helpers = require('web_widget_x2many_2d_matrix.helpers');
-  var AbstractField = require('web.AbstractField');
-  var X2Many2dMatrixRenderer = require('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer');
+    var field_registry = require('web.field_registry');
+    var relational_fields = require('web.relational_fields');
+    var X2Many2dMatrixRenderer = require(
+        'web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer'
+    );
 
-  var WidgetX2Many2dMatrix = relational_fields.FieldOne2Many.extend({
-    widget_class: 'o_form_field_x2many_2d_matrix',
-    /**
-     * Initialize the widget & parameters.
-     *
-     * @param {Object} parent: contains the form view.
-     * @param {String} name: the name of the field.
-     * @param {Object} record: Contains the information about the database records.
-     * @param {Object} options: Contains the view options.
-     */
-    init: function (parent, name, record, options) {
-        this._super(parent, name, record, options);
-        this.init_params();
-    },
+    var WidgetX2Many2dMatrix = relational_fields.FieldOne2Many.extend({
+        widget_class: 'o_form_field_x2many_2d_matrix',
 
-    /**
-     * Initialize the widget specific parameters.
-     * Sets the axis and the values.
-     */
-    init_params: function () {
-        var node = this.attrs;
-        this.by_x_axis = {};
-        this.by_y_axis = {};
-        this.field_x_axis = node.field_x_axis || this.field_x_axis;
-        this.field_y_axis = node.field_y_axis || this.field_y_axis;
-        this.field_label_x_axis = node.field_label_x_axis || this.field_x_axis;
-        this.field_label_y_axis = node.field_label_y_axis || this.field_y_axis;
-        this.x_axis_clickable = this.parse_boolean(node.x_axis_clickable || '1');
-        this.y_axis_clickable = this.parse_boolean(node.y_axis_clickable || '1');
-        this.field_value = node.field_value || this.field_value;
-        // TODO: is this really needed? Holger?
-        for (var property in node) {
-          if (property.startsWith("field_att_")) {
-              this.fields_att[property.substring(10)] = node[property];
-          }
-        }
-        // and this?
-        this.field_editability = node.field_editability || this.field_editability;
-        this.show_row_totals = this.parse_boolean(node.show_row_totals || '1');
-        this.show_column_totals = this.parse_boolean(node.show_column_totals || '1');
+        /**
+         * Initialize the widget & parameters.
+         *
+         * @param {Object} parent contains the form view.
+         * @param {String} name the name of the field.
+         * @param {Object} record information about the database records.
+         * @param {Object} options view options.
+         */
+        init: function (parent, name, record, options) {
+            this._super(parent, name, record, options);
+            this.init_params();
+        },
 
-    },
-    /**
-     * Initializes the Value matrix.
-     * Puts the values in the grid. If we have related items we use the display name.
-     */
-    init_matrix: function(){
-      var self = this,
-          records = self.recordData[this.name].data;
-      // Wipe the content if something still exists
-      this.by_x_axis = {};
-      this.by_y_axis = {};
-      _.each(records, function(record) {
-        var x = record.data[self.field_x_axis],
-            y = record.data[self.field_y_axis];
-        if (x.type == 'record') {
-          // we have a related record
-          x = x.data.display_name;
-        }
-        if (y.type == 'record') {
-          // we have a related record
-          y = y.data.display_name;
-        }
-        self.by_x_axis[x] = self.by_x_axis[x] || {};
-        self.by_y_axis[y] = self.by_y_axis[y] || {};
-        self.by_x_axis[x][y] = record;
-        self.by_y_axis[y][x] = record;
-      });
-      // init columns
-      self.columns = [];
-      $.each(self.by_x_axis, function(x){
-        self.columns.push(self._make_column(x));
-      });
-      self.rows = [];
-      $.each(self.by_y_axis, function(y){
-        self.rows.push(self._make_row(y));
-      });
-      self.matrix_data = {
-        'field_value': self.field_value,
-        'field_x_axis': self.field_x_axis,
-        'field_y_axis': self.field_y_axis,
-        'columns': self.columns,
-        'rows': self.rows,
-        'show_row_totals': self.show_row_totals,
-        'show_column_totals': self.show_column_totals
-      };
+        /**
+         * Initialize the widget specific parameters.
+         * Sets the axis and the values.
+         */
+        init_params: function () {
+            var node = this.attrs;
+            this.by_x_axis = {};
+            this.by_y_axis = {};
+            this.field_x_axis = node.field_x_axis || this.field_x_axis;
+            this.field_y_axis = node.field_y_axis || this.field_y_axis;
+            this.field_label_x_axis =
+                node.field_label_x_axis || this.field_x_axis;
+            this.field_label_y_axis =
+                node.field_label_y_axis || this.field_y_axis;
+            this.x_axis_clickable = this.parse_boolean(
+                node.x_axis_clickable || '1'
+            );
+            this.y_axis_clickable = this.parse_boolean(
+                node.y_axis_clickable || '1'
+            );
+            this.field_value = node.field_value || this.field_value;
+            // TODO: is this really needed? Holger?
+            for (var property in node) {
+                if (property.startsWith("field_att_")) {
+                    this.fields_att[property.substring(10)] =
+                        node[property];
+                }
+            }
+            // and this?
+            this.field_editability =
+                node.field_editability || this.field_editability;
+            this.show_row_totals =
+                this.parse_boolean(node.show_row_totals || '1');
+            this.show_column_totals =
+                this.parse_boolean(node.show_column_totals || '1');
+        },
 
-    },
-    /**
-     * Create scaffold for a column.
-     *
-     * @params {String} x: The string used as a column title
-     */
-    _make_column: function(x){
-      return {
-        // simulate node parsed on xml arch
-        'tag': 'field',
-        'attrs': {
-          'name': this.field_x_axis,
-          'string': x
-        }
-      };
-    },
-    /**
-     * Create scaffold for a row.
-     *
-     * @params {String} x: The string used as a row title
-     */
-    _make_row: function(y){
-      var self = this;
-      // use object so that we can attach more data if needed
-      var row = {'data': []};
-      $.each(self.by_x_axis, function(x) {
-        row.data.push(self.by_y_axis[y][x]);
-      });
-      return row;
-    },
-    /**
-     *Parse a String containing a Python bool or 1 and convert it to a proper bool.
-     *
-     * @params {String} val: the string to be parsed.
-     * @returns {Boolean} The parsed boolean.
-     */
-    parse_boolean: function(val) {
-        if (val.toLowerCase() === 'true' || val === '1') {
-            return true;
-        }
-        return false;
-    },
-    /**
-     *Create the matrix renderer and add its output to our element
-     *
-     * @returns {Deferred} A deferred object to be completed when it finished rendering.
-     */
-    _render: function () {
-      if (!this.view) {
-        return this._super();
-      }
-      // Ensure widget is re initiated when rendering
-      this.init_matrix();
-      var arch = this.view.arch,
-          viewType = 'list';
-      this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
-          arch: arch,
-          editable: true,
-          viewType: viewType,
-          matrix_data: this.matrix_data
-      });
-      this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
-      // Remove previous rendered and add the newly created one
-      this.$el.find('div:not(.o_x2m_control_panel)').remove();
-      return this.renderer.appendTo(this.$el);
+        /**
+         * Initializes the Value matrix.
+         *
+         * Puts the values in the grid.
+         * If we have related items we use the display name.
+         */
+        init_matrix: function () {
+            var records = this.recordData[this.name].data;
+            // Wipe the content if something still exists
+            this.by_x_axis = {};
+            this.by_y_axis = {};
+            _.each(records, function (record) {
+                var x = record.data[this.field_x_axis],
+                    y = record.data[this.field_y_axis];
+                if (x.type === 'record') {
+                    // we have a related record
+                    x = x.data.display_name;
+                }
+                if (y.type === 'record') {
+                    // we have a related record
+                    y = y.data.display_name;
+                }
+                this.by_x_axis[x] = this.by_x_axis[x] || {};
+                this.by_y_axis[y] = this.by_y_axis[y] || {};
+                this.by_x_axis[x][y] = record;
+                this.by_y_axis[y][x] = record;
+            }.bind(this));
+            // init columns
+            this.columns = [];
+            $.each(this.by_x_axis, function (x) {
+                this.columns.push(this._make_column(x));
+            }.bind(this));
+            this.rows = [];
+            $.each(this.by_y_axis, function (y) {
+                this.rows.push(this._make_row(y));
+            }.bind(this));
+            this.matrix_data = {
+                'field_value': this.field_value,
+                'field_x_axis': this.field_x_axis,
+                'field_y_axis': this.field_y_axis,
+                'columns': this.columns,
+                'rows': this.rows,
+                'show_row_totals': this.show_row_totals,
+                'show_column_totals': this.show_column_totals,
+            };
+        },
 
-    }
+        /**
+         * Create scaffold for a column.
+         *
+         * @param {String} x The string used as a column title
+         * @returns {Object}
+         */
+        _make_column: function (x) {
+            return {
+                // simulate node parsed on xml arch
+                'tag': 'field',
+                'attrs': {
+                    'name': this.field_x_axis,
+                    'string': x,
+                },
+            };
+        },
 
-  });
+        /**
+         * Create scaffold for a row.
+         *
+         * @param {String} y The string used as a row title
+         * @returns {Object}
+         */
+        _make_row: function (y) {
+            var self = this;
+            // use object so that we can attach more data if needed
+            var row = {'data': []};
+            $.each(self.by_x_axis, function (x) {
+                row.data.push(self.by_y_axis[y][x]);
+            });
+            return row;
+        },
 
-  field_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+        /**
+         * Parse a String containing a bool and convert it to a JS bool.
+         *
+         * @param {String} val: the string to be parsed.
+         * @returns {Boolean} The parsed boolean.
+         */
+        parse_boolean: function (val) {
+            if (val.toLowerCase() === 'true' || val === '1') {
+                return true;
+            }
+            return false;
+        },
 
-  return {
-    WidgetX2Many2dMatrix: WidgetX2Many2dMatrix
-  };
+        /**
+         * Create the matrix renderer and add its output to our element
+         *
+         * @returns {Deferred}
+         * A deferred object to be completed when it finished rendering.
+         */
+        _render: function () {
+            if (!this.view) {
+                return this._super();
+            }
+            // Ensure widget is re initiated when rendering
+            this.init_matrix();
+            var arch = this.view.arch,
+                viewType = 'list';
+            this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
+                arch: arch,
+                editable: true,
+                viewType: viewType,
+                matrix_data: this.matrix_data,
+            });
+            this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
+            // Remove previous rendered and add the newly created one
+            this.$el.find('div:not(.o_x2m_control_panel)').remove();
+            return this.renderer.appendTo(this.$el);
+
+        },
+
+    });
+
+    field_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+
+    return {
+        WidgetX2Many2dMatrix: WidgetX2Many2dMatrix,
+    };
 });

From f5dde1577d7edfc005c500ca6edd472f9b04e735 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Tue, 21 Aug 2018 12:08:28 +0100
Subject: [PATCH 51/95] [FIX] web_widget_x2many_2d_matrix: Enable keyboard
 navigation

---
 web_widget_x2many_2d_matrix/README.rst        | 101 ++++++++++--------
 .../static/src/js/2d_matrix_renderer.js       |  72 ++++++++++---
 .../static/src/js/widget_x2many_2d_matrix.js  |  56 +++++++---
 3 files changed, 155 insertions(+), 74 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index aba2f90a7..44f5920c4 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -39,16 +39,18 @@ Use this widget by saying::
 
 This assumes that my_field refers to a model with the fields `x`, `y` and
 `value`. If your fields are named differently, pass the correct names as
-attributes::
+attributes:
 
- <field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3">
-     <tree>
-         <field name="my_field"/>
-         <field name="my_field1"/>
-         <field name="my_field2"/>
-         <field name="my_field3"/>
-     </tree>
- </field>
+.. code-block:: xml
+
+    <field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3">
+        <tree>
+            <field name="my_field"/>
+            <field name="my_field1"/>
+            <field name="my_field2"/>
+            <field name="my_field3"/>
+        </tree>
+    </field>
 
 You can pass the following parameters:
 
@@ -80,49 +82,53 @@ You need a data structure already filled with values. Let's assume we want to
 use this widget in a wizard that lets the user fill in planned hours for one
 task per project per user. In this case, we can use ``project.task`` as our
 data model and point to it from our wizard. The crucial part is that we fill
-the field in the default function::
+the field in the default function:
 
- from odoo import fields, models
+.. code-block:: python
 
- class MyWizard(models.TransientModel):
-    _name = 'my.wizard'
+    from odoo import fields, models
 
-    def _default_task_ids(self):
-        # your list of project should come from the context, some selection
-        # in a previous wizard or wherever else
-        projects = self.env['project.project'].browse([1, 2, 3])
-        # same with users
-        users = self.env['res.users'].browse([1, 2, 3])
-        return [
-            (0, 0, {
-                'name': 'Sample task name',
-                'project_id': p.id,
-                'user_id': u.id,
-                'planned_hours': 0,
-                'message_needaction': False,
-                'date_deadline': fields.Date.today(),
-            })
-            # if the project doesn't have a task for the user, create a new one
-            if not p.task_ids.filtered(lambda x: x.user_id == u) else
-            # otherwise, return the task
-            (4, p.task_ids.filtered(lambda x: x.user_id == u)[0].id)
-            for p in projects
-            for u in users
-        ]
+    class MyWizard(models.TransientModel):
+        _name = 'my.wizard'
 
-    task_ids = fields.Many2many('project.task', default=_default_task_ids)
+        def _default_task_ids(self):
+            # your list of project should come from the context, some selection
+            # in a previous wizard or wherever else
+            projects = self.env['project.project'].browse([1, 2, 3])
+            # same with users
+            users = self.env['res.users'].browse([1, 2, 3])
+            return [
+                (0, 0, {
+                    'name': 'Sample task name',
+                    'project_id': p.id,
+                    'user_id': u.id,
+                    'planned_hours': 0,
+                    'message_needaction': False,
+                    'date_deadline': fields.Date.today(),
+                })
+                # if the project doesn't have a task for the user,
+                # create a new one
+                if not p.task_ids.filtered(lambda x: x.user_id == u) else
+                # otherwise, return the task
+                (4, p.task_ids.filtered(lambda x: x.user_id == u)[0].id)
+                for p in projects
+                for u in users
+            ]
 
-Now in our wizard, we can use::
+        task_ids = fields.Many2many('project.task', default=_default_task_ids)
 
- <field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours">
-     <tree>
-         <field name="task_ids"/>
-         <field name="project_id"/>
-         <field name="user_id"/>
-         <field name="planned_hours"/>
-     </tree>
- </field>
+Now in our wizard, we can use:
 
+.. code-block:: xml
+
+    <field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours">
+        <tree>
+            <field name="task_ids"/>
+            <field name="project_id"/>
+            <field name="user_id"/>
+            <field name="planned_hours"/>
+        </tree>
+    </field>
 
 Known issues / Roadmap
 ======================
@@ -134,6 +140,11 @@ Known issues / Roadmap
 
 * Support limit total records in the matrix. Ref: https://github.com/OCA/web/issues/901
 
+* Support cell traversal through keyboard arrows.
+
+* Entering the widget from behind by pressing ``Shift+TAB`` in your keyboard
+  will enter into the 1st cell until https://github.com/odoo/odoo/pull/26490
+  is merged.
 
 Bug Tracker
 ===========
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 6cb66ac28..dcbc44ade 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -4,14 +4,14 @@
 odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (require) {
     "use strict";
 
-    // heavily inspired by Odoo's `ListRenderer`
+    // Heavily inspired by Odoo's `ListRenderer`
     var BasicRenderer = require('web.BasicRenderer');
     var config = require('web.config');
     var core = require('web.core');
     var field_utils = require('web.field_utils');
     var _t = core._t;
     var FIELD_CLASSES = {
-        // copied from ListRenderer
+        // Copied from ListRenderer
         float: 'o_list_number',
         integer: 'o_list_number',
         monetary: 'o_list_number',
@@ -26,9 +26,18 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
         init: function (parent, state, params) {
             this._super.apply(this, arguments);
             this.editable = params.editable;
-            this.columns = params.matrix_data.columns;
-            this.rows = params.matrix_data.rows;
-            this.matrix_data = params.matrix_data;
+            this._saveMatrixData(params.matrix_data);
+        },
+
+        /**
+         * Update matrix data in current renderer instance.
+         *
+         * @param {Object} matrixData Contains the matrix data
+         */
+        _saveMatrixData: function (matrixData) {
+            this.columns = matrixData.columns;
+            this.rows = matrixData.rows;
+            this.matrix_data = matrixData;
         },
 
         /**
@@ -159,7 +168,6 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @private
          * @returns {String} a string with the generated html.
-         *
          */
         _renderRows: function () {
             return _.map(this.rows, this._renderRow.bind(this));
@@ -181,7 +189,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             $tr = $tr.append(self._renderLabelCell(row.data[0]));
             var $cells = _.map(this.columns, function (node, index) {
                 var record = row.data[index];
-                // make the widget use our field value for each cell
+                // Make the widget use our field value for each cell
                 node.attrs.name = self.matrix_data.field_value;
                 return self._renderBodyCell(record, node, index, {mode:''});
             });
@@ -203,10 +211,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             var $td = $('<td>');
             var value = record.data[this.matrix_data.field_y_axis];
             if (value.type === 'record') {
-                // we have a related record
+                // We have a related record
                 value = value.data.display_name;
             }
-            // get 1st column filled w/ Y label
+            // Get 1st column filled w/ Y label
             $td.text(value);
             return $td;
         },
@@ -272,7 +280,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             if (modifiers.invisible && !(options && options.renderInvisible)) {
                 return $td;
             }
-            // enforce mode of the parent
+            // Enforce mode of the parent
             options.mode = this.getParent().mode;
             var widget = this._renderFieldWidget(
                 node, record, _.pick(options, 'mode')
@@ -329,7 +337,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
             var type = field.type;
-            if (!_.inArray(type, ['integer', 'float', 'monetary'])) {
+            if (!~['integer', 'float', 'monetary'].indexOf(type)) {
                 return;
             }
             _.each(this.columns, function (column, index) {
@@ -342,7 +350,45 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 _.each(this.rows, function (row) {
                     column.aggregate.value += row.data[index].data[fname];
                 });
-            });
+            }.bind(this));
+        },
+
+        /**
+         * @override
+         */
+        updateState: function (state, params) {
+            if (params.matrix_data) {
+                this._saveMatrixData(params.matrix_data);
+            }
+            return this._super.apply(this, arguments);
+        },
+
+        /**
+        * Traverse the fields matrix with the keyboard
+        *
+        * @override
+        * @private
+        * @param {OdooEvent} event "navigation_move" event
+        */
+        _onNavigationMove: function (event) {
+            var widgets = this.__parentedChildren,
+                index = widgets.indexOf(event.target),
+                first = index === 0,
+                last = index === widgets.length - 1,
+                move = 0;
+            // Guess if we have to move the focus
+            if (event.data.direction === "next" && !last) {
+                move = 1;
+            } else if (event.data.direction === "previous" && !first) {
+                move = -1;
+            }
+            // Move focus
+            if (move) {
+                var target = widgets[index + move];
+                index = this.allFieldWidgets[target.record.id].indexOf(target);
+                this._activateFieldWidget(target.record, index, {inc: 0});
+                event.stopPropagation();
+            }
         },
 
         /**
@@ -362,7 +408,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
             var type = field.type;
-            if (!_.inArray(type, ['integer', 'float', 'monetary'])) {
+            if (!~['integer', 'float', 'monetary'].indexOf(type)) {
                 return;
             }
             _.each(this.rows, function (row) {
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 420c624cb..638c080ab 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -16,9 +16,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         widget_class: 'o_form_field_x2many_2d_matrix',
 
         /**
-         * Initialize the widget & parameters.
+         *Initialize the widget & parameters.
          *
-         * @param {Object} parent contains the form view.
+         *@param {Object} parent contains the form view.
          * @param {String} name the name of the field.
          * @param {Object} record information about the database records.
          * @param {Object} options view options.
@@ -29,7 +29,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         },
 
         /**
-         * Initialize the widget specific parameters.
+         *Initialize the widget specific parameters.
          * Sets the axis and the values.
          */
         init_params: function () {
@@ -56,7 +56,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                         node[property];
                 }
             }
-            // and this?
+            // And this?
             this.field_editability =
                 node.field_editability || this.field_editability;
             this.show_row_totals =
@@ -80,11 +80,11 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 var x = record.data[this.field_x_axis],
                     y = record.data[this.field_y_axis];
                 if (x.type === 'record') {
-                    // we have a related record
+                    // We have a related record
                     x = x.data.display_name;
                 }
                 if (y.type === 'record') {
-                    // we have a related record
+                    // We have a related record
                     y = y.data.display_name;
                 }
                 this.by_x_axis[x] = this.by_x_axis[x] || {};
@@ -92,7 +92,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 this.by_x_axis[x][y] = record;
                 this.by_y_axis[y][x] = record;
             }.bind(this));
-            // init columns
+            // Init columns
             this.columns = [];
             $.each(this.by_x_axis, function (x) {
                 this.columns.push(this._make_column(x));
@@ -120,7 +120,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          */
         _make_column: function (x) {
             return {
-                // simulate node parsed on xml arch
+                // Simulate node parsed on xml arch
                 'tag': 'field',
                 'attrs': {
                     'name': this.field_x_axis,
@@ -137,7 +137,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          */
         _make_row: function (y) {
             var self = this;
-            // use object so that we can attach more data if needed
+            // Use object so that we can attach more data if needed
             var row = {'data': []};
             $.each(self.by_x_axis, function (x) {
                 row.data.push(self.by_y_axis[y][x]);
@@ -170,21 +170,45 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             }
             // Ensure widget is re initiated when rendering
             this.init_matrix();
-            var arch = this.view.arch,
-                viewType = 'list';
+            var arch = this.view.arch;
+            // Update existing renderer
+            if (!_.isUndefined(this.renderer)) {
+                return this.renderer.updateState(this.value, {
+                    matrix_data: this.matrix_data,
+                });
+            }
+            // Create a new matrix renderer
             this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
                 arch: arch,
-                editable: true,
-                viewType: viewType,
+                editable: this.mode === 'edit' && arch.attrs.editable,
+                viewType: "list",
                 matrix_data: this.matrix_data,
             });
             this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
-            // Remove previous rendered and add the newly created one
-            this.$el.find('div:not(.o_x2m_control_panel)').remove();
             return this.renderer.appendTo(this.$el);
-
         },
 
+        /**
+         * Activate the widget.
+         *
+         * @override
+         */
+        activate: function (options) {
+            // Won't work fine without https://github.com/odoo/odoo/pull/26490
+            this._backwards = options.event.data.direction === "previous";
+            var result = this._super.apply(this, arguments);
+            delete this._backwards;
+            return result;
+        },
+
+        /**
+         * Get first element to focus.
+         *
+         * @override
+         */
+        getFocusableElement: function () {
+            return this.$(".o_input:" + (this._backwards ? "last" : "first"));
+        },
     });
 
     field_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);

From f39fdc94c9c1afa0618b59bd0973d53095286687 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Fri, 24 Aug 2018 11:12:46 +0100
Subject: [PATCH 52/95] [FIX] web_widget_x2many_2d_matrix: Allow empty cells

Before this commit, if a matrix was lacking one element, some ugly errors appeared to the user.

Now, it just displays the empty cell and lets the user go on.

Also, acknowledge another limitation of the widget and add it to roadmap.
---
 web_widget_x2many_2d_matrix/README.rst        |  2 +
 .../static/src/js/2d_matrix_renderer.js       | 51 ++++++++++++-------
 .../static/src/js/widget_x2many_2d_matrix.js  | 13 +++--
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 44f5920c4..52b2f3cff 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -146,6 +146,8 @@ Known issues / Roadmap
   will enter into the 1st cell until https://github.com/odoo/odoo/pull/26490
   is merged.
 
+* Support extra invisible fields inside each cell.
+
 Bug Tracker
 ===========
 
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index dcbc44ade..d3c98afab 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -180,22 +180,22 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * the aggregate cell.
          *
          * @private
-         * @param {Object} row: The row that will be rendered.
+         * @param {Object} row The row that will be rendered.
          * @returns {jQueryElement} the <tr> element that has been rendered.
          */
         _renderRow: function (row) {
-            var self = this;
-            var $tr = $('<tr/>', {class: 'o_data_row'});
-            $tr = $tr.append(self._renderLabelCell(row.data[0]));
+            var $tr = $('<tr/>', {class: 'o_data_row'}),
+                _data = _.without(row.data, undefined);
+            $tr = $tr.append(this._renderLabelCell(_data[0]));
             var $cells = _.map(this.columns, function (node, index) {
                 var record = row.data[index];
                 // Make the widget use our field value for each cell
-                node.attrs.name = self.matrix_data.field_value;
-                return self._renderBodyCell(record, node, index, {mode:''});
-            });
+                node.attrs.name = this.matrix_data.field_value;
+                return this._renderBodyCell(record, node, index, {mode:''});
+            }.bind(this));
             $tr = $tr.append($cells);
             if (row.aggregate) {
-                $tr.append(self._renderAggregateRowCell(row));
+                $tr.append(this._renderAggregateRowCell(row));
             }
             return $tr;
         },
@@ -223,7 +223,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * Create a cell and fill it with the aggregate value.
          *
          * @private
-         * @param {Object} row: the row object to aggregate.
+         * @param {Object} row the row object to aggregate.
          * @returns {jQueryElement} The rendered cell.
          */
         _renderAggregateRowCell: function (row) {
@@ -238,10 +238,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * we always want the widget to be editable.
          *
          * @private
-         * @param {Object} record: Contains the data for this cell
-         * @param {jQueryElement} node: The HTML of the field.
-         * @param {int} colIndex: The index of the current column.
-         * @param {Object} options: The obtions used for the widget
+         * @param {Object} record Contains the data for this cell
+         * @param {jQueryElement} node The HTML of the field.
+         * @param {int} colIndex The index of the current column.
+         * @param {Object} options The obtions used for the widget
          * @returns {jQueryElement} the rendered cell.
          */
         _renderBodyCell: function (record, node, colIndex, options) {
@@ -263,6 +263,12 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             // the user might want to attach to each single cell.
             var $td = $('<td>', {
                 'class': tdClassName,
+            });
+            if (_.isUndefined(record)) {
+                // Without record, nothing elese to do
+                return $td;
+            }
+            $td.attr({
                 'data-form-id': record.id,
                 'data-id': record.data.id,
             });
@@ -348,7 +354,12 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                     value: 0,
                 };
                 _.each(this.rows, function (row) {
-                    column.aggregate.value += row.data[index].data[fname];
+                    // TODO Use only one _.propertyOf in underscore 1.9.0+
+                    try {
+                        column.aggregate.value += row.data[index].data[fname];
+                    } catch (error) {
+                        // Nothing to do
+                    }
                 });
             }.bind(this));
         },
@@ -419,7 +430,12 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                     value: 0,
                 };
                 _.each(row.data, function (col) {
-                    row.aggregate.value += col.data[fname];
+                    // TODO Use _.property in underscore 1.9+
+                    try {
+                        row.aggregate.value += col.data[fname];
+                    } catch (error) {
+                        // Nothing to do
+                    }
                 });
             });
         },
@@ -490,10 +506,11 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {String} id: The id of the row that needs to be updated.
          */
         _updateRow: function (id) {
-            var record = _.findWhere(this.state.data, {id: id});
+            var record = _.findWhere(this.state.data, {id: id}),
+                _id = _.property("id");
             _.each(this.rows, function (row) {
                 _.each(row.data, function (col, i) {
-                    if (col.id === id) {
+                    if (_id(col) === id) {
                         row.data[i] = record;
                     }
                 });
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 638c080ab..addf7cd40 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -16,9 +16,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         widget_class: 'o_form_field_x2many_2d_matrix',
 
         /**
-         *Initialize the widget & parameters.
+         * Initialize the widget & parameters.
          *
-         *@param {Object} parent contains the form view.
+         * @param {Object} parent contains the form view.
          * @param {String} name the name of the field.
          * @param {Object} record information about the database records.
          * @param {Object} options view options.
@@ -29,7 +29,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         },
 
         /**
-         *Initialize the widget specific parameters.
+         * Initialize the widget specific parameters.
          * Sets the axis and the values.
          */
         init_params: function () {
@@ -195,7 +195,12 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          */
         activate: function (options) {
             // Won't work fine without https://github.com/odoo/odoo/pull/26490
-            this._backwards = options.event.data.direction === "previous";
+            // TODO Use _.propertyOf in underscore 1.9+
+            try {
+                this._backwards = options.event.data.direction === "previous";
+            } catch (error) {
+                this._backwards = false;
+            }
             var result = this._super.apply(this, arguments);
             delete this._backwards;
             return result;

From 447e96d2cf915321e99f960ef577119e6ea21261 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 27 Aug 2018 15:14:27 +0000
Subject: [PATCH 53/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index 05da1c2ce..90747c09d 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -15,8 +15,16 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:353
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:429
+#, python-format
+msgid "Sum"
+msgstr ""
+

From 09991cb574dd7738cbc3de3aa4d00b573759b81f Mon Sep 17 00:00:00 2001
From: Dennis Sluijk <d.sluijk@onestein.nl>
Date: Thu, 20 Sep 2018 16:05:34 +0200
Subject: [PATCH 54/95] [IMP] web_widget_x2many_2d_matrix: Total of all rows
 (#1043)

---
 web_widget_x2many_2d_matrix/README.rst        |   1 +
 web_widget_x2many_2d_matrix/__manifest__.py   |   2 +-
 .../static/description/screenshot.png         | Bin 22639 -> 24402 bytes
 .../static/src/js/2d_matrix_renderer.js       |  33 ++++++++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 52b2f3cff..e9d10d2ae 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -168,6 +168,7 @@ Contributors
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Timon Tschanz <timon.tschanz@camptocamp.com>
 * Jairo Llopis <jairo.llopis@tecnativa.com>
+* Dennis Sluijk <d.sluijk@onestein.nl>
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index d3743de27..e0d801159 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
-    "version": "11.0.1.0.2",
+    "version": "11.0.1.1.0",
     "author": "Therp BV, "
               "Tecnativa, "
               "Camptocamp, "
diff --git a/web_widget_x2many_2d_matrix/static/description/screenshot.png b/web_widget_x2many_2d_matrix/static/description/screenshot.png
index 922e2961351acf706cef3946526403daa48108ee..4b75baa8aa91dfd4c43f9ca5f57f0d12ca7ad72a 100644
GIT binary patch
literal 24402
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
H4}$*+RqrIY

literal 22639
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

diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index d3c98afab..6b9d66654 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -304,12 +304,32 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
         _renderFooter: function () {
             var $cells = this._renderAggregateColCells();
             if ($cells) {
-                return $('<tfoot>').append(
-                    $('<tr>').append('<td/>').append($cells)
-                );
+                var $tr = $('<tr>').append('<td/>').append($cells);
+                var $total_cell = this._renderTotalCell();
+                if ($total_cell) {
+                    $tr.append($total_cell);
+                }
+                return $('<tfoot>').append($tr);
             }
         },
 
+        /**
+         * Renders the total cell (of all rows / columns)
+         *
+         * @private
+         * @returns {jQueryElement} The td element with the total in it.
+         */
+        _renderTotalCell: function() {
+            if (!this.matrix_data.show_column_totals ||
+                !this.matrix_data.show_row_totals) {
+                return;
+            }
+
+            var $cell = $('<td>', {class: 'col-total text-right'});
+            this._apply_aggregate_value($cell, this.total);
+            return $cell;
+        },
+
         /**
          * Render the Aggregate cells for the column.
          *
@@ -346,6 +366,12 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             if (!~['integer', 'float', 'monetary'].indexOf(type)) {
                 return;
             }
+            this.total = {
+                fname: fname,
+                ftype: type,
+                help: _t('Sum Total'),
+                value: 0,
+            };
             _.each(this.columns, function (column, index) {
                 column.aggregate = {
                     fname: fname,
@@ -361,6 +387,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                         // Nothing to do
                     }
                 });
+                this.total.value += column.aggregate.value;
             }.bind(this));
         },
 

From edeea57e2957dae48ed7fc8e7f8ad69b839b10be Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 20 Sep 2018 14:17:23 +0000
Subject: [PATCH 55/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index 90747c09d..abb0c5965 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -22,9 +22,16 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:353
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:429
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
 #, python-format
 msgid "Sum"
 msgstr ""
 
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, python-format
+msgid "Sum Total"
+msgstr ""
+

From 5dccd038cee1b0b5826af18500a1257ed9eaea5f Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Tue, 7 Aug 2018 18:18:37 +0200
Subject: [PATCH 56/95] web_widget_x2many_matrix: fix issue with limit of
 records

---
 web_widget_x2many_2d_matrix/__manifest__.py     |  2 +-
 .../static/src/js/2d_matrix_renderer.js         |  2 +-
 .../src/js/abstract_view_matrix_limit_extend.js | 17 +++++++++++++++++
 web_widget_x2many_2d_matrix/views/assets.xml    |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index e0d801159..30d7a730d 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
-    "version": "11.0.1.1.0",
+    "version": "11.0.1.1.1",
     "author": "Therp BV, "
               "Tecnativa, "
               "Camptocamp, "
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 6b9d66654..ac627e44c 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -319,7 +319,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {jQueryElement} The td element with the total in it.
          */
-        _renderTotalCell: function() {
+        _renderTotalCell: function () {
             if (!this.matrix_data.show_column_totals ||
                 !this.matrix_data.show_row_totals) {
                 return;
diff --git a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
new file mode 100644
index 000000000..b35f502c3
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
@@ -0,0 +1,17 @@
+odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (require) {
+"use strict";
+
+        var AbstractView = require("web.AbstractView");
+
+        AbstractView.include({
+            // We extend this method so that the view is not limited to
+            // just 40 cells when the 'x2many_2d_matrix' widget is used.
+            _setSubViewLimit: function (attrs) {
+                this._super(attrs);
+                if (attrs.widget === "x2many_2d_matrix") {
+                    attrs.limit = Infinity;
+                }
+            },
+        };
+    }
+);
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index ba820435c..ab1956518 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -5,6 +5,7 @@
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
                 <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
+                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />
                 <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
             </xpath>
         </template>

From 849525e48eb4dca42ec23bd60c2bc5e57f06efb9 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Fri, 9 Nov 2018 18:30:23 +0100
Subject: [PATCH 57/95] [FIX] web_widget_x2many_2d_matrix: Closing parenthesis

---
 .../static/src/js/abstract_view_matrix_limit_extend.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
index b35f502c3..5b24c457a 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
@@ -12,6 +12,6 @@ odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (requir
                     attrs.limit = Infinity;
                 }
             },
-        };
+        });
     }
 );

From 89a35e7d91bdce4645a63107deaac7e8c92d3e1f Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Fri, 9 Nov 2018 17:46:13 +0200
Subject: [PATCH 58/95] [MIG] web_widget_x2many_2d_matrix: Migration to 12.0

---
 web_widget_x2many_2d_matrix/README.rst        |  68 ++-
 web_widget_x2many_2d_matrix/__init__.py       |  20 +-
 web_widget_x2many_2d_matrix/__manifest__.py   |  28 +-
 .../readme/CONTRIBUTORS.rst                   |   8 +
 .../readme/DESCRIPTION.rst                    |  23 +
 .../readme/ROADMAP.rst                        |  14 +
 web_widget_x2many_2d_matrix/readme/USAGE.rst  |  92 +++
 .../static/description/index.html             | 568 ++++++++++++++++++
 web_widget_x2many_2d_matrix/views/assets.xml  |  27 +-
 9 files changed, 786 insertions(+), 62 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
 create mode 100644 web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
 create mode 100644 web_widget_x2many_2d_matrix/readme/ROADMAP.rst
 create mode 100644 web_widget_x2many_2d_matrix/readme/USAGE.rst
 create mode 100644 web_widget_x2many_2d_matrix/static/description/index.html

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index e9d10d2ae..9972ee0e0 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -1,11 +1,30 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
 ===========================
 2D matrix for x2many fields
 ===========================
 
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
+    :target: https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix
+    :alt: OCA/web
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/162/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
 This module allows to show an x2many field with 3-tuples
 ($x_value, $y_value, $value) in a table
 
@@ -30,6 +49,11 @@ The beauty of this is that you have an arbitrary amount of columns with this
 widget, trying to get this in standard x2many lists involves some quite ugly
 hacks.
 
+**Table of contents**
+
+.. contents::
+   :local:
+
 Usage
 =====
 
@@ -71,10 +95,6 @@ show_column_totals
     If field_value is a numeric field, it indicates if you want to calculate
     column totals. True by default
 
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-   :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/162/11.0
-
 Example
 =======
 
@@ -151,16 +171,25 @@ Known issues / Roadmap
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/web/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smash it by providing a detailed and welcomed feedback.
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2012.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.
 
 Credits
 =======
 
+Authors
+~~~~~~~
+
+* Therp BV
+* Tecnativa
+* Camptocamp
+
 Contributors
-------------
+~~~~~~~~~~~~
 
 * Holger Brunn <hbrunn@therp.nl>
 * Pedro M. Baeza <pedro.baeza@tecnativa.com>
@@ -169,18 +198,21 @@ Contributors
 * Timon Tschanz <timon.tschanz@camptocamp.com>
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
+* Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
 
-Maintainer
-----------
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
 
 .. image:: https://odoo-community.org/logo.png
    :alt: Odoo Community Association
    :target: https://odoo-community.org
 
-This module is maintained by the OCA.
-
 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.
 
-To contribute to this module, please visit https://odoo-community.org.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/web_widget_x2many_2d_matrix/__init__.py b/web_widget_x2many_2d_matrix/__init__.py
index 919541c6c..ef5ae3587 100644
--- a/web_widget_x2many_2d_matrix/__init__.py
+++ b/web_widget_x2many_2d_matrix/__init__.py
@@ -1,19 +1 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 30d7a730d..bfee53ec3 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -3,21 +3,23 @@
 # Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    "name": "2D matrix for x2many fields",
-    "version": "11.0.1.1.1",
-    "author": "Therp BV, "
-              "Tecnativa, "
-              "Camptocamp, "
-              "Odoo Community Association (OCA)",
-    "website": "https://github.com/OCA/web",
-    "license": "AGPL-3",
-    "category": "Hidden/Dependency",
-    "summary": "Show list fields as a matrix",
-    "depends": [
+    'name': '2D matrix for x2many fields',
+    'version': '12.0.1.0.0',
+    'author': (
+        'Therp BV, '
+        'Tecnativa, '
+        'Camptocamp, '
+        'Odoo Community Association (OCA)'
+    ),
+    'website': 'https://github.com/OCA/web',
+    'license': 'AGPL-3',
+    'category': 'Hidden/Dependency',
+    'summary': 'Show list fields as a matrix',
+    'depends': [
         'web',
     ],
-    "data": [
+    'data': [
         'views/assets.xml',
     ],
-    "installable": True,
+    'installable': True,
 }
diff --git a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..f30eb3eb1
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
@@ -0,0 +1,8 @@
+* Holger Brunn <hbrunn@therp.nl>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
+* Artem Kostyuk <a.kostyuk@mobilunity.com>
+* Simone Orsi <simone.orsi@camptocamp.com>
+* Timon Tschanz <timon.tschanz@camptocamp.com>
+* Jairo Llopis <jairo.llopis@tecnativa.com>
+* Dennis Sluijk <d.sluijk@onestein.nl>
+* Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
diff --git a/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst b/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..a84da8005
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
@@ -0,0 +1,23 @@
+This module allows to show an x2many field with 3-tuples
+($x_value, $y_value, $value) in a table
+
++-----------+-------------+-------------+
+|           | $x_value1   | $x_value2   |
++===========+=============+=============+
+| $y_value1 | $value(1/1) | $value(2/1) |
++-----------+-------------+-------------+
+| $y_value2 | $value(1/2) | $value(2/2) |
++-----------+-------------+-------------+
+
+where `value(n/n)` is editable.
+
+An example use case would be: Select some projects and some employees so that
+a manager can easily fill in the planned_hours for one task per employee. The
+result could look like this:
+
+.. image:: /web_widget_x2many_2d_matrix/static/description/screenshot.png
+    :alt: Screenshot
+
+The beauty of this is that you have an arbitrary amount of columns with this
+widget, trying to get this in standard x2many lists involves some quite ugly
+hacks.
diff --git a/web_widget_x2many_2d_matrix/readme/ROADMAP.rst b/web_widget_x2many_2d_matrix/readme/ROADMAP.rst
new file mode 100644
index 000000000..b5c8e912a
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/readme/ROADMAP.rst
@@ -0,0 +1,14 @@
+* 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 to open related records.
+
+* Support limit total records in the matrix. Ref: https://github.com/OCA/web/issues/901
+
+* Support cell traversal through keyboard arrows.
+
+* Entering the widget from behind by pressing ``Shift+TAB`` in your keyboard
+  will enter into the 1st cell until https://github.com/odoo/odoo/pull/26490
+  is merged.
+
+* Support extra invisible fields inside each cell.
diff --git a/web_widget_x2many_2d_matrix/readme/USAGE.rst b/web_widget_x2many_2d_matrix/readme/USAGE.rst
new file mode 100644
index 000000000..8716546d4
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/readme/USAGE.rst
@@ -0,0 +1,92 @@
+Use this widget by saying::
+
+<field name="my_field" widget="x2many_2d_matrix" />
+
+This assumes that my_field refers to a model with the fields `x`, `y` and
+`value`. If your fields are named differently, pass the correct names as
+attributes:
+
+.. code-block:: xml
+
+    <field name="my_field" widget="x2many_2d_matrix" field_x_axis="my_field1" field_y_axis="my_field2" field_value="my_field3">
+        <tree>
+            <field name="my_field"/>
+            <field name="my_field1"/>
+            <field name="my_field2"/>
+            <field name="my_field3"/>
+        </tree>
+    </field>
+
+You can pass the following parameters:
+
+field_x_axis
+    The field that indicates the x value of a point
+field_y_axis
+    The field that indicates the y value of a point
+field_label_x_axis
+    Use another field to display in the table header
+field_label_y_axis
+    Use another field to display in the table header
+field_value
+    Show this field as value
+show_row_totals
+    If field_value is a numeric field, it indicates if you want to calculate
+    row totals. True by default
+show_column_totals
+    If field_value is a numeric field, it indicates if you want to calculate
+    column totals. True by default
+
+Example
+=======
+
+You need a data structure already filled with values. Let's assume we want to
+use this widget in a wizard that lets the user fill in planned hours for one
+task per project per user. In this case, we can use ``project.task`` as our
+data model and point to it from our wizard. The crucial part is that we fill
+the field in the default function:
+
+.. code-block:: python
+
+    from odoo import fields, models
+
+    class MyWizard(models.TransientModel):
+        _name = 'my.wizard'
+
+        def _default_task_ids(self):
+            # your list of project should come from the context, some selection
+            # in a previous wizard or wherever else
+            projects = self.env['project.project'].browse([1, 2, 3])
+            # same with users
+            users = self.env['res.users'].browse([1, 2, 3])
+            return [
+                (0, 0, {
+                    'name': 'Sample task name',
+                    'project_id': p.id,
+                    'user_id': u.id,
+                    'planned_hours': 0,
+                    'message_needaction': False,
+                    'date_deadline': fields.Date.today(),
+                })
+                # if the project doesn't have a task for the user,
+                # create a new one
+                if not p.task_ids.filtered(lambda x: x.user_id == u) else
+                # otherwise, return the task
+                (4, p.task_ids.filtered(lambda x: x.user_id == u)[0].id)
+                for p in projects
+                for u in users
+            ]
+
+        task_ids = fields.Many2many('project.task', default=_default_task_ids)
+
+Now in our wizard, we can use:
+
+.. code-block:: xml
+
+    <field name="task_ids" widget="x2many_2d_matrix" field_x_axis="project_id" field_y_axis="user_id" field_value="planned_hours">
+        <tree>
+            <field name="task_ids"/>
+            <field name="project_id"/>
+            <field name="user_id"/>
+            <field name="planned_hours"/>
+        </tree>
+    </field>
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
new file mode 100644
index 000000000..8ee519c96
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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.14: http://docutils.sourceforge.net/" />
+<title>2D matrix for x2many fields</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+: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 http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="d-matrix-for-x2many-fields">
+<h1 class="title">2D matrix for x2many fields</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! 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/web/tree/12.0/web_widget_x2many_2d_matrix"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix"><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/162/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module allows to show an x2many field with 3-tuples
+($x_value, $y_value, $value) in a table</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="30%" />
+<col width="35%" />
+<col width="35%" />
+</colgroup>
+<thead valign="bottom">
+<tr><th class="head">&nbsp;</th>
+<th class="head">$x_value1</th>
+<th class="head">$x_value2</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr><td>$y_value1</td>
+<td>$value(1/1)</td>
+<td>$value(2/1)</td>
+</tr>
+<tr><td>$y_value2</td>
+<td>$value(1/2)</td>
+<td>$value(2/2)</td>
+</tr>
+</tbody>
+</table>
+<p>where <cite>value(n/n)</cite> is editable.</p>
+<p>An example use case would be: Select some projects and some employees so that
+a manager can easily fill in the planned_hours for one task per employee. The
+result could look like this:</p>
+<img alt="Screenshot" src="/web_widget_x2many_2d_matrix/static/description/screenshot.png" />
+<p>The beauty of this is that you have an arbitrary amount of columns with this
+widget, trying to get this in standard x2many lists involves some quite ugly
+hacks.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#example" id="id2">Example</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>Use this widget by saying:</p>
+<pre class="literal-block">
+&lt;field name=&quot;my_field&quot; widget=&quot;x2many_2d_matrix&quot; /&gt;
+</pre>
+<p>This assumes that my_field refers to a model with the fields <cite>x</cite>, <cite>y</cite> and
+<cite>value</cite>. If your fields are named differently, pass the correct names as
+attributes:</p>
+<pre class="code xml literal-block">
+<span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;my_field&quot;</span> <span class="na">widget=</span><span class="s">&quot;x2many_2d_matrix&quot;</span> <span class="na">field_x_axis=</span><span class="s">&quot;my_field1&quot;</span> <span class="na">field_y_axis=</span><span class="s">&quot;my_field2&quot;</span> <span class="na">field_value=</span><span class="s">&quot;my_field3&quot;</span><span class="nt">&gt;</span>
+    <span class="nt">&lt;tree&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;my_field&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;my_field1&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;my_field2&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;my_field3&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/tree&gt;</span>
+<span class="nt">&lt;/field&gt;</span>
+</pre>
+<p>You can pass the following parameters:</p>
+<dl class="docutils">
+<dt>field_x_axis</dt>
+<dd>The field that indicates the x value of a point</dd>
+<dt>field_y_axis</dt>
+<dd>The field that indicates the y value of a point</dd>
+<dt>field_label_x_axis</dt>
+<dd>Use another field to display in the table header</dd>
+<dt>field_label_y_axis</dt>
+<dd>Use another field to display in the table header</dd>
+<dt>field_value</dt>
+<dd>Show this field as value</dd>
+<dt>show_row_totals</dt>
+<dd>If field_value is a numeric field, it indicates if you want to calculate
+row totals. True by default</dd>
+<dt>show_column_totals</dt>
+<dd>If field_value is a numeric field, it indicates if you want to calculate
+column totals. True by default</dd>
+</dl>
+</div>
+<div class="section" id="example">
+<h1><a class="toc-backref" href="#id2">Example</a></h1>
+<p>You need a data structure already filled with values. Let’s assume we want to
+use this widget in a wizard that lets the user fill in planned hours for one
+task per project per user. In this case, we can use <tt class="docutils literal">project.task</tt> as our
+data model and point to it from our wizard. The crucial part is that we fill
+the field in the default function:</p>
+<pre class="code python literal-block">
+<span class="kn">from</span> <span class="nn">odoo</span> <span class="kn">import</span> <span class="n">fields</span><span class="p">,</span> <span class="n">models</span>
+
+<span class="k">class</span> <span class="nc">MyWizard</span><span class="p">(</span><span class="n">models</span><span class="o">.</span><span class="n">TransientModel</span><span class="p">):</span>
+    <span class="n">_name</span> <span class="o">=</span> <span class="s1">'my.wizard'</span>
+
+    <span class="k">def</span> <span class="nf">_default_task_ids</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="c1"># your list of project should come from the context, some selection</span>
+        <span class="c1"># in a previous wizard or wherever else</span>
+        <span class="n">projects</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">env</span><span class="p">[</span><span class="s1">'project.project'</span><span class="p">]</span><span class="o">.</span><span class="n">browse</span><span class="p">([</span><span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">])</span>
+        <span class="c1"># same with users</span>
+        <span class="n">users</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">env</span><span class="p">[</span><span class="s1">'res.users'</span><span class="p">]</span><span class="o">.</span><span class="n">browse</span><span class="p">([</span><span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">])</span>
+        <span class="k">return</span> <span class="p">[</span>
+            <span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="p">{</span>
+                <span class="s1">'name'</span><span class="p">:</span> <span class="s1">'Sample task name'</span><span class="p">,</span>
+                <span class="s1">'project_id'</span><span class="p">:</span> <span class="n">p</span><span class="o">.</span><span class="n">id</span><span class="p">,</span>
+                <span class="s1">'user_id'</span><span class="p">:</span> <span class="n">u</span><span class="o">.</span><span class="n">id</span><span class="p">,</span>
+                <span class="s1">'planned_hours'</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+                <span class="s1">'message_needaction'</span><span class="p">:</span> <span class="bp">False</span><span class="p">,</span>
+                <span class="s1">'date_deadline'</span><span class="p">:</span> <span class="n">fields</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">today</span><span class="p">(),</span>
+            <span class="p">})</span>
+            <span class="c1"># if the project doesn't have a task for the user,</span>
+            <span class="c1"># create a new one</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">p</span><span class="o">.</span><span class="n">task_ids</span><span class="o">.</span><span class="n">filtered</span><span class="p">(</span><span class="k">lambda</span> <span class="n">x</span><span class="p">:</span> <span class="n">x</span><span class="o">.</span><span class="n">user_id</span> <span class="o">==</span> <span class="n">u</span><span class="p">)</span> <span class="k">else</span>
+            <span class="c1"># otherwise, return the task</span>
+            <span class="p">(</span><span class="mi">4</span><span class="p">,</span> <span class="n">p</span><span class="o">.</span><span class="n">task_ids</span><span class="o">.</span><span class="n">filtered</span><span class="p">(</span><span class="k">lambda</span> <span class="n">x</span><span class="p">:</span> <span class="n">x</span><span class="o">.</span><span class="n">user_id</span> <span class="o">==</span> <span class="n">u</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">id</span><span class="p">)</span>
+            <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">projects</span>
+            <span class="k">for</span> <span class="n">u</span> <span class="ow">in</span> <span class="n">users</span>
+        <span class="p">]</span>
+
+    <span class="n">task_ids</span> <span class="o">=</span> <span class="n">fields</span><span class="o">.</span><span class="n">Many2many</span><span class="p">(</span><span class="s1">'project.task'</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="n">_default_task_ids</span><span class="p">)</span>
+</pre>
+<p>Now in our wizard, we can use:</p>
+<pre class="code xml literal-block">
+<span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;task_ids&quot;</span> <span class="na">widget=</span><span class="s">&quot;x2many_2d_matrix&quot;</span> <span class="na">field_x_axis=</span><span class="s">&quot;project_id&quot;</span> <span class="na">field_y_axis=</span><span class="s">&quot;user_id&quot;</span> <span class="na">field_value=</span><span class="s">&quot;planned_hours&quot;</span><span class="nt">&gt;</span>
+    <span class="nt">&lt;tree&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;task_ids&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;project_id&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;user_id&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;planned_hours&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/tree&gt;</span>
+<span class="nt">&lt;/field&gt;</span>
+</pre>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
+<ul class="simple">
+<li>Support extra attributes on each field cell via <cite>field_extra_attrs</cite> param.
+We could set a cell as not editable, required or readonly for instance.
+The <cite>readonly</cite> case will also give the ability
+to click on 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>
+<li>Entering the widget from behind by pressing <tt class="docutils literal">Shift+TAB</tt> in your keyboard
+will enter into the 1st cell until <a class="reference external" href="https://github.com/odoo/odoo/pull/26490">https://github.com/odoo/odoo/pull/26490</a>
+is merged.</li>
+<li>Support extra invisible fields inside each cell.</li>
+</ul>
+</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/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2012.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">
+<h1><a class="toc-backref" href="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Therp BV</li>
+<li>Tecnativa</li>
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
+<li>Pedro M. Baeza &lt;<a class="reference external" href="mailto:pedro.baeza&#64;tecnativa.com">pedro.baeza&#64;tecnativa.com</a>&gt;</li>
+<li>Artem Kostyuk &lt;<a class="reference external" href="mailto:a.kostyuk&#64;mobilunity.com">a.kostyuk&#64;mobilunity.com</a>&gt;</li>
+<li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
+<li>Timon Tschanz &lt;<a class="reference external" href="mailto:timon.tschanz&#64;camptocamp.com">timon.tschanz&#64;camptocamp.com</a>&gt;</li>
+<li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt;</li>
+<li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
+<li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;brainbeanapps.com">alexey.pelykh&#64;brainbeanapps.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<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/web/tree/12.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>
+</div>
+</div>
+</body>
+</html>
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index ab1956518..6083a642f 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
-                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
-                <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />
-                <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
-            </xpath>
-        </template>
-    </data>
-</openerp>
+<odoo>
+    <!--
+        License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+    -->
+
+    <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
+            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
+            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />
+            <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
+        </xpath>
+    </template>
+
+</odoo>

From a1e5e485378a7e8e424bd1249c5a4b8b644e4438 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Tue, 20 Nov 2018 10:46:18 +0200
Subject: [PATCH 59/95] [12.0][FIX] web_widget_x2many_2d_matrix: README

---
 web_widget_x2many_2d_matrix/README.rst                    | 2 +-
 web_widget_x2many_2d_matrix/readme/USAGE.rst              | 2 +-
 web_widget_x2many_2d_matrix/static/description/index.html | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 9972ee0e0..f49108245 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -96,7 +96,7 @@ show_column_totals
     column totals. True by default
 
 Example
-=======
+~~~~~~~
 
 You need a data structure already filled with values. Let's assume we want to
 use this widget in a wizard that lets the user fill in planned hours for one
diff --git a/web_widget_x2many_2d_matrix/readme/USAGE.rst b/web_widget_x2many_2d_matrix/readme/USAGE.rst
index 8716546d4..514257d00 100644
--- a/web_widget_x2many_2d_matrix/readme/USAGE.rst
+++ b/web_widget_x2many_2d_matrix/readme/USAGE.rst
@@ -37,7 +37,7 @@ show_column_totals
     column totals. True by default
 
 Example
-=======
+~~~~~~~
 
 You need a data structure already filled with values. Let's assume we want to
 use this widget in a wizard that lets the user fill in planned hours for one
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index 8ee519c96..0b7103e3a 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -404,8 +404,10 @@ hacks.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#usage" id="id1">Usage</a><ul>
 <li><a class="reference internal" href="#example" id="id2">Example</a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
 <li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
 <li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
@@ -454,9 +456,8 @@ row totals. True by default</dd>
 <dd>If field_value is a numeric field, it indicates if you want to calculate
 column totals. True by default</dd>
 </dl>
-</div>
 <div class="section" id="example">
-<h1><a class="toc-backref" href="#id2">Example</a></h1>
+<h2><a class="toc-backref" href="#id2">Example</a></h2>
 <p>You need a data structure already filled with values. Let’s assume we want to
 use this widget in a wizard that lets the user fill in planned hours for one
 task per project per user. In this case, we can use <tt class="docutils literal">project.task</tt> as our
@@ -506,6 +507,7 @@ the field in the default function:</p>
 <span class="nt">&lt;/field&gt;</span>
 </pre>
 </div>
+</div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
 <ul class="simple">

From 10465a66d6dd0a299ae6f5b63667c08e413d0ff2 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 20 Nov 2018 08:49:49 +0000
Subject: [PATCH 60/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index abb0c5965..148c8c572 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"

From 380bbe0c6f51bfe56d4e57fd31a95cb2d08e9e6d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 2 Dec 2018 02:59:09 +0000
Subject: [PATCH 61/95] [UPD] README.rst

---
 web_widget_x2many_2d_matrix/README.rst                    | 2 +-
 web_widget_x2many_2d_matrix/static/description/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index f49108245..1372c625a 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -42,7 +42,7 @@ An example use case would be: Select some projects and some employees so that
 a manager can easily fill in the planned_hours for one task per employee. The
 result could look like this:
 
-.. image:: /web_widget_x2many_2d_matrix/static/description/screenshot.png
+.. image:: https://raw.githubusercontent.com/web_widget_x2many_2d_matrix/static/description/screenshot.png
     :alt: Screenshot
 
 The beauty of this is that you have an arbitrary amount of columns with this
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index 0b7103e3a..bd5775f28 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -397,7 +397,7 @@ ul.auto-toc {
 <p>An example use case would be: Select some projects and some employees so that
 a manager can easily fill in the planned_hours for one task per employee. The
 result could look like this:</p>
-<img alt="Screenshot" src="/web_widget_x2many_2d_matrix/static/description/screenshot.png" />
+<img alt="Screenshot" src="https://raw.githubusercontent.com/web_widget_x2many_2d_matrix/static/description/screenshot.png" />
 <p>The beauty of this is that you have an arbitrary amount of columns with this
 widget, trying to get this in standard x2many lists involves some quite ugly
 hacks.</p>

From b0fa862b8aabb5eac7f57b641bfa8a6ec905db80 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sun, 9 Dec 2018 13:37:47 +0000
Subject: [PATCH 62/95] Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.
---
 web_widget_x2many_2d_matrix/i18n/ar.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/de.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/es.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/fi.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/fr.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/hr.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/it.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/lt.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/nl_NL.po | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/sl.po    | 18 +++++++++++++++---
 web_widget_x2many_2d_matrix/i18n/tr.po    | 18 +++++++++++++++---
 12 files changed, 180 insertions(+), 36 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
index 6b12b83b8..bf4e31ca2 100644
--- a/web_widget_x2many_2d_matrix/i18n/ar.po
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -22,10 +22,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "المجموع الاجمالي"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
index 53c95477e..6b0bc21da 100644
--- a/web_widget_x2many_2d_matrix/i18n/de.po
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Gesamt"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
index 467451467..cbd846a09 100644
--- a/web_widget_x2many_2d_matrix/i18n/es.po
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -20,10 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
index 50321d78a..5c2a73611 100644
--- a/web_widget_x2many_2d_matrix/i18n/fi.po
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Yhteensä"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index 73c195491..410bf24df 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -20,10 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index 7a9c1d999..83cea7c5a 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -22,10 +22,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Ukupno"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index 09f323628..ebc42f635 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -20,10 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Totale"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index c2c47a021..973c13e8a 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Suma"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index 5a792ed3d..e4ed2c6b6 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Totaal"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Totaal"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index e9999626d..917cef29b 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr "Desculpe não há dados de matriz para exibir."
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
index 83c518e00..64804585d 100644
--- a/web_widget_x2many_2d_matrix/i18n/sl.po
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Skupaj"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
index 0e192ed2a..4d87c8e0f 100644
--- a/web_widget_x2many_2d_matrix/i18n/tr.po
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -21,10 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:46
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Toplam"
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#, fuzzy, python-format
+msgid "Sum Total"
+msgstr "Toplam"

From c38c70e0f3a6405e3768ce5fb70d8fab6bea362a Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 6 Dec 2018 14:25:47 +0200
Subject: [PATCH 63/95] [FIX] web_widget_x2many_2d_matrix: _renderBodyCell +
 _renderAggregateColCells

---
 web_widget_x2many_2d_matrix/README.rst        |  18 ++-
 web_widget_x2many_2d_matrix/__manifest__.py   |   3 +-
 .../readme/DESCRIPTION.rst                    |   2 +-
 .../readme/HISTORY.rst                        |  11 ++
 .../static/description/index.html             |  57 ++++++---
 .../static/src/js/2d_matrix_renderer.js       | 108 +++++++++++-------
 .../static/src/js/widget_x2many_2d_matrix.js  |  12 +-
 7 files changed, 148 insertions(+), 63 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix/readme/HISTORY.rst

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 1372c625a..c0693fcf4 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -42,7 +42,7 @@ An example use case would be: Select some projects and some employees so that
 a manager can easily fill in the planned_hours for one task per employee. The
 result could look like this:
 
-.. image:: https://raw.githubusercontent.com/web_widget_x2many_2d_matrix/static/description/screenshot.png
+.. image:: https://raw.githubusercontent.com/OCA/web/12.0/web_widget_x2many_2d_matrix/static/description/screenshot.png
     :alt: Screenshot
 
 The beauty of this is that you have an arbitrary amount of columns with this
@@ -168,6 +168,21 @@ Known issues / Roadmap
 
 * Support extra invisible fields inside each cell.
 
+Changelog
+=========
+
+12.0.1.0.1 (2018-12-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Cells are unable to render property.
+  (`#1126 <https://github.com/OCA/web/issues/1126>`_)
+
+12.0.1.0.0 (2018-11-20)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [12.0][MIG] web_widget_x2many_2d_matrix
+  (`#1101 <https://github.com/OCA/web/issues/1101>`_)
+
 Bug Tracker
 ===========
 
@@ -187,6 +202,7 @@ Authors
 * Therp BV
 * Tecnativa
 * Camptocamp
+* Brainbean Apps
 
 Contributors
 ~~~~~~~~~~~~
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index bfee53ec3..3299e66b7 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,11 +4,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'author': (
         'Therp BV, '
         'Tecnativa, '
         'Camptocamp, '
+        'Brainbean Apps, '
         'Odoo Community Association (OCA)'
     ),
     'website': 'https://github.com/OCA/web',
diff --git a/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst b/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
index a84da8005..d3f10cae8 100644
--- a/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
+++ b/web_widget_x2many_2d_matrix/readme/DESCRIPTION.rst
@@ -15,7 +15,7 @@ An example use case would be: Select some projects and some employees so that
 a manager can easily fill in the planned_hours for one task per employee. The
 result could look like this:
 
-.. image:: /web_widget_x2many_2d_matrix/static/description/screenshot.png
+.. image:: https://raw.githubusercontent.com/OCA/web/12.0/web_widget_x2many_2d_matrix/static/description/screenshot.png
     :alt: Screenshot
 
 The beauty of this is that you have an arbitrary amount of columns with this
diff --git a/web_widget_x2many_2d_matrix/readme/HISTORY.rst b/web_widget_x2many_2d_matrix/readme/HISTORY.rst
new file mode 100644
index 000000000..8bad8c46c
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/readme/HISTORY.rst
@@ -0,0 +1,11 @@
+12.0.1.0.1 (2018-12-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Cells are unable to render property.
+  (`#1126 <https://github.com/OCA/web/issues/1126>`_)
+
+12.0.1.0.0 (2018-11-20)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [12.0][MIG] web_widget_x2many_2d_matrix
+  (`#1101 <https://github.com/OCA/web/issues/1101>`_)
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index bd5775f28..1be53a2a7 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -397,29 +397,34 @@ ul.auto-toc {
 <p>An example use case would be: Select some projects and some employees so that
 a manager can easily fill in the planned_hours for one task per employee. The
 result could look like this:</p>
-<img alt="Screenshot" src="https://raw.githubusercontent.com/web_widget_x2many_2d_matrix/static/description/screenshot.png" />
+<img alt="Screenshot" src="https://raw.githubusercontent.com/OCA/web/12.0/web_widget_x2many_2d_matrix/static/description/screenshot.png" />
 <p>The beauty of this is that you have an arbitrary amount of columns with this
 widget, trying to get this in standard x2many lists involves some quite ugly
 hacks.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#usage" id="id1">Usage</a><ul>
-<li><a class="reference internal" href="#example" id="id2">Example</a></li>
+<li><a class="reference internal" href="#usage" id="id5">Usage</a><ul>
+<li><a class="reference internal" href="#example" id="id6">Example</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id7">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id8">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id9">12.0.1.0.1 (2018-12-07)</a></li>
+<li><a class="reference internal" href="#id3" id="id10">12.0.1.0.0 (2018-11-20)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="id11">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id12">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id13">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id14">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id15">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<h1><a class="toc-backref" href="#id5">Usage</a></h1>
 <p>Use this widget by saying:</p>
 <pre class="literal-block">
 &lt;field name=&quot;my_field&quot; widget=&quot;x2many_2d_matrix&quot; /&gt;
@@ -457,7 +462,7 @@ row totals. True by default</dd>
 column totals. True by default</dd>
 </dl>
 <div class="section" id="example">
-<h2><a class="toc-backref" href="#id2">Example</a></h2>
+<h2><a class="toc-backref" href="#id6">Example</a></h2>
 <p>You need a data structure already filled with values. Let’s assume we want to
 use this widget in a wizard that lets the user fill in planned hours for one
 task per project per user. In this case, we can use <tt class="docutils literal">project.task</tt> as our
@@ -509,7 +514,7 @@ the field in the default function:</p>
 </div>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id7">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>Support extra attributes on each field cell via <cite>field_extra_attrs</cite> param.
 We could set a cell as not editable, required or readonly for instance.
@@ -523,8 +528,25 @@ is merged.</li>
 <li>Support extra invisible fields inside each cell.</li>
 </ul>
 </div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#id8">Changelog</a></h1>
+<div class="section" id="id1">
+<h2><a class="toc-backref" href="#id9">12.0.1.0.1 (2018-12-07)</a></h2>
+<ul class="simple">
+<li>[FIX] Cells are unable to render property.
+(<a class="reference external" href="https://github.com/OCA/web/issues/1126">#1126</a>)</li>
+</ul>
+</div>
+<div class="section" id="id3">
+<h2><a class="toc-backref" href="#id10">12.0.1.0.0 (2018-11-20)</a></h2>
+<ul class="simple">
+<li>[12.0][MIG] web_widget_x2many_2d_matrix
+(<a class="reference external" href="https://github.com/OCA/web/issues/1101">#1101</a>)</li>
+</ul>
+</div>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id11">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/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
@@ -532,17 +554,18 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <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="#id5">Credits</a></h1>
+<h1><a class="toc-backref" href="#id12">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<h2><a class="toc-backref" href="#id13">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 <li>Tecnativa</li>
 <li>Camptocamp</li>
+<li>Brainbean Apps</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id14">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Pedro M. Baeza &lt;<a class="reference external" href="mailto:pedro.baeza&#64;tecnativa.com">pedro.baeza&#64;tecnativa.com</a>&gt;</li>
@@ -555,7 +578,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id15">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index ac627e44c..30808ae1b 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -1,23 +1,25 @@
 /* Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
+ * Copyright 2018 Brainbean Apps
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
 odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (require) {
     "use strict";
 
-    // Heavily inspired by Odoo's `ListRenderer`
     var BasicRenderer = require('web.BasicRenderer');
     var config = require('web.config');
     var core = require('web.core');
     var field_utils = require('web.field_utils');
     var _t = core._t;
+    
     var FIELD_CLASSES = {
-        // Copied from ListRenderer
         float: 'o_list_number',
         integer: 'o_list_number',
         monetary: 'o_list_number',
         text: 'o_list_text',
     };
 
+    // X2Many2dMatrixRenderer is heavily inspired by Odoo's ListRenderer
+    // and is reusing portions of code from list_renderer.js
     var X2Many2dMatrixRenderer = BasicRenderer.extend({
 
         /**
@@ -53,8 +55,11 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
         _renderView: function () {
             var self = this;
 
+            this.$el
+                .removeClass('table-responsive')
+                .empty();
+
             // Display a nice message if there's no data to display
-            this.$el.empty();
             if (!self.rows.length) {
                 var $alert = $('<div>', {'class': 'alert alert-info'});
                 $alert.text(_t('Sorry no matrix data to display.'));
@@ -170,7 +175,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @returns {String} a string with the generated html.
          */
         _renderRows: function () {
-            return _.map(this.rows, this._renderRow.bind(this));
+            return _.map(this.rows, function (row) {
+                row.attrs.name = this.matrix_data.field_value;
+                return this._renderRow(row);
+            }.bind(this));
         },
 
         /**
@@ -187,11 +195,11 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             var $tr = $('<tr/>', {class: 'o_data_row'}),
                 _data = _.without(row.data, undefined);
             $tr = $tr.append(this._renderLabelCell(_data[0]));
-            var $cells = _.map(this.columns, function (node, index) {
+            var $cells = _.map(this.columns, function (column, index) {
                 var record = row.data[index];
                 // Make the widget use our field value for each cell
-                node.attrs.name = this.matrix_data.field_value;
-                return this._renderBodyCell(record, node, index, {mode:''});
+                column.attrs.name = this.matrix_data.field_value;
+                return this._renderBodyCell(record, column, index, {mode:''});
             }.bind(this));
             $tr = $tr.append($cells);
             if (row.aggregate) {
@@ -227,8 +235,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @returns {jQueryElement} The rendered cell.
          */
         _renderAggregateRowCell: function (row) {
-            var $cell = $('<td/>', {class: 'row-total text-right'});
-            this._apply_aggregate_value($cell, row.aggregate);
+            var $cell = $('<td/>', {class: 'row-total'});
+            this.applyAggregateValue($cell, row);
             return $cell;
         },
 
@@ -246,9 +254,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          */
         _renderBodyCell: function (record, node, colIndex, options) {
             var tdClassName = 'o_data_cell';
-            if (node.tag === 'button') {
-                tdClassName += ' o_list_button';
-            } else if (node.tag === 'field') {
+            if (node.tag === 'field') {
                 var typeClass = FIELD_CLASSES[
                     this.state.fields[node.attrs.name].type
                 ];
@@ -259,11 +265,14 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                     tdClassName += ' o_' + node.attrs.widget + '_cell';
                 }
             }
+
             // TODO roadmap: here we should collect possible extra params
             // the user might want to attach to each single cell.
+
             var $td = $('<td>', {
                 'class': tdClassName,
             });
+
             if (_.isUndefined(record)) {
                 // Without record, nothing elese to do
                 return $td;
@@ -272,6 +281,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 'data-form-id': record.id,
                 'data-id': record.data.id,
             });
+
             // We register modifiers on the <td> element so that it gets
             // the correct modifiers classes (for styling)
             var modifiers = this._registerModifiers(
@@ -286,13 +296,28 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             if (modifiers.invisible && !(options && options.renderInvisible)) {
                 return $td;
             }
+
             // Enforce mode of the parent
             options.mode = this.getParent().mode;
-            var widget = this._renderFieldWidget(
-                node, record, _.pick(options, 'mode')
-            );
-            this._handleAttributes(widget.$el, node);
-            return $td.append(widget.$el);
+
+            if (node.tag === 'widget') {
+                return $td.append(this._renderWidget(record, node));
+            }
+            if (node.attrs.widget || (options && (options.renderWidgets || options.mode === 'edit'))) {
+                var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
+                this._handleAttributes($el, node);
+                return $td.append($el);
+            }
+            var name = node.attrs.name;
+            var field = this.state.fields[name];
+            var value = record.data[name];
+            var formattedValue = field_utils.format[field.type](value, field, {
+                data: record.data,
+                escape: true,
+                isPassword: 'password' in node.attrs,
+            });
+            this._handleAttributes($td, node);
+            return $td.html(formattedValue);
         },
 
         /**
@@ -325,8 +350,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
 
-            var $cell = $('<td>', {class: 'col-total text-right'});
-            this._apply_aggregate_value($cell, this.total);
+            var $cell = $('<td>', {class: 'col-total'});
+            this.applyAggregateValue($cell, this.total);
             return $cell;
         },
 
@@ -338,10 +363,14 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          */
         _renderAggregateColCells: function () {
             var self = this;
+
             return _.map(this.columns, function (column) {
-                var $cell = $('<td>', {class: 'col-total text-right'});
+                var $cell = $('<td>');
+                if (config.debug) {
+                    $cell.addClass(column.attrs.name);
+                }
                 if (column.aggregate) {
-                    self._apply_aggregate_value($cell, column.aggregate);
+                    self.applyAggregateValue($cell, column)
                 }
                 return $cell;
             });
@@ -367,15 +396,16 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
             this.total = {
-                fname: fname,
-                ftype: type,
-                help: _t('Sum Total'),
-                value: 0,
+                attrs: {
+                    name: fname,
+                },
+                aggregate: {
+                    help: _t('Sum Total'),
+                    value: 0,
+                },
             };
             _.each(this.columns, function (column, index) {
                 column.aggregate = {
-                    fname: fname,
-                    ftype: type,
                     help: _t('Sum'),
                     value: 0,
                 };
@@ -451,8 +481,6 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             }
             _.each(this.rows, function (row) {
                 row.aggregate = {
-                    fname: fname,
-                    ftype: type,
                     help: _t('Sum'),
                     value: 0,
                 };
@@ -475,17 +503,19 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {jQueryElement} $cell
          * The Cell where the aggregate should be added.
          *
-         * @param {Object} aggregate
-         * The object which contains the information about the aggregate value
+         * @param {Object} axis
+         * The object which contains the information about the aggregate value axis
          */
-        _apply_aggregate_value: function ($cell, aggregate) {
-            var field = this.state.fields[aggregate.fname],
-                formatter = field_utils.format[field.type];
-            var formattedValue = formatter(
-                aggregate.value, field, {escape: true}
-            );
-            $cell.addClass('total').attr('title', aggregate.help)
-                .html(formattedValue);
+        applyAggregateValue: function ($cell, axis) {
+            var field = this.state.fields[axis.attrs.name];
+            var value = axis.aggregate.value;
+            var help = axis.aggregate.help;
+            var formatFunc = field_utils.format[axis.attrs.widget];
+            if (!formatFunc) {
+                formatFunc = field_utils.format[field.type];
+            }
+            var formattedValue = formatFunc(value, field, { escape: true });
+            $cell.addClass('o_list_number').attr('title', help).html(formattedValue);
         },
 
         /**
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index addf7cd40..bdaead56a 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -56,9 +56,6 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                         node[property];
                 }
             }
-            // And this?
-            this.field_editability =
-                node.field_editability || this.field_editability;
             this.show_row_totals =
                 this.parse_boolean(node.show_row_totals || '1');
             this.show_column_totals =
@@ -138,7 +135,14 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         _make_row: function (y) {
             var self = this;
             // Use object so that we can attach more data if needed
-            var row = {'data': []};
+            var row = {
+                'tag': 'field',
+                'attrs': {
+                    'name': this.field_y_axis,
+                    'string': y,
+                },
+                'data': [],
+            };
             $.each(self.by_x_axis, function (x) {
                 row.data.push(self.by_y_axis[y][x]);
             });

From 4f55388fb19b5541e640775ce572f37b49ec053c Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 11 Dec 2018 08:25:37 +0000
Subject: [PATCH 64/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index 148c8c572..603333a67 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -15,22 +15,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, python-format
 msgid "Sum Total"
 msgstr ""

From b78af1e92e7a1af552e70de1bcf0b9d878208150 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 29 Dec 2018 12:06:41 +0000
Subject: [PATCH 65/95] Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.
---
 web_widget_x2many_2d_matrix/i18n/ar.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/de.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/es.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/fi.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/fr.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/hr.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/it.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/lt.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/nl_NL.po | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/sl.po    | 8 ++++----
 web_widget_x2many_2d_matrix/i18n/tr.po    | 8 ++++----
 12 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
index bf4e31ca2..0da4036e9 100644
--- a/web_widget_x2many_2d_matrix/i18n/ar.po
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -22,22 +22,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
index 6b0bc21da..8ffbb10f8 100644
--- a/web_widget_x2many_2d_matrix/i18n/de.po
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
index cbd846a09..e016a57ca 100644
--- a/web_widget_x2many_2d_matrix/i18n/es.po
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -20,22 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
index 5c2a73611..a1cc0f048 100644
--- a/web_widget_x2many_2d_matrix/i18n/fi.po
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index 410bf24df..2071aae4c 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -20,22 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index 83cea7c5a..da7b1294e 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -22,22 +22,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index ebc42f635..a54964453 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -20,22 +20,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index 973c13e8a..6e28344ac 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index e4ed2c6b6..60d7eb170 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Totaal"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index 917cef29b..f980fe3c2 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr "Desculpe não há dados de matriz para exibir."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
index 64804585d..aff2fac40 100644
--- a/web_widget_x2many_2d_matrix/i18n/sl.po
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
index 4d87c8e0f..7b09f874a 100644
--- a/web_widget_x2many_2d_matrix/i18n/tr.po
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -21,22 +21,22 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:60
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:379
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:456
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:372
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Toplam"

From a9257b6a93789da9d386b0135a8df2ca0299a640 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Tue, 5 Feb 2019 08:02:00 +0200
Subject: [PATCH 66/95] [FIX] web_widget_x2many_2d_matrix: total cell
 calculation

---
 web_widget_x2many_2d_matrix/__manifest__.py                     | 2 +-
 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 3299e66b7..36e97340d 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.0.2',
     'author': (
         'Therp BV, '
         'Tecnativa, '
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 30808ae1b..7eb3c39d3 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -417,7 +417,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                         // Nothing to do
                     }
                 });
-                this.total.value += column.aggregate.value;
+                this.total.aggregate.value += column.aggregate.value;
             }.bind(this));
         },
 

From c99025aab727762229bc0483c7d9bf71cc7b5933 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Fri, 15 Feb 2019 18:36:17 +0200
Subject: [PATCH 67/95] [IMP] web_widget_x2many_2d_matrix: center header cell

---
 web_widget_x2many_2d_matrix/__manifest__.py            |  2 +-
 .../static/src/css/web_widget_x2many_2d_matrix.css     |  3 ---
 .../static/src/js/2d_matrix_renderer.js                |  5 ++++-
 .../static/src/scss/web_widget_x2many_2d_matrix.scss   | 10 ++++++++++
 web_widget_x2many_2d_matrix/views/assets.xml           |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
 create mode 100644 web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 36e97340d..c26e9f47c 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.0.2',
+    'version': '12.0.1.0.3',
     'author': (
         'Therp BV, '
         'Tecnativa, '
diff --git a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css b/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
deleted file mode 100644
index 907f507d2..000000000
--- a/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.o_field_x2many_2d_matrix .row-total {
-  font-weight: bold;
-}
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 7eb3c39d3..cb9b5d05c 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -68,7 +68,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             }
 
             var $table = $('<table>').addClass(
-                'o_list_view table table-condensed table-striped'
+                'o_list_view table table-condensed table-striped ' +
+                'o_x2many_2d_matrix '
             );
             this.$el
                 .addClass('table-responsive')
@@ -153,6 +154,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 field.type === 'monetary'
             ) {
                 $th.addClass('text-right');
+            } else {
+                $th.addClass('text-center');
             }
 
             if (config.debug) {
diff --git a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
new file mode 100644
index 000000000..73291a024
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
@@ -0,0 +1,10 @@
+.o_field_x2many_2d_matrix .row-total {
+    font-weight: bold;
+}
+
+.o_x2many_2d_matrix {
+    thead > tr > th {
+        // Respect newline characters
+        white-space: pre-line;
+    }
+}
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index 6083a642f..b26566e55 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -9,7 +9,7 @@
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />
-            <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/>
+            <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss"/>
         </xpath>
     </template>
 

From 121a6c7faca689382b95350d6c2765c40e863fe0 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 19 Feb 2019 14:19:28 +0000
Subject: [PATCH 68/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index 603333a67..9f26d332f 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -22,15 +22,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, python-format
 msgid "Sum Total"
 msgstr ""

From dec078f381c0a1f9626ed0c101e290da88ecedef Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sun, 3 Mar 2019 16:19:17 +0000
Subject: [PATCH 69/95] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/
---
 web_widget_x2many_2d_matrix/i18n/ar.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/de.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/es.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/fi.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/fr.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/hr.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/it.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/lt.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/nl_NL.po | 6 +++---
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 6 +++---
 web_widget_x2many_2d_matrix/i18n/sl.po    | 6 +++---
 web_widget_x2many_2d_matrix/i18n/tr.po    | 6 +++---
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
index 0da4036e9..84fcbac03 100644
--- a/web_widget_x2many_2d_matrix/i18n/ar.po
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -29,15 +29,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
index 8ffbb10f8..54c5ef0e5 100644
--- a/web_widget_x2many_2d_matrix/i18n/de.po
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
index e016a57ca..de93b7f98 100644
--- a/web_widget_x2many_2d_matrix/i18n/es.po
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -27,15 +27,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
index a1cc0f048..e2b063667 100644
--- a/web_widget_x2many_2d_matrix/i18n/fi.po
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index 2071aae4c..c85fe262d 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -27,15 +27,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index da7b1294e..822f603c7 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -29,15 +29,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index a54964453..605d81758 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -27,15 +27,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index 6e28344ac..09248b3b2 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index 60d7eb170..ec65198a2 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Totaal"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index f980fe3c2..4ec8d3023 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -28,15 +28,15 @@ msgstr "Desculpe não há dados de matriz para exibir."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
index aff2fac40..77df42b2a 100644
--- a/web_widget_x2many_2d_matrix/i18n/sl.po
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
index 7b09f874a..66a6c4df7 100644
--- a/web_widget_x2many_2d_matrix/i18n/tr.po
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:409
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:484
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:403
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Toplam"

From d76600708e3d8c324e0d7f1827d8a39a2e9ffacf Mon Sep 17 00:00:00 2001
From: tarteo <d.sluijk@onestein.nl>
Date: Wed, 24 Apr 2019 15:40:03 +0200
Subject: [PATCH 70/95] [FIX] web_widget_x2many_2d_matrix: Use widget for
 formatting aggregates

---
 web_widget_x2many_2d_matrix/__manifest__.py   |  2 +-
 .../static/src/js/2d_matrix_renderer.js       | 26 +++++--------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index c26e9f47c..775b6da74 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.0.3',
+    'version': '12.0.1.0.4',
     'author': (
         'Therp BV, '
         'Tecnativa, '
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index cb9b5d05c..187550f6c 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -306,21 +306,9 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             if (node.tag === 'widget') {
                 return $td.append(this._renderWidget(record, node));
             }
-            if (node.attrs.widget || (options && (options.renderWidgets || options.mode === 'edit'))) {
-                var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
-                this._handleAttributes($el, node);
-                return $td.append($el);
-            }
-            var name = node.attrs.name;
-            var field = this.state.fields[name];
-            var value = record.data[name];
-            var formattedValue = field_utils.format[field.type](value, field, {
-                data: record.data,
-                escape: true,
-                isPassword: 'password' in node.attrs,
-            });
-            this._handleAttributes($td, node);
-            return $td.html(formattedValue);
+            var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
+            this._handleAttributes($el, node);
+            return $td.append($el);
         },
 
         /**
@@ -513,10 +501,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             var field = this.state.fields[axis.attrs.name];
             var value = axis.aggregate.value;
             var help = axis.aggregate.help;
-            var formatFunc = field_utils.format[axis.attrs.widget];
-            if (!formatFunc) {
-                formatFunc = field_utils.format[field.type];
-            }
+            var fieldInfo = this.state.fieldsInfo.list[axis.attrs.name];
+            var formatFunc = field_utils.format[
+                fieldInfo.widget ? fieldInfo.widget : field.type
+            ];
             var formattedValue = formatFunc(value, field, { escape: true });
             $cell.addClass('o_list_number').attr('title', help).html(formattedValue);
         },

From 30f6f279a4c8c47d6536d619fd3e3492bc97fec4 Mon Sep 17 00:00:00 2001
From: tarteo <d.sluijk@onestein.nl>
Date: Thu, 25 Apr 2019 11:48:13 +0200
Subject: [PATCH 71/95] [FIX] web_widget_x2many_2d_matrix: Padding in aggregate
 row

[FIX] Padding in aggregate row
---
 .../static/src/scss/web_widget_x2many_2d_matrix.scss        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
index 73291a024..25382f5d1 100644
--- a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
+++ b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
@@ -2,9 +2,13 @@
     font-weight: bold;
 }
 
-.o_x2many_2d_matrix {
+.o_form_view .o_x2many_2d_matrix.o_list_view {
     thead > tr > th {
         // Respect newline characters
         white-space: pre-line;
     }
+
+    > tfoot > tr > td {
+        padding: 0.75rem;
+    }
 }

From f4153e9329e46e5a72debc41d20601b141beea02 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 26 Apr 2019 10:12:32 +0000
Subject: [PATCH 72/95] [UPD] Update web_widget_x2many_2d_matrix.pot

---
 .../i18n/web_widget_x2many_2d_matrix.pot                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
index 9f26d332f..0171482c8 100644
--- a/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
+++ b/web_widget_x2many_2d_matrix/i18n/web_widget_x2many_2d_matrix.pot
@@ -22,15 +22,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, python-format
 msgid "Sum Total"
 msgstr ""

From ce75558af82f4ec66f45d4ff94cff5d544441e98 Mon Sep 17 00:00:00 2001
From: gslabit <giovanni@gslab.it>
Date: Fri, 3 May 2019 08:51:28 +0000
Subject: [PATCH 73/95] Translated using Weblate (Italian)

Currently translated at 100.0% (3 of 3 strings)

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/it/
---
 web_widget_x2many_2d_matrix/i18n/it.po | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index 605d81758..45a32962e 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -8,22 +8,23 @@ msgstr ""
 "Project-Id-Version: web (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-03-17 07:30+0000\n"
-"PO-Revision-Date: 2015-11-07 11:22+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/"
-"it/)\n"
+"PO-Revision-Date: 2019-05-03 11:03+0000\n"
+"Last-Translator: gslabit <giovanni@gslab.it>\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/it/"
+")\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.5.1\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
-msgstr ""
+msgstr "Spiacenti, nessun dato da visualizzare."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
@@ -31,11 +32,11 @@ msgstr ""
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
 #, python-format
 msgid "Sum"
-msgstr ""
+msgstr "Somma"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
-#, fuzzy, python-format
+#, python-format
 msgid "Sum Total"
 msgstr "Totale"

From 577d954c401be3f62b186aa6af0d41a2c65ba50c Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Mon, 20 May 2019 21:09:19 +0000
Subject: [PATCH 74/95] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/
---
 web_widget_x2many_2d_matrix/i18n/ar.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/de.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/es.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/fi.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/fr.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/hr.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/it.po    | 10 +++++-----
 web_widget_x2many_2d_matrix/i18n/lt.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/nl_NL.po |  6 +++---
 web_widget_x2many_2d_matrix/i18n/pt_BR.po |  6 +++---
 web_widget_x2many_2d_matrix/i18n/sl.po    |  6 +++---
 web_widget_x2many_2d_matrix/i18n/tr.po    |  6 +++---
 12 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/ar.po b/web_widget_x2many_2d_matrix/i18n/ar.po
index 84fcbac03..c0f18b7f1 100644
--- a/web_widget_x2many_2d_matrix/i18n/ar.po
+++ b/web_widget_x2many_2d_matrix/i18n/ar.po
@@ -29,15 +29,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "المجموع الاجمالي"
diff --git a/web_widget_x2many_2d_matrix/i18n/de.po b/web_widget_x2many_2d_matrix/i18n/de.po
index 54c5ef0e5..2482e2c85 100644
--- a/web_widget_x2many_2d_matrix/i18n/de.po
+++ b/web_widget_x2many_2d_matrix/i18n/de.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Gesamt"
diff --git a/web_widget_x2many_2d_matrix/i18n/es.po b/web_widget_x2many_2d_matrix/i18n/es.po
index de93b7f98..1bcc69039 100644
--- a/web_widget_x2many_2d_matrix/i18n/es.po
+++ b/web_widget_x2many_2d_matrix/i18n/es.po
@@ -27,15 +27,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/fi.po b/web_widget_x2many_2d_matrix/i18n/fi.po
index e2b063667..81516261f 100644
--- a/web_widget_x2many_2d_matrix/i18n/fi.po
+++ b/web_widget_x2many_2d_matrix/i18n/fi.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Yhteensä"
diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index c85fe262d..b9dcb0453 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -27,15 +27,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index 822f603c7..27d4f36ee 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -29,15 +29,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Ukupno"
diff --git a/web_widget_x2many_2d_matrix/i18n/it.po b/web_widget_x2many_2d_matrix/i18n/it.po
index 45a32962e..052122935 100644
--- a/web_widget_x2many_2d_matrix/i18n/it.po
+++ b/web_widget_x2many_2d_matrix/i18n/it.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-03-17 07:30+0000\n"
 "PO-Revision-Date: 2019-05-03 11:03+0000\n"
 "Last-Translator: gslabit <giovanni@gslab.it>\n"
-"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/it/"
-")\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-web-8-0/language/"
+"it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,15 +28,15 @@ msgstr "Spiacenti, nessun dato da visualizzare."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr "Somma"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, python-format
 msgid "Sum Total"
 msgstr "Totale"
diff --git a/web_widget_x2many_2d_matrix/i18n/lt.po b/web_widget_x2many_2d_matrix/i18n/lt.po
index 09248b3b2..eb6bdc747 100644
--- a/web_widget_x2many_2d_matrix/i18n/lt.po
+++ b/web_widget_x2many_2d_matrix/i18n/lt.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Suma"
diff --git a/web_widget_x2many_2d_matrix/i18n/nl_NL.po b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
index ec65198a2..71f8d8726 100644
--- a/web_widget_x2many_2d_matrix/i18n/nl_NL.po
+++ b/web_widget_x2many_2d_matrix/i18n/nl_NL.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Totaal"
diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index 4ec8d3023..d10b13853 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -28,15 +28,15 @@ msgstr "Desculpe não há dados de matriz para exibir."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Total"
diff --git a/web_widget_x2many_2d_matrix/i18n/sl.po b/web_widget_x2many_2d_matrix/i18n/sl.po
index 77df42b2a..b99c46ebf 100644
--- a/web_widget_x2many_2d_matrix/i18n/sl.po
+++ b/web_widget_x2many_2d_matrix/i18n/sl.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Skupaj"
diff --git a/web_widget_x2many_2d_matrix/i18n/tr.po b/web_widget_x2many_2d_matrix/i18n/tr.po
index 66a6c4df7..20ef19466 100644
--- a/web_widget_x2many_2d_matrix/i18n/tr.po
+++ b/web_widget_x2many_2d_matrix/i18n/tr.po
@@ -28,15 +28,15 @@ msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:412
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:487
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
-#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:406
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, fuzzy, python-format
 msgid "Sum Total"
 msgstr "Toplam"

From 8b688fd42a1a8e2c5273b38cccccbaba0dec3065 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 29 Jul 2019 03:49:00 +0000
Subject: [PATCH 75/95] [UPD] README.rst

---
 web_widget_x2many_2d_matrix/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index 1be53a2a7..c964858dc 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>2D matrix for x2many fields</title>
 <style type="text/css">
 

From b419fc1c7820878fe2b4f4a8f4e325c9b659c273 Mon Sep 17 00:00:00 2001
From: Nicolas JEUDY <njeudy@panda-chi.io>
Date: Tue, 6 Aug 2019 10:04:37 +0000
Subject: [PATCH 76/95] Translated using Weblate (French)

Currently translated at 100.0% (3 of 3 strings)

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/fr/
---
 web_widget_x2many_2d_matrix/i18n/fr.po | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/fr.po b/web_widget_x2many_2d_matrix/i18n/fr.po
index b9dcb0453..e473d0379 100644
--- a/web_widget_x2many_2d_matrix/i18n/fr.po
+++ b/web_widget_x2many_2d_matrix/i18n/fr.po
@@ -8,22 +8,23 @@ msgstr ""
 "Project-Id-Version: web (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-06 15:50+0000\n"
-"PO-Revision-Date: 2015-11-07 11:22+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/"
-"fr/)\n"
+"PO-Revision-Date: 2019-08-06 12:44+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@panda-chi.io>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/fr/)"
+"\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.7.1\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
-msgstr ""
+msgstr "Désolé il n'y a pas de donnée matrice à afficher."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
@@ -31,11 +32,11 @@ msgstr ""
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
-msgstr ""
+msgstr "Somme"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
-#, fuzzy, python-format
+#, python-format
 msgid "Sum Total"
 msgstr "Total"

From 1037b1718725f666f705ce35d92481068e7fa71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Sun, 1 Sep 2019 15:02:30 +0000
Subject: [PATCH 77/95] Added translation using Weblate (Chinese (Simplified))

---
 web_widget_x2many_2d_matrix/i18n/zh_CN.po | 37 +++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/i18n/zh_CN.po

diff --git a/web_widget_x2many_2d_matrix/i18n/zh_CN.po b/web_widget_x2many_2d_matrix/i18n/zh_CN.po
new file mode 100644
index 000000000..dbe4c87cf
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/i18n/zh_CN.po
@@ -0,0 +1,37 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* web_widget_x2many_2d_matrix
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
+#, python-format
+msgid "Sorry no matrix data to display."
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:400
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
+#, python-format
+msgid "Sum"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix
+#. openerp-web
+#: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
+#, python-format
+msgid "Sum Total"
+msgstr ""

From a0ade02de175dee120533dcc0cd799c8cd7d278e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Sun, 1 Sep 2019 15:02:55 +0000
Subject: [PATCH 78/95] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (3 of 3 strings)

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/zh_CN/
---
 web_widget_x2many_2d_matrix/i18n/zh_CN.po | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/zh_CN.po b/web_widget_x2many_2d_matrix/i18n/zh_CN.po
index dbe4c87cf..783e9d43d 100644
--- a/web_widget_x2many_2d_matrix/i18n/zh_CN.po
+++ b/web_widget_x2many_2d_matrix/i18n/zh_CN.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2019-09-01 17:23+0000\n"
+"Last-Translator: 黎伟杰 <674416404@qq.com>\n"
 "Language-Team: none\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.8\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
-msgstr ""
+msgstr "抱歉没有要显示的矩阵数据。"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
@@ -27,11 +29,11 @@ msgstr ""
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
-msgstr ""
+msgstr "总和"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
 #, python-format
 msgid "Sum Total"
-msgstr ""
+msgstr "总和"

From 5a593d1452f1532258cd99151b29463c51454312 Mon Sep 17 00:00:00 2001
From: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>
Date: Mon, 2 Sep 2019 23:02:51 +0000
Subject: [PATCH 79/95] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (3 of 3 strings)

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/pt_BR/
---
 web_widget_x2many_2d_matrix/i18n/pt_BR.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/pt_BR.po b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
index d10b13853..86d0f57b3 100644
--- a/web_widget_x2many_2d_matrix/i18n/pt_BR.po
+++ b/web_widget_x2many_2d_matrix/i18n/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: web (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-03-11 02:18+0000\n"
-"PO-Revision-Date: 2018-08-03 13:20+0000\n"
+"PO-Revision-Date: 2019-09-03 01:23+0000\n"
 "Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/"
 "language/pt_BR/)\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.1.1\n"
+"X-Generator: Weblate 3.8\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
@@ -32,11 +32,11 @@ msgstr "Desculpe não há dados de matriz para exibir."
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
-msgstr ""
+msgstr "Soma"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
-#, fuzzy, python-format
+#, python-format
 msgid "Sum Total"
-msgstr "Total"
+msgstr "Soma Total"

From da4c0b0e107380ebfb59f24fab19367b41e5b10e Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Sun, 15 Sep 2019 05:58:52 +0200
Subject: [PATCH 80/95] [ADD] detect if used field type can be aggregated

fixes #1365
---
 .../static/src/js/widget_x2many_2d_matrix.js  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index bdaead56a..518e128fe 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -56,10 +56,23 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                         node[property];
                 }
             }
-            this.show_row_totals =
-                this.parse_boolean(node.show_row_totals || '1');
-            this.show_column_totals =
-                this.parse_boolean(node.show_column_totals || '1');
+            var field_defs = this.recordData[this.name].fields;
+            // TODO: raise when any of the fields above don't exist with a
+            // helpful error message
+            if (!field_defs[this.field_value]) {
+                throw new Error(_.str.sprintf(
+                    'You need to include %s in your view definition',
+                    this.field_value
+                ));
+            }
+            this.show_row_totals = this.parse_boolean(
+                node.show_row_totals ||
+                this.is_aggregatable(field_defs[this.field_value]) ? '1' : ''
+            );
+            this.show_column_totals = this.parse_boolean(
+                node.show_column_totals ||
+                this.is_aggregatable(field_defs[this.field_value]) ? '1' : ''
+            );
         },
 
         /**
@@ -149,6 +162,13 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             return row;
         },
 
+        /**
+         * Determine if a field represented by field_def can be aggregated
+         */
+        is_aggregatable: function (field_def) {
+            return field_def.type in {float: 1, monetary: 1, integer: 1};
+        },
+
         /**
          * Parse a String containing a bool and convert it to a JS bool.
          *

From 6e29bba1a9cb590f5c9122e486f36dc6031255ae Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Sep 2019 09:43:28 +0000
Subject: [PATCH 81/95] web_widget_x2many_2d_matrix 12.0.1.1.0

---
 web_widget_x2many_2d_matrix/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 775b6da74..2605ef405 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.0.4',
+    'version': '12.0.1.1.0',
     'author': (
         'Therp BV, '
         'Tecnativa, '

From 905a0b40fcda7aa52a9ad524ee5cc0f8c9b6b541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= <alexandre.diaz@tecnativa.com>
Date: Fri, 11 Oct 2019 20:05:27 +0200
Subject: [PATCH 82/95] [FIX] web_widget_x2many_2d_matrix: Forced render mode
 to list on small screens

---
 web_widget_x2many_2d_matrix/README.rst        |  1 +
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  1 +
 .../static/src/js/2d_matrix_view.js           | 23 +++++++++++++++++++
 web_widget_x2many_2d_matrix/views/assets.xml  |  1 +
 5 files changed, 27 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index c0693fcf4..40a403e7d 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -215,6 +215,7 @@ Contributors
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
+* Alexandre Díaz <alexandre.diaz@tecnativa.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
index f30eb3eb1..b6e65ac54 100644
--- a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
+++ b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
@@ -6,3 +6,4 @@
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
+* Alexandre Díaz <alexandre.diaz@tecnativa.com>
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index c964858dc..6847ca87b 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -575,6 +575,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt;</li>
 <li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
 <li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;brainbeanapps.com">alexey.pelykh&#64;brainbeanapps.com</a>&gt;</li>
+<li>Alexandre Díaz &lt;<a class="reference external" href="mailto:alexandre.diaz&#64;tecnativa.com">alexandre.diaz&#64;tecnativa.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
new file mode 100644
index 000000000..39b196590
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
@@ -0,0 +1,23 @@
+/* Copyright 2019 Alexandre Díaz
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
+
+odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixView', function (require) {
+    "use strict";
+
+    var BasicView = require('web.BasicView');
+
+    BasicView.include({
+        init: function (viewInfo) {
+            // Force mode='list'
+            var $arch = $(viewInfo.arch);
+            var selector = "field[widget='x2many_2d_matrix']";
+            $arch.find(selector).each(function (i, e) {
+                $(e).attr('mode', 'list');
+            });
+            viewInfo.arch = $arch.prop('outerHTML');
+
+            this._super.apply(this, arguments);
+        },
+    });
+
+});
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index b26566e55..80231c8c5 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -6,6 +6,7 @@
 
     <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
+            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />

From f011db5bdbbdff25a40b7b2bd21470044d2bf136 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 12 Oct 2019 22:44:16 +0000
Subject: [PATCH 83/95] web_widget_x2many_2d_matrix 12.0.2.0.0

---
 web_widget_x2many_2d_matrix/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 2605ef405..80d1a201f 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.1.1.0',
+    'version': '12.0.2.0.0',
     'author': (
         'Therp BV, '
         'Tecnativa, '

From faa7118959dddc046f1345939775b742c707c8d6 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Mon, 14 Oct 2019 15:01:59 +0200
Subject: [PATCH 84/95] Revert "[FIX] web_widget_x2many_2d_matrix: Forced
 render mode to list on small screens"

This reverts commit 10971ad68e5115e4f19093f1fc1833d8150e3a81.
---
 web_widget_x2many_2d_matrix/README.rst        |  1 -
 .../readme/CONTRIBUTORS.rst                   |  1 -
 .../static/description/index.html             |  1 -
 .../static/src/js/2d_matrix_view.js           | 23 -------------------
 web_widget_x2many_2d_matrix/views/assets.xml  |  1 -
 5 files changed, 27 deletions(-)
 delete mode 100644 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 40a403e7d..c0693fcf4 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -215,7 +215,6 @@ Contributors
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
-* Alexandre Díaz <alexandre.diaz@tecnativa.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
index b6e65ac54..f30eb3eb1 100644
--- a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
+++ b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
@@ -6,4 +6,3 @@
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
-* Alexandre Díaz <alexandre.diaz@tecnativa.com>
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index 6847ca87b..c964858dc 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -575,7 +575,6 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt;</li>
 <li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
 <li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;brainbeanapps.com">alexey.pelykh&#64;brainbeanapps.com</a>&gt;</li>
-<li>Alexandre Díaz &lt;<a class="reference external" href="mailto:alexandre.diaz&#64;tecnativa.com">alexandre.diaz&#64;tecnativa.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
deleted file mode 100644
index 39b196590..000000000
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 Alexandre Díaz
- * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
-
-odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixView', function (require) {
-    "use strict";
-
-    var BasicView = require('web.BasicView');
-
-    BasicView.include({
-        init: function (viewInfo) {
-            // Force mode='list'
-            var $arch = $(viewInfo.arch);
-            var selector = "field[widget='x2many_2d_matrix']";
-            $arch.find(selector).each(function (i, e) {
-                $(e).attr('mode', 'list');
-            });
-            viewInfo.arch = $arch.prop('outerHTML');
-
-            this._super.apply(this, arguments);
-        },
-    });
-
-});
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index 80231c8c5..b26566e55 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -6,7 +6,6 @@
 
     <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />

From 18f63e537c0f41128c26b7e302d115256392db00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= <alexandre.diaz@tecnativa.com>
Date: Mon, 14 Oct 2019 13:25:43 +0200
Subject: [PATCH 85/95] [FIX] web_widget_x2many_2d_matrix: Force render in list
 mode on mobile

---
 web_widget_x2many_2d_matrix/README.rst        |  2 ++
 .../readme/ROADMAP.rst                        |  2 ++
 .../static/description/index.html             |  1 +
 .../static/src/js/2d_matrix_view.js           | 23 +++++++++++++++++++
 web_widget_x2many_2d_matrix/views/assets.xml  |  1 +
 5 files changed, 29 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index c0693fcf4..0cedb55ca 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -168,6 +168,8 @@ Known issues / Roadmap
 
 * Support extra invisible fields inside each cell.
 
+* Support kanban mode. Current behaviour forces list mode.
+
 Changelog
 =========
 
diff --git a/web_widget_x2many_2d_matrix/readme/ROADMAP.rst b/web_widget_x2many_2d_matrix/readme/ROADMAP.rst
index b5c8e912a..1dc1a84da 100644
--- a/web_widget_x2many_2d_matrix/readme/ROADMAP.rst
+++ b/web_widget_x2many_2d_matrix/readme/ROADMAP.rst
@@ -12,3 +12,5 @@
   is merged.
 
 * Support extra invisible fields inside each cell.
+
+* Support kanban mode. Current behaviour forces list mode.
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index c964858dc..beac91d17 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -526,6 +526,7 @@ to click on m2o to open related records.</li>
 will enter into the 1st cell until <a class="reference external" href="https://github.com/odoo/odoo/pull/26490">https://github.com/odoo/odoo/pull/26490</a>
 is merged.</li>
 <li>Support extra invisible fields inside each cell.</li>
+<li>Support kanban mode. Current behaviour forces list mode.</li>
 </ul>
 </div>
 <div class="section" id="changelog">
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
new file mode 100644
index 000000000..b5f440d0e
--- /dev/null
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
@@ -0,0 +1,23 @@
+/* Copyright 2019 Alexandre Díaz
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
+
+odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixView', function (require) {
+    "use strict";
+
+    var BasicView = require('web.BasicView');
+
+    BasicView.include({
+        _processField: function (viewType, field, attrs) {
+            // Workaround for kanban mode rendering.
+            // Source of the issue: https://github.com/OCA/OCB/blob/12.0/addons/web/static/src/js/views/basic/basic_view.js#L303 .
+            // See https://github.com/OCA/web/pull/1404#pullrequestreview-305813206 .
+            //  In the long term we should a way to handle kanban mode
+            // better (eg: a specific renderer).
+            if (attrs.widget === 'x2many_2d_matrix') {
+                attrs.mode = 'tree';
+            }
+            return this._super(viewType, field, attrs);
+        },
+    });
+
+});
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index b26566e55..80231c8c5 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -6,6 +6,7 @@
 
     <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
+            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
             <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />

From 6d20bb2059821fbf0688e3cc079544a8fbc78d1d Mon Sep 17 00:00:00 2001
From: Bole <bole@dajmi5.com>
Date: Thu, 14 Nov 2019 07:44:42 +0000
Subject: [PATCH 86/95] Translated using Weblate (Croatian)

Currently translated at 100.0% (3 of 3 strings)

Translation: web-12.0/web-12.0-web_widget_x2many_2d_matrix
Translate-URL: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix/hr/
---
 web_widget_x2many_2d_matrix/i18n/hr.po | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/i18n/hr.po b/web_widget_x2many_2d_matrix/i18n/hr.po
index 27d4f36ee..214fbea23 100644
--- a/web_widget_x2many_2d_matrix/i18n/hr.po
+++ b/web_widget_x2many_2d_matrix/i18n/hr.po
@@ -9,23 +9,24 @@ msgstr ""
 "Project-Id-Version: web (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-25 00:51+0000\n"
-"PO-Revision-Date: 2016-08-19 11:47+0000\n"
-"Last-Translator: Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>\n"
+"PO-Revision-Date: 2019-11-14 10:34+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/oca/OCA-web-8-0/language/"
 "hr/)\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 3.8\n"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:65
 #, python-format
 msgid "Sorry no matrix data to display."
-msgstr ""
+msgstr "Oprostite, nema matrice podataka za prikaz."
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
@@ -33,11 +34,11 @@ msgstr ""
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:475
 #, python-format
 msgid "Sum"
-msgstr ""
+msgstr "Suma"
 
 #. module: web_widget_x2many_2d_matrix
 #. openerp-web
 #: code:addons/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js:394
-#, fuzzy, python-format
+#, python-format
 msgid "Sum Total"
 msgstr "Ukupno"

From 54faf1bd1b814280f6ca9495fb41495ad976eefc Mon Sep 17 00:00:00 2001
From: Pablo Fuentes <pablo@studio73.es>
Date: Fri, 22 Nov 2019 18:06:19 +0100
Subject: [PATCH 87/95] [FIX] web_widget_x2many_2d_matrix: Wrong widget

In previous versions _setSubViewLimit was defined at AbstractView widget but in v12 is defined at FormView widget
---
 .../js/abstract_view_matrix_limit_extend.js   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
index 5b24c457a..738ff7cec 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
@@ -1,17 +1,16 @@
 odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (require) {
-"use strict";
+    "use strict";
 
-        var AbstractView = require("web.AbstractView");
+    var FormView = require("web.FormView");
 
-        AbstractView.include({
-            // We extend this method so that the view is not limited to
-            // just 40 cells when the 'x2many_2d_matrix' widget is used.
-            _setSubViewLimit: function (attrs) {
-                this._super(attrs);
-                if (attrs.widget === "x2many_2d_matrix") {
-                    attrs.limit = Infinity;
-                }
-            },
-        });
-    }
-);
+    FormView.include({
+        // We extend this method so that the view is not limited to
+        // just 40 cells when the 'x2many_2d_matrix' widget is used.
+        _setSubViewLimit: function (attrs) {
+            this._super(attrs);
+            if (attrs.widget === "x2many_2d_matrix") {
+                attrs.limit = Infinity;
+            }
+        },
+    });
+});

From f917f2522fb543639e29e2f494b6cdceed70ca29 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 25 Nov 2019 09:49:56 +0000
Subject: [PATCH 88/95] web_widget_x2many_2d_matrix 12.0.2.0.1

---
 web_widget_x2many_2d_matrix/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 80d1a201f..6b89cf8a3 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.0.1',
     'author': (
         'Therp BV, '
         'Tecnativa, '

From 1848c59a93f7ea6cef28e1bb0268da1a66abd334 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 9 Dec 2019 20:14:24 +0000
Subject: [PATCH 89/95] web_widget_x2many_2d_matrix 12.0.2.1.0

---
 web_widget_x2many_2d_matrix/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 6b89cf8a3..c124106e2 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.2.0.1',
+    'version': '12.0.2.1.0',
     'author': (
         'Therp BV, '
         'Tecnativa, '

From ded7922ca00495cf5bae3e7bce9ade29008b6403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= <alexandre.diaz@tecnativa.com>
Date: Wed, 11 Dec 2019 16:23:56 +0100
Subject: [PATCH 90/95] [IMP] web_widget_x2many_matrix: Sticky header, footer
 rows and main, totals columns

---
 .../src/scss/web_widget_x2many_2d_matrix.scss | 74 ++++++++++++++++---
 1 file changed, 65 insertions(+), 9 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
index 25382f5d1..38f826c46 100644
--- a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
+++ b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
@@ -1,14 +1,70 @@
-.o_field_x2many_2d_matrix .row-total {
-    font-weight: bold;
-}
+$x2many_2d_matrix_max_height: 450px;
 
-.o_form_view .o_x2many_2d_matrix.o_list_view {
-    thead > tr > th {
-        // Respect newline characters
-        white-space: pre-line;
+.o_form_view .o_field_x2many_2d_matrix {
+    .table-responsive {
+        max-height: $x2many_2d_matrix_max_height;
+        overflow-y: auto;
     }
 
-    > tfoot > tr > td {
-        padding: 0.75rem;
+    .o_x2many_2d_matrix.o_list_view {
+        > thead > tr > th {
+            white-space: pre-line;
+            position: sticky;
+            top: 0;
+            z-index: 1;
+            background-color: $o-list-footer-bg-color;
+
+            &.total {
+                right: 0;
+            }
+        }
+
+        > tbody {
+            > tr {
+                &:nth-of-type(2n+1) td.row-total, &:nth-of-type(2n+1) td:first-child {
+                    background-color: mix(#000, #fff, 1%);
+                }
+                &:nth-of-type(2n) td.row-total, &:nth-of-type(2n) td:first-child {
+                    background-color: white;
+                }
+
+                > td {
+                    text-align: left;
+
+                    &:first-child {
+                        position: sticky;
+                        left: 0;
+                        border-right-width: 1px;
+                        border-right-color: $gray-300;
+                        border-right-style: solid;
+                        box-shadow: -1px 5px 10px $gray-300;
+                    }
+                    &.row-total {
+                        font-weight: bold;
+                        position: sticky;
+                        right: 0;
+                        border-left-width: 1px;
+                        border-left-color: $gray-300;
+                        border-left-style: solid;
+                        box-shadow: -1px 5px 10px $gray-300;
+                    }
+                }
+            }
+        }
+
+        > tfoot > tr > td {
+            padding: 0.75rem;
+            text-align: left;
+            background-color: $o-list-footer-bg-color;
+            position: sticky;
+            bottom: 0;
+
+            &.col-total {
+                right: 0;
+                border-left-width: 1px;
+                border-left-color: $gray-300;
+                border-left-style: solid;
+            }
+        }
     }
 }

From b2155425cc0f98d1c81b5e23c91ed6342e806879 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 11 Dec 2019 15:56:19 +0000
Subject: [PATCH 91/95] web_widget_x2many_2d_matrix 12.0.2.2.0

---
 web_widget_x2many_2d_matrix/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index c124106e2..022ae6565 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': '2D matrix for x2many fields',
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.2.0',
     'author': (
         'Therp BV, '
         'Tecnativa, '

From 333a67ca13fa68b4735ba316c3a23ecc4a736a9b Mon Sep 17 00:00:00 2001
From: Pablo Fuentes <pablo@studio73.es>
Date: Tue, 28 Jan 2020 15:09:01 +0100
Subject: [PATCH 92/95] [FIX] web_widget_x2many_2d_matrix: Ensure lines order

As objects are unordered collections of properties, we ensure incoming lines order by using lists
---
 .../static/src/js/widget_x2many_2d_matrix.js  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 518e128fe..3e7140704 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -34,8 +34,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          */
         init_params: function () {
             var node = this.attrs;
-            this.by_x_axis = {};
             this.by_y_axis = {};
+            this.x_axis = [];
+            this.y_axis = [];
             this.field_x_axis = node.field_x_axis || this.field_x_axis;
             this.field_y_axis = node.field_y_axis || this.field_y_axis;
             this.field_label_x_axis =
@@ -84,8 +85,9 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         init_matrix: function () {
             var records = this.recordData[this.name].data;
             // Wipe the content if something still exists
-            this.by_x_axis = {};
             this.by_y_axis = {};
+            this.x_axis = [];
+            this.y_axis = [];
             _.each(records, function (record) {
                 var x = record.data[this.field_x_axis],
                     y = record.data[this.field_y_axis];
@@ -97,18 +99,22 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                     // We have a related record
                     y = y.data.display_name;
                 }
-                this.by_x_axis[x] = this.by_x_axis[x] || {};
                 this.by_y_axis[y] = this.by_y_axis[y] || {};
-                this.by_x_axis[x][y] = record;
                 this.by_y_axis[y][x] = record;
+                if (this.y_axis.indexOf(y) === -1) {
+                    this.y_axis.push(y);
+                }
+                if (this.x_axis.indexOf(x) === -1) {
+                    this.x_axis.push(x);
+                }
             }.bind(this));
             // Init columns
             this.columns = [];
-            $.each(this.by_x_axis, function (x) {
+            _.each(this.x_axis, function (x) {
                 this.columns.push(this._make_column(x));
             }.bind(this));
             this.rows = [];
-            $.each(this.by_y_axis, function (y) {
+            _.each(this.y_axis, function (y) {
                 this.rows.push(this._make_row(y));
             }.bind(this));
             this.matrix_data = {
@@ -156,7 +162,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
                 },
                 'data': [],
             };
-            $.each(self.by_x_axis, function (x) {
+            _.each(self.x_axis, function (x) {
                 row.data.push(self.by_y_axis[y][x]);
             });
             return row;

From 9bd27d63b0610aad9f75d24cf5f7066757b82ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= <adria.gil@forgeflow.com>
Date: Fri, 14 Feb 2020 10:02:14 +0100
Subject: [PATCH 93/95] [IMP] web_widget_x2many_2d_matrix: black, isort

---
 web_widget_x2many_2d_matrix/__manifest__.py   |  34 +-
 .../static/src/js/2d_matrix_renderer.js       | 292 +++++++++---------
 .../static/src/js/2d_matrix_view.js           |  11 +-
 .../js/abstract_view_matrix_limit_extend.js   |   4 +-
 .../static/src/js/widget_x2many_2d_matrix.js  | 170 +++++-----
 .../src/scss/web_widget_x2many_2d_matrix.scss |   6 +-
 web_widget_x2many_2d_matrix/views/assets.xml  |  35 ++-
 .../views/x2m_demo.xml                        |  68 ++++
 .../wizard/x2m_matrix.xml                     |  72 +++++
 9 files changed, 428 insertions(+), 264 deletions(-)
 create mode 100644 web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
 create mode 100644 web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml

diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index 022ae6565..a898754d7 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -3,24 +3,20 @@
 # Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    'name': '2D matrix for x2many fields',
-    'version': '12.0.2.2.0',
-    'author': (
-        'Therp BV, '
-        'Tecnativa, '
-        'Camptocamp, '
-        'Brainbean Apps, '
-        'Odoo Community Association (OCA)'
+    "name": "2D matrix for x2many fields",
+    "version": "12.0.2.2.0",
+    "author": (
+        "Therp BV, "
+        "Tecnativa, "
+        "Camptocamp, "
+        "Brainbean Apps, "
+        "Odoo Community Association (OCA)"
     ),
-    'website': 'https://github.com/OCA/web',
-    'license': 'AGPL-3',
-    'category': 'Hidden/Dependency',
-    'summary': 'Show list fields as a matrix',
-    'depends': [
-        'web',
-    ],
-    'data': [
-        'views/assets.xml',
-    ],
-    'installable': True,
+    "website": "https://github.com/OCA/web",
+    "license": "AGPL-3",
+    "category": "Hidden/Dependency",
+    "summary": "Show list fields as a matrix",
+    "depends": ["web",],
+    "data": ["views/assets.xml",],
+    "installable": True,
 }
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 187550f6c..7b7fb0a8e 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -2,30 +2,29 @@
  * Copyright 2018 Brainbean Apps
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
-odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (require) {
+odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(require) {
     "use strict";
 
-    var BasicRenderer = require('web.BasicRenderer');
-    var config = require('web.config');
-    var core = require('web.core');
-    var field_utils = require('web.field_utils');
+    var BasicRenderer = require("web.BasicRenderer");
+    var config = require("web.config");
+    var core = require("web.core");
+    var field_utils = require("web.field_utils");
     var _t = core._t;
-    
+
     var FIELD_CLASSES = {
-        float: 'o_list_number',
-        integer: 'o_list_number',
-        monetary: 'o_list_number',
-        text: 'o_list_text',
+        float: "o_list_number",
+        integer: "o_list_number",
+        monetary: "o_list_number",
+        text: "o_list_text",
     };
 
     // X2Many2dMatrixRenderer is heavily inspired by Odoo's ListRenderer
     // and is reusing portions of code from list_renderer.js
     var X2Many2dMatrixRenderer = BasicRenderer.extend({
-
         /**
          * @override
          */
-        init: function (parent, state, params) {
+        init: function(parent, state, params) {
             this._super.apply(this, arguments);
             this.editable = params.editable;
             this._saveMatrixData(params.matrix_data);
@@ -36,7 +35,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @param {Object} matrixData Contains the matrix data
          */
-        _saveMatrixData: function (matrixData) {
+        _saveMatrixData: function(matrixData) {
             this.columns = matrixData.columns;
             this.rows = matrixData.rows;
             this.matrix_data = matrixData;
@@ -52,35 +51,29 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {Deferred} this deferred is resolved immediately
          */
-        _renderView: function () {
+        _renderView: function() {
             var self = this;
 
-            this.$el
-                .removeClass('table-responsive')
-                .empty();
+            this.$el.removeClass("table-responsive").empty();
 
             // Display a nice message if there's no data to display
             if (!self.rows.length) {
-                var $alert = $('<div>', {'class': 'alert alert-info'});
-                $alert.text(_t('Sorry no matrix data to display.'));
+                var $alert = $("<div>", {class: "alert alert-info"});
+                $alert.text(_t("Sorry no matrix data to display."));
                 this.$el.append($alert);
                 return this._super();
             }
 
-            var $table = $('<table>').addClass(
-                'o_list_view table table-condensed table-striped ' +
-                'o_x2many_2d_matrix '
+            var $table = $("<table>").addClass(
+                "o_list_view table table-condensed table-striped " +
+                    "o_x2many_2d_matrix "
             );
-            this.$el
-                .addClass('table-responsive')
-                .append($table);
+            this.$el.addClass("table-responsive").append($table);
 
             this._computeColumnAggregates();
             this._computeRowAggregates();
 
-            $table
-                .append(this._renderHeader())
-                .append(this._renderBody());
+            $table.append(this._renderHeader()).append(this._renderBody());
             if (self.matrix_data.show_column_totals) {
                 $table.append(this._renderFooter());
             }
@@ -96,10 +89,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {jQueryElement} The table body element just filled.
          */
-        _renderBody: function () {
-            var $body = $('<tbody>').append(this._renderRows());
-            _.each($body.find('input'), function (td, i) {
-                $(td).attr('tabindex', i);
+        _renderBody: function() {
+            var $body = $("<tbody>").append(this._renderRows());
+            _.each($body.find("input"), function(td, i) {
+                $(td).attr("tabindex", i);
             });
             return $body;
         },
@@ -111,16 +104,13 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {jQueryElement} The thead element that was inserted into.
          */
-        _renderHeader: function () {
-            var $tr = $('<tr>').append('<th/>');
-            $tr = $tr.append(_.map(
-                this.columns,
-                this._renderHeaderCell.bind(this)
-            ));
+        _renderHeader: function() {
+            var $tr = $("<tr>").append("<th/>");
+            $tr = $tr.append(_.map(this.columns, this._renderHeaderCell.bind(this)));
             if (this.matrix_data.show_row_totals) {
-                $tr.append($('<th/>', {class: 'total'}));
+                $tr.append($("<th/>", {class: "total"}));
             }
-            return $('<thead>').append($tr);
+            return $("<thead>").append($tr);
         },
 
         /**
@@ -132,30 +122,31 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {jQueryElement} node
          * @returns {jQueryElement} the created <th> node.
          */
-        _renderHeaderCell: function (node) {
+        _renderHeaderCell: function(node) {
             var name = node.attrs.name;
             var field = this.state.fields[name];
-            var $th = $('<th>');
+            var $th = $("<th>");
             if (!field) {
                 return $th;
             }
             var description = null;
             if (node.attrs.widget) {
-                description = this.state.fieldsInfo.list[name]
-                    .Widget.prototype.description;
+                description = this.state.fieldsInfo.list[name].Widget.prototype
+                    .description;
             }
             if (_.isNull(description)) {
                 description = node.attrs.string || field.string;
             }
-            $th.text(description).data('name', name);
+            $th.text(description).data("name", name);
 
             if (
-                field.type === 'float' || field.type === 'integer' ||
-                field.type === 'monetary'
+                field.type === "float" ||
+                field.type === "integer" ||
+                field.type === "monetary"
             ) {
-                $th.addClass('text-right');
+                $th.addClass("text-right");
             } else {
-                $th.addClass('text-center');
+                $th.addClass("text-center");
             }
 
             if (config.debug) {
@@ -177,11 +168,14 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {String} a string with the generated html.
          */
-        _renderRows: function () {
-            return _.map(this.rows, function (row) {
-                row.attrs.name = this.matrix_data.field_value;
-                return this._renderRow(row);
-            }.bind(this));
+        _renderRows: function() {
+            return _.map(
+                this.rows,
+                function(row) {
+                    row.attrs.name = this.matrix_data.field_value;
+                    return this._renderRow(row);
+                }.bind(this)
+            );
         },
 
         /**
@@ -194,16 +188,19 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {Object} row The row that will be rendered.
          * @returns {jQueryElement} the <tr> element that has been rendered.
          */
-        _renderRow: function (row) {
-            var $tr = $('<tr/>', {class: 'o_data_row'}),
+        _renderRow: function(row) {
+            var $tr = $("<tr/>", {class: "o_data_row"}),
                 _data = _.without(row.data, undefined);
             $tr = $tr.append(this._renderLabelCell(_data[0]));
-            var $cells = _.map(this.columns, function (column, index) {
-                var record = row.data[index];
-                // Make the widget use our field value for each cell
-                column.attrs.name = this.matrix_data.field_value;
-                return this._renderBodyCell(record, column, index, {mode:''});
-            }.bind(this));
+            var $cells = _.map(
+                this.columns,
+                function(column, index) {
+                    var record = row.data[index];
+                    // Make the widget use our field value for each cell
+                    column.attrs.name = this.matrix_data.field_value;
+                    return this._renderBodyCell(record, column, index, {mode: ""});
+                }.bind(this)
+            );
             $tr = $tr.append($cells);
             if (row.aggregate) {
                 $tr.append(this._renderAggregateRowCell(row));
@@ -218,10 +215,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {Object} record Contains the information about the record.
          * @returns {jQueryElement} the cell that was rendered.
          */
-        _renderLabelCell: function (record) {
-            var $td = $('<td>');
+        _renderLabelCell: function(record) {
+            var $td = $("<td>");
             var value = record.data[this.matrix_data.field_y_axis];
-            if (value.type === 'record') {
+            if (value.type === "record") {
                 // We have a related record
                 value = value.data.display_name;
             }
@@ -237,8 +234,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {Object} row the row object to aggregate.
          * @returns {jQueryElement} The rendered cell.
          */
-        _renderAggregateRowCell: function (row) {
-            var $cell = $('<td/>', {class: 'row-total'});
+        _renderAggregateRowCell: function(row) {
+            var $cell = $("<td/>", {class: "row-total"});
             this.applyAggregateValue($cell, row);
             return $cell;
         },
@@ -255,25 +252,23 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {Object} options The obtions used for the widget
          * @returns {jQueryElement} the rendered cell.
          */
-        _renderBodyCell: function (record, node, colIndex, options) {
-            var tdClassName = 'o_data_cell';
-            if (node.tag === 'field') {
-                var typeClass = FIELD_CLASSES[
-                    this.state.fields[node.attrs.name].type
-                ];
+        _renderBodyCell: function(record, node, colIndex, options) {
+            var tdClassName = "o_data_cell";
+            if (node.tag === "field") {
+                var typeClass = FIELD_CLASSES[this.state.fields[node.attrs.name].type];
                 if (typeClass) {
-                    tdClassName += ' ' + typeClass;
+                    tdClassName += " " + typeClass;
                 }
                 if (node.attrs.widget) {
-                    tdClassName += ' o_' + node.attrs.widget + '_cell';
+                    tdClassName += " o_" + node.attrs.widget + "_cell";
                 }
             }
 
             // TODO roadmap: here we should collect possible extra params
             // the user might want to attach to each single cell.
 
-            var $td = $('<td>', {
-                'class': tdClassName,
+            var $td = $("<td>", {
+                class: tdClassName,
             });
 
             if (_.isUndefined(record)) {
@@ -281,8 +276,8 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return $td;
             }
             $td.attr({
-                'data-form-id': record.id,
-                'data-id': record.data.id,
+                "data-form-id": record.id,
+                "data-id": record.data.id,
             });
 
             // We register modifiers on the <td> element so that it gets
@@ -291,7 +286,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 node,
                 record,
                 $td,
-                _.pick(options, 'mode')
+                _.pick(options, "mode")
             );
             // If the invisible modifiers is true, the <td> element is
             // left empty. Indeed, if the modifiers was to change the
@@ -303,10 +298,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
             // Enforce mode of the parent
             options.mode = this.getParent().mode;
 
-            if (node.tag === 'widget') {
+            if (node.tag === "widget") {
                 return $td.append(this._renderWidget(record, node));
             }
-            var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
+            var $el = this._renderFieldWidget(node, record, _.pick(options, "mode"));
             this._handleAttributes($el, node);
             return $td.append($el);
         },
@@ -317,15 +312,17 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {jQueryElement} The footer element with the cells in it.
          */
-        _renderFooter: function () {
+        _renderFooter: function() {
             var $cells = this._renderAggregateColCells();
             if ($cells) {
-                var $tr = $('<tr>').append('<td/>').append($cells);
+                var $tr = $("<tr>")
+                    .append("<td/>")
+                    .append($cells);
                 var $total_cell = this._renderTotalCell();
                 if ($total_cell) {
                     $tr.append($total_cell);
                 }
-                return $('<tfoot>').append($tr);
+                return $("<tfoot>").append($tr);
             }
         },
 
@@ -335,13 +332,15 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {jQueryElement} The td element with the total in it.
          */
-        _renderTotalCell: function () {
-            if (!this.matrix_data.show_column_totals ||
-                !this.matrix_data.show_row_totals) {
+        _renderTotalCell: function() {
+            if (
+                !this.matrix_data.show_column_totals ||
+                !this.matrix_data.show_row_totals
+            ) {
                 return;
             }
 
-            var $cell = $('<td>', {class: 'col-total'});
+            var $cell = $("<td>", {class: "col-total"});
             this.applyAggregateValue($cell, this.total);
             return $cell;
         },
@@ -352,16 +351,16 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @returns {List} the rendered cells
          */
-        _renderAggregateColCells: function () {
+        _renderAggregateColCells: function() {
             var self = this;
 
-            return _.map(this.columns, function (column) {
-                var $cell = $('<td>');
+            return _.map(this.columns, function(column) {
+                var $cell = $("<td>");
                 if (config.debug) {
                     $cell.addClass(column.attrs.name);
                 }
                 if (column.aggregate) {
-                    self.applyAggregateValue($cell, column)
+                    self.applyAggregateValue($cell, column);
                 }
                 return $cell;
             });
@@ -373,7 +372,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @private
          */
-        _computeColumnAggregates: function () {
+        _computeColumnAggregates: function() {
             if (!this.matrix_data.show_column_totals) {
                 return;
             }
@@ -383,7 +382,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
             var type = field.type;
-            if (!~['integer', 'float', 'monetary'].indexOf(type)) {
+            if (!~["integer", "float", "monetary"].indexOf(type)) {
                 return;
             }
             this.total = {
@@ -391,31 +390,34 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                     name: fname,
                 },
                 aggregate: {
-                    help: _t('Sum Total'),
+                    help: _t("Sum Total"),
                     value: 0,
                 },
             };
-            _.each(this.columns, function (column, index) {
-                column.aggregate = {
-                    help: _t('Sum'),
-                    value: 0,
-                };
-                _.each(this.rows, function (row) {
-                    // TODO Use only one _.propertyOf in underscore 1.9.0+
-                    try {
-                        column.aggregate.value += row.data[index].data[fname];
-                    } catch (error) {
-                        // Nothing to do
-                    }
-                });
-                this.total.aggregate.value += column.aggregate.value;
-            }.bind(this));
+            _.each(
+                this.columns,
+                function(column, index) {
+                    column.aggregate = {
+                        help: _t("Sum"),
+                        value: 0,
+                    };
+                    _.each(this.rows, function(row) {
+                        // TODO Use only one _.propertyOf in underscore 1.9.0+
+                        try {
+                            column.aggregate.value += row.data[index].data[fname];
+                        } catch (error) {
+                            // Nothing to do
+                        }
+                    });
+                    this.total.aggregate.value += column.aggregate.value;
+                }.bind(this)
+            );
         },
 
         /**
          * @override
          */
-        updateState: function (state, params) {
+        updateState: function(state, params) {
             if (params.matrix_data) {
                 this._saveMatrixData(params.matrix_data);
             }
@@ -423,13 +425,13 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
         },
 
         /**
-        * Traverse the fields matrix with the keyboard
-        *
-        * @override
-        * @private
-        * @param {OdooEvent} event "navigation_move" event
-        */
-        _onNavigationMove: function (event) {
+         * Traverse the fields matrix with the keyboard
+         *
+         * @override
+         * @private
+         * @param {OdooEvent} event "navigation_move" event
+         */
+        _onNavigationMove: function(event) {
             var widgets = this.__parentedChildren,
                 index = widgets.indexOf(event.target),
                 first = index === 0,
@@ -457,7 +459,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @private
          */
-        _computeRowAggregates: function () {
+        _computeRowAggregates: function() {
             if (!this.matrix_data.show_row_totals) {
                 return;
             }
@@ -467,15 +469,15 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
                 return;
             }
             var type = field.type;
-            if (!~['integer', 'float', 'monetary'].indexOf(type)) {
+            if (!~["integer", "float", "monetary"].indexOf(type)) {
                 return;
             }
-            _.each(this.rows, function (row) {
+            _.each(this.rows, function(row) {
                 row.aggregate = {
-                    help: _t('Sum'),
+                    help: _t("Sum"),
                     value: 0,
                 };
-                _.each(row.data, function (col) {
+                _.each(row.data, function(col) {
                     // TODO Use _.property in underscore 1.9+
                     try {
                         row.aggregate.value += col.data[fname];
@@ -497,16 +499,18 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @param {Object} axis
          * The object which contains the information about the aggregate value axis
          */
-        applyAggregateValue: function ($cell, axis) {
+        applyAggregateValue: function($cell, axis) {
             var field = this.state.fields[axis.attrs.name];
             var value = axis.aggregate.value;
             var help = axis.aggregate.help;
             var fieldInfo = this.state.fieldsInfo.list[axis.attrs.name];
-            var formatFunc = field_utils.format[
-                fieldInfo.widget ? fieldInfo.widget : field.type
-            ];
-            var formattedValue = formatFunc(value, field, { escape: true });
-            $cell.addClass('o_list_number').attr('title', help).html(formattedValue);
+            var formatFunc =
+                field_utils.format[fieldInfo.widget ? fieldInfo.widget : field.type];
+            var formattedValue = formatFunc(value, field, {escape: true});
+            $cell
+                .addClass("o_list_number")
+                .attr("title", help)
+                .html(formattedValue);
         },
 
         /**
@@ -528,10 +532,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @returns {Deferred}
          * The deferred object thats gonna be resolved when the change is made.
          */
-        confirmUpdate: function (state, id, fields, ev) {
+        confirmUpdate: function(state, id, fields, ev) {
             var self = this;
             this.state = state;
-            return this.confirmChange(state, id, fields, ev).then(function () {
+            return this.confirmChange(state, id, fields, ev).then(function() {
                 self._refresh(id);
             });
         },
@@ -542,7 +546,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          * @private
          * @param {String} id Datapoint ID
          */
-        _refresh: function (id) {
+        _refresh: function(id) {
             this._updateRow(id);
             this._refreshColTotals();
             this._refreshRowTotals();
@@ -553,11 +557,11 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @param {String} id: The id of the row that needs to be updated.
          */
-        _updateRow: function (id) {
+        _updateRow: function(id) {
             var record = _.findWhere(this.state.data, {id: id}),
                 _id = _.property("id");
-            _.each(this.rows, function (row) {
-                _.each(row.data, function (col, i) {
+            _.each(this.rows, function(row) {
+                _.each(row.data, function(col, i) {
                     if (_id(col) === id) {
                         row.data[i] = record;
                     }
@@ -568,21 +572,22 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
         /**
          * Update the row total.
          */
-        _refreshColTotals: function () {
+        _refreshColTotals: function() {
             this._computeColumnAggregates();
-            this.$('tfoot').replaceWith(this._renderFooter());
+            this.$("tfoot").replaceWith(this._renderFooter());
         },
 
         /**
          * Update the column total.
          */
-        _refreshRowTotals: function () {
+        _refreshRowTotals: function() {
             var self = this;
             this._computeRowAggregates();
-            var $rows = self.$el.find('tr.o_data_row');
-            _.each(self.rows, function (row, i) {
+            var $rows = self.$el.find("tr.o_data_row");
+            _.each(self.rows, function(row, i) {
                 if (row.aggregate) {
-                    $($rows[i]).find('.row-total')
+                    $($rows[i])
+                        .find(".row-total")
                         .replaceWith(self._renderAggregateRowCell(row));
                 }
             });
@@ -593,10 +598,9 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
          *
          * @returns {null}
          */
-        getEditableRecordID: function () {
+        getEditableRecordID: function() {
             return null;
         },
-
     });
 
     return X2Many2dMatrixRenderer;
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
index b5f440d0e..dd3dadbbd 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js
@@ -1,23 +1,22 @@
 /* Copyright 2019 Alexandre Díaz
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
-odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixView', function (require) {
+odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixView", function(require) {
     "use strict";
 
-    var BasicView = require('web.BasicView');
+    var BasicView = require("web.BasicView");
 
     BasicView.include({
-        _processField: function (viewType, field, attrs) {
+        _processField: function(viewType, field, attrs) {
             // Workaround for kanban mode rendering.
             // Source of the issue: https://github.com/OCA/OCB/blob/12.0/addons/web/static/src/js/views/basic/basic_view.js#L303 .
             // See https://github.com/OCA/web/pull/1404#pullrequestreview-305813206 .
             //  In the long term we should a way to handle kanban mode
             // better (eg: a specific renderer).
-            if (attrs.widget === 'x2many_2d_matrix') {
-                attrs.mode = 'tree';
+            if (attrs.widget === "x2many_2d_matrix") {
+                attrs.mode = "tree";
             }
             return this._super(viewType, field, attrs);
         },
     });
-
 });
diff --git a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
index 738ff7cec..6ef957777 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
@@ -1,4 +1,4 @@
-odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (require) {
+odoo.define("web_widget_x2many_2d_matrix.matrix_limit_extend", function(require) {
     "use strict";
 
     var FormView = require("web.FormView");
@@ -6,7 +6,7 @@ odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (requir
     FormView.include({
         // We extend this method so that the view is not limited to
         // just 40 cells when the 'x2many_2d_matrix' widget is used.
-        _setSubViewLimit: function (attrs) {
+        _setSubViewLimit: function(attrs) {
             this._super(attrs);
             if (attrs.widget === "x2many_2d_matrix") {
                 attrs.limit = Infinity;
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index 3e7140704..f856de14a 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -3,17 +3,15 @@
  * Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
-odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
+odoo.define("web_widget_x2many_2d_matrix.widget", function(require) {
     "use strict";
 
-    var field_registry = require('web.field_registry');
-    var relational_fields = require('web.relational_fields');
-    var X2Many2dMatrixRenderer = require(
-        'web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer'
-    );
+    var field_registry = require("web.field_registry");
+    var relational_fields = require("web.relational_fields");
+    var X2Many2dMatrixRenderer = require("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer");
 
     var WidgetX2Many2dMatrix = relational_fields.FieldOne2Many.extend({
-        widget_class: 'o_form_field_x2many_2d_matrix',
+        widget_class: "o_form_field_x2many_2d_matrix",
 
         /**
          * Initialize the widget & parameters.
@@ -23,7 +21,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * @param {Object} record information about the database records.
          * @param {Object} options view options.
          */
-        init: function (parent, name, record, options) {
+        init: function(parent, name, record, options) {
             this._super(parent, name, record, options);
             this.init_params();
         },
@@ -32,47 +30,46 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * Initialize the widget specific parameters.
          * Sets the axis and the values.
          */
-        init_params: function () {
+        init_params: function() {
             var node = this.attrs;
             this.by_y_axis = {};
             this.x_axis = [];
             this.y_axis = [];
             this.field_x_axis = node.field_x_axis || this.field_x_axis;
             this.field_y_axis = node.field_y_axis || this.field_y_axis;
-            this.field_label_x_axis =
-                node.field_label_x_axis || this.field_x_axis;
-            this.field_label_y_axis =
-                node.field_label_y_axis || this.field_y_axis;
-            this.x_axis_clickable = this.parse_boolean(
-                node.x_axis_clickable || '1'
-            );
-            this.y_axis_clickable = this.parse_boolean(
-                node.y_axis_clickable || '1'
-            );
+            this.field_label_x_axis = node.field_label_x_axis || this.field_x_axis;
+            this.field_label_y_axis = node.field_label_y_axis || this.field_y_axis;
+            this.x_axis_clickable = this.parse_boolean(node.x_axis_clickable || "1");
+            this.y_axis_clickable = this.parse_boolean(node.y_axis_clickable || "1");
             this.field_value = node.field_value || this.field_value;
             // TODO: is this really needed? Holger?
             for (var property in node) {
                 if (property.startsWith("field_att_")) {
-                    this.fields_att[property.substring(10)] =
-                        node[property];
+                    this.fields_att[property.substring(10)] = node[property];
                 }
             }
             var field_defs = this.recordData[this.name].fields;
             // TODO: raise when any of the fields above don't exist with a
             // helpful error message
             if (!field_defs[this.field_value]) {
-                throw new Error(_.str.sprintf(
-                    'You need to include %s in your view definition',
-                    this.field_value
-                ));
+                throw new Error(
+                    _.str.sprintf(
+                        "You need to include %s in your view definition",
+                        this.field_value
+                    )
+                );
             }
             this.show_row_totals = this.parse_boolean(
                 node.show_row_totals ||
-                this.is_aggregatable(field_defs[this.field_value]) ? '1' : ''
+                    this.is_aggregatable(field_defs[this.field_value])
+                    ? "1"
+                    : ""
             );
             this.show_column_totals = this.parse_boolean(
                 node.show_column_totals ||
-                this.is_aggregatable(field_defs[this.field_value]) ? '1' : ''
+                    this.is_aggregatable(field_defs[this.field_value])
+                    ? "1"
+                    : ""
             );
         },
 
@@ -82,49 +79,58 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * Puts the values in the grid.
          * If we have related items we use the display name.
          */
-        init_matrix: function () {
+        init_matrix: function() {
             var records = this.recordData[this.name].data;
             // Wipe the content if something still exists
             this.by_y_axis = {};
             this.x_axis = [];
             this.y_axis = [];
-            _.each(records, function (record) {
-                var x = record.data[this.field_x_axis],
-                    y = record.data[this.field_y_axis];
-                if (x.type === 'record') {
-                    // We have a related record
-                    x = x.data.display_name;
-                }
-                if (y.type === 'record') {
-                    // We have a related record
-                    y = y.data.display_name;
-                }
-                this.by_y_axis[y] = this.by_y_axis[y] || {};
-                this.by_y_axis[y][x] = record;
-                if (this.y_axis.indexOf(y) === -1) {
-                    this.y_axis.push(y);
-                }
-                if (this.x_axis.indexOf(x) === -1) {
-                    this.x_axis.push(x);
-                }
-            }.bind(this));
+            _.each(
+                records,
+                function(record) {
+                    var x = record.data[this.field_x_axis],
+                        y = record.data[this.field_y_axis];
+                    if (x.type === "record") {
+                        // We have a related record
+                        x = x.data.display_name;
+                    }
+                    if (y.type === "record") {
+                        // We have a related record
+                        y = y.data.display_name;
+                    }
+                    this.by_y_axis[y] = this.by_y_axis[y] || {};
+                    this.by_y_axis[y][x] = record;
+                    if (this.y_axis.indexOf(y) === -1) {
+                        this.y_axis.push(y);
+                    }
+                    if (this.x_axis.indexOf(x) === -1) {
+                        this.x_axis.push(x);
+                    }
+                }.bind(this)
+            );
             // Init columns
             this.columns = [];
-            _.each(this.x_axis, function (x) {
-                this.columns.push(this._make_column(x));
-            }.bind(this));
+            _.each(
+                this.x_axis,
+                function(x) {
+                    this.columns.push(this._make_column(x));
+                }.bind(this)
+            );
             this.rows = [];
-            _.each(this.y_axis, function (y) {
-                this.rows.push(this._make_row(y));
-            }.bind(this));
+            _.each(
+                this.y_axis,
+                function(y) {
+                    this.rows.push(this._make_row(y));
+                }.bind(this)
+            );
             this.matrix_data = {
-                'field_value': this.field_value,
-                'field_x_axis': this.field_x_axis,
-                'field_y_axis': this.field_y_axis,
-                'columns': this.columns,
-                'rows': this.rows,
-                'show_row_totals': this.show_row_totals,
-                'show_column_totals': this.show_column_totals,
+                field_value: this.field_value,
+                field_x_axis: this.field_x_axis,
+                field_y_axis: this.field_y_axis,
+                columns: this.columns,
+                rows: this.rows,
+                show_row_totals: this.show_row_totals,
+                show_column_totals: this.show_column_totals,
             };
         },
 
@@ -134,13 +140,13 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * @param {String} x The string used as a column title
          * @returns {Object}
          */
-        _make_column: function (x) {
+        _make_column: function(x) {
             return {
                 // Simulate node parsed on xml arch
-                'tag': 'field',
-                'attrs': {
-                    'name': this.field_x_axis,
-                    'string': x,
+                tag: "field",
+                attrs: {
+                    name: this.field_x_axis,
+                    string: x,
                 },
             };
         },
@@ -151,18 +157,18 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * @param {String} y The string used as a row title
          * @returns {Object}
          */
-        _make_row: function (y) {
+        _make_row: function(y) {
             var self = this;
             // Use object so that we can attach more data if needed
             var row = {
-                'tag': 'field',
-                'attrs': {
-                    'name': this.field_y_axis,
-                    'string': y,
+                tag: "field",
+                attrs: {
+                    name: this.field_y_axis,
+                    string: y,
                 },
-                'data': [],
+                data: [],
             };
-            _.each(self.x_axis, function (x) {
+            _.each(self.x_axis, function(x) {
                 row.data.push(self.by_y_axis[y][x]);
             });
             return row;
@@ -171,7 +177,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
         /**
          * Determine if a field represented by field_def can be aggregated
          */
-        is_aggregatable: function (field_def) {
+        is_aggregatable: function(field_def) {
             return field_def.type in {float: 1, monetary: 1, integer: 1};
         },
 
@@ -181,8 +187,8 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * @param {String} val: the string to be parsed.
          * @returns {Boolean} The parsed boolean.
          */
-        parse_boolean: function (val) {
-            if (val.toLowerCase() === 'true' || val === '1') {
+        parse_boolean: function(val) {
+            if (val.toLowerCase() === "true" || val === "1") {
                 return true;
             }
             return false;
@@ -194,7 +200,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          * @returns {Deferred}
          * A deferred object to be completed when it finished rendering.
          */
-        _render: function () {
+        _render: function() {
             if (!this.view) {
                 return this._super();
             }
@@ -210,11 +216,11 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
             // Create a new matrix renderer
             this.renderer = new X2Many2dMatrixRenderer(this, this.value, {
                 arch: arch,
-                editable: this.mode === 'edit' && arch.attrs.editable,
+                editable: this.mode === "edit" && arch.attrs.editable,
                 viewType: "list",
                 matrix_data: this.matrix_data,
             });
-            this.$el.addClass('o_field_x2many o_field_x2many_2d_matrix');
+            this.$el.addClass("o_field_x2many o_field_x2many_2d_matrix");
             return this.renderer.appendTo(this.$el);
         },
 
@@ -223,7 +229,7 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          *
          * @override
          */
-        activate: function (options) {
+        activate: function(options) {
             // Won't work fine without https://github.com/odoo/odoo/pull/26490
             // TODO Use _.propertyOf in underscore 1.9+
             try {
@@ -241,12 +247,12 @@ odoo.define('web_widget_x2many_2d_matrix.widget', function (require) {
          *
          * @override
          */
-        getFocusableElement: function () {
+        getFocusableElement: function() {
             return this.$(".o_input:" + (this._backwards ? "last" : "first"));
         },
     });
 
-    field_registry.add('x2many_2d_matrix', WidgetX2Many2dMatrix);
+    field_registry.add("x2many_2d_matrix", WidgetX2Many2dMatrix);
 
     return {
         WidgetX2Many2dMatrix: WidgetX2Many2dMatrix,
diff --git a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
index 38f826c46..8596f01ef 100644
--- a/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
+++ b/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss
@@ -21,10 +21,12 @@ $x2many_2d_matrix_max_height: 450px;
 
         > tbody {
             > tr {
-                &:nth-of-type(2n+1) td.row-total, &:nth-of-type(2n+1) td:first-child {
+                &:nth-of-type(2n + 1) td.row-total,
+                &:nth-of-type(2n + 1) td:first-child {
                     background-color: mix(#000, #fff, 1%);
                 }
-                &:nth-of-type(2n) td.row-total, &:nth-of-type(2n) td:first-child {
+                &:nth-of-type(2n) td.row-total,
+                &:nth-of-type(2n) td:first-child {
                     background-color: white;
                 }
 
diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml
index 80231c8c5..9f2ebd386 100644
--- a/web_widget_x2many_2d_matrix/views/assets.xml
+++ b/web_widget_x2many_2d_matrix/views/assets.xml
@@ -1,17 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!--
         License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
     -->
-
-    <template id="assets_backend" name="web_widget_x2many_2d_matrix assets" inherit_id="web.assets_backend">
+    <template
+        id="assets_backend"
+        name="web_widget_x2many_2d_matrix assets"
+        inherit_id="web.assets_backend"
+    >
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js" />
-            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" />
-            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" />
-            <script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" />
-            <link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss"/>
+            <script
+                type="text/javascript"
+                src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_view.js"
+            />
+            <script
+                type="text/javascript"
+                src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js"
+            />
+            <script
+                type="text/javascript"
+                src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js"
+            />
+            <script
+                type="text/javascript"
+                src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js"
+            />
+            <link
+                rel="stylesheet"
+                href="/web_widget_x2many_2d_matrix/static/src/scss/web_widget_x2many_2d_matrix.scss"
+            />
         </xpath>
     </template>
-
 </odoo>
diff --git a/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml b/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
new file mode 100644
index 000000000..bbf18a5ab
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_x2m_demo_form" model="ir.ui.view">
+        <field name="name">x2m.demo.form</field>
+        <field name="model">x2m.demo</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name" />
+                        <field name="line_ids">
+                            <tree>
+                                <field name="name" />
+                                <field name="value" />
+                                <field name="value_selection" />
+                                <field name="value_many2one" />
+                                <field name="user_id" />
+                            </tree>
+                        </field>
+                    </group>
+                    <footer>
+                        <button
+                            name="open_x2m_matrix"
+                            type="object"
+                            string="Try x2m 2d matrix"
+                            class="oe_link"
+                            icon="fa-edit"
+                        />
+                        <button
+                            name="open_x2m_matrix_selection"
+                            type="object"
+                            string="Try x2m 2d matrix (selection)"
+                            class="oe_link"
+                            icon="fa-edit"
+                        />
+                        <button
+                            name="open_x2m_matrix_many2one"
+                            type="object"
+                            string="Try x2m 2d matrix (many2one)"
+                            class="oe_link"
+                            icon="fa-edit"
+                        />
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_x2m_demo_tree">
+        <field name="name">Demo - Tree</field>
+        <field name="model">x2m.demo</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+            </tree>
+        </field>
+    </record>
+    <record id="action_x2m_demo" model="ir.actions.act_window">
+        <field name="name">Demo</field>
+        <field name="res_model">x2m.demo</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_x2m_demo_tree" />
+    </record>
+    <menuitem
+        id="base_matrix_widget_menu"
+        name="Demo x2m matrix widget"
+        action="action_x2m_demo"
+    />
+</odoo>
diff --git a/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml
new file mode 100644
index 000000000..90c153a1e
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="x2many_2d_matrix_demo" model="ir.ui.view">
+        <field name="name">x2m.matrix.demo.wiz</field>
+        <field name="model">x2m.matrix.demo.wiz</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field
+                    name="line_ids"
+                    widget="x2many_2d_matrix"
+                    field_x_axis="demo_id"
+                    field_y_axis="user_id"
+                    field_value="value"
+                >
+                    <tree>
+                        <field name="demo_id" />
+                        <field name="user_id" />
+                        <field name="value" />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+    <record id="x2many_2d_matrix_demo_selection" model="ir.ui.view">
+        <field name="name">x2m.matrix.demo.wiz</field>
+        <field name="model">x2m.matrix.demo.wiz</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field
+                    name="line_ids"
+                    widget="x2many_2d_matrix"
+                    field_x_axis="demo_id"
+                    field_y_axis="user_id"
+                    field_value="value_selection"
+                >
+                    <tree>
+                        <field name="demo_id" />
+                        <field name="user_id" />
+                        <field name="value_selection" />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+    <record id="x2many_2d_matrix_demo_many2one" model="ir.ui.view">
+        <field name="name">x2m.matrix.demo.wiz</field>
+        <field name="model">x2m.matrix.demo.wiz</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field
+                    name="line_ids"
+                    widget="x2many_2d_matrix"
+                    field_x_axis="demo_id"
+                    field_y_axis="user_id"
+                    field_value="value_many2one"
+                >
+                    <tree>
+                        <field name="demo_id" />
+                        <field name="user_id" />
+                        <field
+                            name="value_many2one"
+                            domain="[('users', '=', user_id)]"
+                        />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+</odoo>

From 6e6c60395e1a111be1219695116b050edb38f2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= <adria.gil@forgeflow.com>
Date: Fri, 14 Feb 2020 10:07:29 +0100
Subject: [PATCH 94/95] [13.0][MIG] web_widget_x2many_2d_matrix

---
 web_widget_x2many_2d_matrix/README.rst        | 11 +++++-----
 web_widget_x2many_2d_matrix/__manifest__.py   |  6 +++---
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  9 ++++----
 .../static/src/js/2d_matrix_renderer.js       | 21 ++++++++++++++++---
 .../static/src/js/widget_x2many_2d_matrix.js  |  1 +
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 0cedb55ca..2f503f3d1 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -14,13 +14,13 @@
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
-    :target: https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix
+    :target: https://github.com/OCA/web/tree/13.0/web_widget_x2many_2d_matrix
     :alt: OCA/web
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix
+    :target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_x2many_2d_matrix
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/162/12.0
+    :target: https://runbot.odoo-community.org/runbot/162/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -191,7 +191,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2013.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.
 
@@ -217,6 +217,7 @@ Contributors
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
+* Adrià Gil Sorribes <adria.gil@forgeflow.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -231,6 +232,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/web <https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix>`_ project on GitHub.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/13.0/web_widget_x2many_2d_matrix>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index a898754d7..d0e3fde8b 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "2D matrix for x2many fields",
-    "version": "12.0.2.2.0",
+    "version": "13.0.1.0.0",
     "author": (
         "Therp BV, "
         "Tecnativa, "
@@ -16,7 +16,7 @@
     "license": "AGPL-3",
     "category": "Hidden/Dependency",
     "summary": "Show list fields as a matrix",
-    "depends": ["web",],
-    "data": ["views/assets.xml",],
+    "depends": ["web"],
+    "data": ["views/assets.xml"],
     "installable": True,
 }
diff --git a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
index f30eb3eb1..88111d553 100644
--- a/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
+++ b/web_widget_x2many_2d_matrix/readme/CONTRIBUTORS.rst
@@ -6,3 +6,4 @@
 * Jairo Llopis <jairo.llopis@tecnativa.com>
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
+* Adrià Gil Sorribes <adria.gil@forgeflow.com>
diff --git a/web_widget_x2many_2d_matrix/static/description/index.html b/web_widget_x2many_2d_matrix/static/description/index.html
index beac91d17..8b501c4b2 100644
--- a/web_widget_x2many_2d_matrix/static/description/index.html
+++ b/web_widget_x2many_2d_matrix/static/description/index.html
@@ -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/web/tree/12.0/web_widget_x2many_2d_matrix"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_widget_x2many_2d_matrix"><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/162/12.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/web/tree/13.0/web_widget_x2many_2d_matrix"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_x2many_2d_matrix"><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/162/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to show an x2many field with 3-tuples
 ($x_value, $y_value, $value) in a table</p>
 <table border="1" class="docutils">
@@ -486,7 +486,7 @@ the field in the default function:</p>
                 <span class="s1">'project_id'</span><span class="p">:</span> <span class="n">p</span><span class="o">.</span><span class="n">id</span><span class="p">,</span>
                 <span class="s1">'user_id'</span><span class="p">:</span> <span class="n">u</span><span class="o">.</span><span class="n">id</span><span class="p">,</span>
                 <span class="s1">'planned_hours'</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
-                <span class="s1">'message_needaction'</span><span class="p">:</span> <span class="bp">False</span><span class="p">,</span>
+                <span class="s1">'message_needaction'</span><span class="p">:</span> <span class="kc">False</span><span class="p">,</span>
                 <span class="s1">'date_deadline'</span><span class="p">:</span> <span class="n">fields</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">today</span><span class="p">(),</span>
             <span class="p">})</span>
             <span class="c1"># if the project doesn't have a task for the user,</span>
@@ -551,7 +551,7 @@ is merged.</li>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2012.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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix%0Aversion:%2013.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">
@@ -576,6 +576,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt;</li>
 <li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
 <li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;brainbeanapps.com">alexey.pelykh&#64;brainbeanapps.com</a>&gt;</li>
+<li>Adrià Gil Sorribes &lt;<a class="reference external" href="mailto:adria.gil&#64;forgeflow.com">adria.gil&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -585,7 +586,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/web/tree/12.0/web_widget_x2many_2d_matrix">OCA/web</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/13.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>
 </div>
diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
index 7b7fb0a8e..e0bf72f28 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
@@ -9,6 +9,7 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(requi
     var config = require("web.config");
     var core = require("web.core");
     var field_utils = require("web.field_utils");
+    var utils = require("web.utils");
     var _t = core._t;
 
     var FIELD_CLASSES = {
@@ -73,10 +74,16 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(requi
             this._computeColumnAggregates();
             this._computeRowAggregates();
 
+            // We need to initialize the deferred list object for inherited functions that use this.defs even if it
+            // is empty at the moment.
+            var defs = [];
+            this.defs = defs;
+
             $table.append(this._renderHeader()).append(this._renderBody());
             if (self.matrix_data.show_column_totals) {
                 $table.append(this._renderFooter());
             }
+            delete this.defs;
             return this._super();
         },
 
@@ -192,8 +199,7 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(requi
             var $tr = $("<tr/>", {class: "o_data_row"}),
                 _data = _.without(row.data, undefined);
             $tr = $tr.append(this._renderLabelCell(_data[0]));
-            var $cells = _.map(
-                this.columns,
+            var $cells = this.columns.map(
                 function(column, index) {
                     var record = row.data[index];
                     // Make the widget use our field value for each cell
@@ -302,7 +308,6 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(requi
                 return $td.append(this._renderWidget(record, node));
             }
             var $el = this._renderFieldWidget(node, record, _.pick(options, "mode"));
-            this._handleAttributes($el, node);
             return $td.append($el);
         },
 
@@ -414,6 +419,16 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function(requi
             );
         },
 
+        _getRecord: function(recordId) {
+            var record = null;
+            utils.traverse_records(this.state, function(r) {
+                if (r.id === recordId) {
+                    record = r;
+                }
+            });
+            return record;
+        },
+
         /**
          * @override
          */
diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
index f856de14a..6c8ff957f 100644
--- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
+++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
@@ -132,6 +132,7 @@ odoo.define("web_widget_x2many_2d_matrix.widget", function(require) {
                 show_row_totals: this.show_row_totals,
                 show_column_totals: this.show_column_totals,
             };
+            console.log(this.matrix_data);
         },
 
         /**

From b7217ba1184a62e842a39701e0b856ba613af114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= <adria.gil@forgeflow.com>
Date: Wed, 26 Feb 2020 10:39:25 +0100
Subject: [PATCH 95/95] [13.0][MIG] web_widget_x2many_2d_matrix_example

---
 .../README.rst                                |  74 +++
 .../__init__.py                               |   3 +
 .../__manifest__.py                           |  18 +
 .../demo/x2m.demo.csv                         |  20 +
 .../web_widget_x2many_2d_matrix_example.pot   | 147 ++++++
 .../i18n/zh_CN.po                             | 149 +++++++
 .../models/__init__.py                        |   2 +
 .../models/x2m_demo.py                        |  48 ++
 .../readme/CONTRIBUTORS.rst                   |   2 +
 .../readme/DESCRIPTION.rst                    |   1 +
 .../security/ir.model.access.csv              |   5 +
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 420 ++++++++++++++++++
 .../wizard/__init__.py                        |   2 +
 .../wizard/x2m_matrix.py                      |  34 ++
 15 files changed, 925 insertions(+)
 create mode 100644 web_widget_x2many_2d_matrix_example/README.rst
 create mode 100644 web_widget_x2many_2d_matrix_example/__init__.py
 create mode 100644 web_widget_x2many_2d_matrix_example/__manifest__.py
 create mode 100644 web_widget_x2many_2d_matrix_example/demo/x2m.demo.csv
 create mode 100644 web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
 create mode 100644 web_widget_x2many_2d_matrix_example/i18n/zh_CN.po
 create mode 100644 web_widget_x2many_2d_matrix_example/models/__init__.py
 create mode 100644 web_widget_x2many_2d_matrix_example/models/x2m_demo.py
 create mode 100644 web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst
 create mode 100644 web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst
 create mode 100644 web_widget_x2many_2d_matrix_example/security/ir.model.access.csv
 create mode 100644 web_widget_x2many_2d_matrix_example/static/description/icon.png
 create mode 100644 web_widget_x2many_2d_matrix_example/static/description/index.html
 create mode 100644 web_widget_x2many_2d_matrix_example/wizard/__init__.py
 create mode 100644 web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py

diff --git a/web_widget_x2many_2d_matrix_example/README.rst b/web_widget_x2many_2d_matrix_example/README.rst
new file mode 100644
index 000000000..67843ee97
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/README.rst
@@ -0,0 +1,74 @@
+===================================
+web_widget_x2many_2d_matrix example
+===================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
+    :target: https://github.com/OCA/web/tree/13.0/web_widget_x2many_2d_matrix_example
+    :alt: OCA/web
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_x2many_2d_matrix_example
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/162/13.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+Install it and click on the menu item `Demo x2m matrix widget`.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix_example%0Aversion:%2013.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Simone Orsi <simone.orsi@camptocamp.com>
+* Anand Kansagra <kansagraanand@hotmail.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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/web <https://github.com/OCA/web/tree/13.0/web_widget_x2many_2d_matrix_example>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/web_widget_x2many_2d_matrix_example/__init__.py b/web_widget_x2many_2d_matrix_example/__init__.py
new file mode 100644
index 000000000..d6c56a95f
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import models
+from . import wizard
diff --git a/web_widget_x2many_2d_matrix_example/__manifest__.py b/web_widget_x2many_2d_matrix_example/__manifest__.py
new file mode 100644
index 000000000..df95e5e9a
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/__manifest__.py
@@ -0,0 +1,18 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "web_widget_x2many_2d_matrix example",
+    "summary": "A small example on how to use `web_widget_x2many_2d_matrix`.",
+    "version": "13.0.1.0.0",
+    "author": "Camptocamp, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/web",
+    "license": "AGPL-3",
+    "category": "Hidden/Dependency",
+    "depends": ["web_widget_x2many_2d_matrix"],
+    "data": [
+        "security/ir.model.access.csv",
+        "demo/x2m.demo.csv",
+        "views/x2m_demo.xml",
+        "wizard/x2m_matrix.xml",
+    ],
+    "installable": True,
+}
diff --git a/web_widget_x2many_2d_matrix_example/demo/x2m.demo.csv b/web_widget_x2many_2d_matrix_example/demo/x2m.demo.csv
new file mode 100644
index 000000000..9a8b5aa11
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/demo/x2m.demo.csv
@@ -0,0 +1,20 @@
+id,name,line_ids/user_id/id,line_ids/name,line_ids/value
+web_widget_x2many_2d_matrix_example.x2m_demo_5,One,,,
+,,base.user_demo,A,1
+,,base.user_demo,B,2
+,,base.user_demo,C,3
+web_widget_x2many_2d_matrix_example.x2m_demo_3,Two,,,
+,,base.user_demo,E,5
+,,base.user_demo,F,6
+web_widget_x2many_2d_matrix_example.x2m_demo_2,Three,,,
+,,base.user_root,G,8
+,,base.user_demo,H,9
+,,base.user_root,I,10
+web_widget_x2many_2d_matrix_example.x2m_demo_1,Four,,,
+,,base.user_root,L,12
+,,base.user_demo,M,13
+,,base.user_demo,N,14
+,,base.user_demo,O,15
+,,base.user_root,P,16
+web_widget_x2many_2d_matrix_example.x2m_demo_4,Five,,,
+,,base.user_demo,Q,18
diff --git a/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
new file mode 100644
index 000000000..2a35dc195
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
@@ -0,0 +1,147 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* web_widget_x2many_2d_matrix_example
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.actions.act_window,name:web_widget_x2many_2d_matrix_example.action_x2m_demo
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__demo_id
+msgid "Demo"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.ui.menu,name:web_widget_x2many_2d_matrix_example.base_matrix_widget_menu
+msgid "Demo x2m matrix widget"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__id
+msgid "ID"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__line_ids
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__line_ids
+msgid "Line"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__name
+msgid "Name"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix (many2one)"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix (selection)"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__user_id
+msgid "User"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value
+msgid "Value"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: selection:x2m.demo.line,value_selection:0
+msgid "Value 1"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: selection:x2m.demo.line,value_selection:0
+msgid "Value 2"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value_many2one
+msgid "Value Many2One"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value_selection
+msgid "Value Selection"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo
+msgid "X2Many Demo"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo_line
+msgid "X2Many Demo Line"
+msgstr ""
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_matrix_demo_wiz
+msgid "X2Many Matrix Demo Wizard"
+msgstr ""
+
diff --git a/web_widget_x2many_2d_matrix_example/i18n/zh_CN.po b/web_widget_x2many_2d_matrix_example/i18n/zh_CN.po
new file mode 100644
index 000000000..db6dcf62e
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/i18n/zh_CN.po
@@ -0,0 +1,149 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* web_widget_x2many_2d_matrix_example
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-09-17 19:24+0000\n"
+"Last-Translator: 黎伟杰 <674416404@qq.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.8\n"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_uid
+msgid "Created by"
+msgstr "创建者"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_date
+msgid "Created on"
+msgstr "创建时间"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.actions.act_window,name:web_widget_x2many_2d_matrix_example.action_x2m_demo
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__demo_id
+msgid "Demo"
+msgstr "演示"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.ui.menu,name:web_widget_x2many_2d_matrix_example.base_matrix_widget_menu
+msgid "Demo x2m matrix widget"
+msgstr "演示x2m矩阵小部件"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz____last_update
+msgid "Last Modified on"
+msgstr "最后修改时间"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_uid
+msgid "Last Updated by"
+msgstr "最后更新者"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_date
+msgid "Last Updated on"
+msgstr "最后更新时间"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__line_ids
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__line_ids
+msgid "Line"
+msgstr "行"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__name
+msgid "Name"
+msgstr "名称"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix"
+msgstr "试试x2m 2d矩阵"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix (many2one)"
+msgstr "试试x2m 2d矩阵(many2one)"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+msgid "Try x2m 2d matrix (selection)"
+msgstr "试试x2m 2d矩阵 (selection)"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__user_id
+msgid "User"
+msgstr "用户"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value
+msgid "Value"
+msgstr "值"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: selection:x2m.demo.line,value_selection:0
+msgid "Value 1"
+msgstr "值1"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: selection:x2m.demo.line,value_selection:0
+msgid "Value 2"
+msgstr "值2"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value_many2one
+msgid "Value Many2One"
+msgstr "值 Many2One"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value_selection
+msgid "Value Selection"
+msgstr "值Selection"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo
+msgid "X2Many Demo"
+msgstr "X2Many演示"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo_line
+msgid "X2Many Demo Line"
+msgstr "X2Many演示行"
+
+#. module: web_widget_x2many_2d_matrix_example
+#: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_matrix_demo_wiz
+msgid "X2Many Matrix Demo Wizard"
+msgstr "X2Many Matrix演示向导"
diff --git a/web_widget_x2many_2d_matrix_example/models/__init__.py b/web_widget_x2many_2d_matrix_example/models/__init__.py
new file mode 100644
index 000000000..bf8b6ac47
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/models/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import x2m_demo
diff --git a/web_widget_x2many_2d_matrix_example/models/x2m_demo.py b/web_widget_x2many_2d_matrix_example/models/x2m_demo.py
new file mode 100644
index 000000000..c8a1dd25c
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/models/x2m_demo.py
@@ -0,0 +1,48 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class X2MDemo(models.Model):
+    _name = "x2m.demo"
+    _description = "X2Many Demo"
+
+    name = fields.Char()
+    line_ids = fields.One2many("x2m.demo.line", "demo_id")
+
+    def _open_x2m_matrix(self, view_xmlid):
+        wiz = self.env["x2m.matrix.demo.wiz"].create({})
+        view_id = self.env.ref(
+            "web_widget_x2many_2d_matrix_example.%s" % view_xmlid,
+        ).id
+        return {
+            "name": "Try x2many 2D matrix widget",
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "x2m.matrix.demo.wiz",
+            "target": "new",
+            "res_id": wiz.id,
+            "view_id": view_id,
+            "context": self.env.context,
+        }
+
+    def open_x2m_matrix(self):
+        return self._open_x2m_matrix("x2many_2d_matrix_demo")
+
+    def open_x2m_matrix_selection(self):
+        return self._open_x2m_matrix("x2many_2d_matrix_demo_selection")
+
+    def open_x2m_matrix_many2one(self):
+        return self._open_x2m_matrix("x2many_2d_matrix_demo_many2one")
+
+
+class X2MDemoLine(models.Model):
+    _name = "x2m.demo.line"
+    _description = "X2Many Demo Line"
+
+    name = fields.Char()
+    demo_id = fields.Many2one("x2m.demo")
+    user_id = fields.Many2one("res.users")
+    value = fields.Integer()
+    value_selection = fields.Selection([("val1", "Value 1"), ("val2", "Value 2")],)
+    value_many2one = fields.Many2one("res.groups")
diff --git a/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..1fee00cb0
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Simone Orsi <simone.orsi@camptocamp.com>
+* Anand Kansagra <kansagraanand@hotmail.com>
diff --git a/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst b/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..1af8b59ef
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Install it and click on the menu item `Demo x2m matrix widget`.
diff --git a/web_widget_x2many_2d_matrix_example/security/ir.model.access.csv b/web_widget_x2many_2d_matrix_example/security/ir.model.access.csv
new file mode 100644
index 000000000..ff2b0388d
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_x2m_demo_line,access_x2m_demo_line,model_x2m_demo_line,base.group_user,1,0,0,0
+access_x2m_demo_line_admin,access_x2m_demo_line_admin,model_x2m_demo_line,base.group_system,1,1,1,1
+access_x2m_demo,access_x2m_demo,model_x2m_demo,base.group_user,1,0,0,0
+access_x2m_demo_admin,access_x2m_demo_admin,model_x2m_demo,base.group_system,1,1,1,1
diff --git a/web_widget_x2many_2d_matrix_example/static/description/icon.png b/web_widget_x2many_2d_matrix_example/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/web_widget_x2many_2d_matrix_example/static/description/index.html b/web_widget_x2many_2d_matrix_example/static/description/index.html
new file mode 100644
index 000000000..59b905f00
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/static/description/index.html
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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/" />
+<title>web_widget_x2many_2d_matrix example</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+: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 http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="web-widget-x2many-2d-matrix-example">
+<h1 class="title">web_widget_x2many_2d_matrix example</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! 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/web/tree/13.0/web_widget_x2many_2d_matrix_example"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_x2many_2d_matrix_example"><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/162/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Install it and click on the menu item <cite>Demo x2m matrix widget</cite>.</p>
+<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="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="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/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/web/issues/new?body=module:%20web_widget_x2many_2d_matrix_example%0Aversion:%2013.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">
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<ul class="simple">
+<li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
+<li>Anand Kansagra &lt;<a class="reference external" href="mailto:kansagraanand&#64;hotmail.com">kansagraanand&#64;hotmail.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<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/web/tree/13.0/web_widget_x2many_2d_matrix_example">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>
+</div>
+</div>
+</body>
+</html>
diff --git a/web_widget_x2many_2d_matrix_example/wizard/__init__.py b/web_widget_x2many_2d_matrix_example/wizard/__init__.py
new file mode 100644
index 000000000..e8c3b4552
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/wizard/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import x2m_matrix
diff --git a/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py
new file mode 100644
index 000000000..0e7477b7f
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py
@@ -0,0 +1,34 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class X2mMatrixDemoWiz(models.TransientModel):
+    _name = "x2m.matrix.demo.wiz"
+    _description = "X2Many Matrix Demo Wizard"
+
+    line_ids = fields.Many2many(
+        "x2m.demo.line", default=lambda self: self._default_line_ids()
+    )
+
+    def _default_line_ids(self):
+        """take care that the widget gets records passed for every combination
+        of x2m.demo and res.users involved"""
+        recs = self.env["x2m.demo"].search([])
+        users = self.env["x2m.demo.line"].search([]).mapped("user_id")
+        return [
+            (
+                0,
+                0,
+                {
+                    "name": "{}'s task on {}".format(usr.name, rec.name),
+                    "demo_id": rec.id,
+                    "user_id": usr.id,
+                },
+            )
+            # if there isn't a demo line record for the user, create a new one
+            if not rec.line_ids.filtered(lambda x: x.user_id == usr) else
+            # otherwise, return the line
+            (4, rec.line_ids.filtered(lambda x: x.user_id == usr)[0].id)
+            for rec in recs
+            for usr in users
+        ]