[MERGE] forward port branch saas-12.3 up to 48a9f5a6335

2 files changed, 2 insertions, 2 deletions

diff --git a/addons/lunch/report/lunch_product_report.py b/addons/lunch/report/lunch_product_report.py
index 2615cb827ee..3a30fc426d3 100644
--- a/addons/lunch/report/lunch_product_report.py
+++ b/addons/lunch/report/lunch_product_report.py
@@ -69,7 +69,7 @@ class LunchProductReport(models.Model):
         self._cr.execute("""
             CREATE or REPLACE view %s AS (
                 SELECT
-                    row_number() over () AS id,
+                    row_number() over (ORDER BY user_id,product.id) AS id,
                     product.id AS product_id,
                     product.name,
                     product.category_id,
diff --git a/addons/lunch/static/src/js/lunch_kanban_model.js b/addons/lunch/static/src/js/lunch_kanban_model.js
index ddd11f9a9be..c2386c7ace8 100644
--- a/addons/lunch/static/src/js/lunch_kanban_model.js
+++ b/addons/lunch/static/src/js/lunch_kanban_model.js
@@ -40,7 +40,7 @@ var LunchKanbanModel = KanbanModel.extend({
         });
     },
     reload: function (id, options) {
-        var domain = options.domain || this.localData[id].domain;
+        var domain = options && options.domain || this.localData[id].domain;
 
         this._addOrUpdate(domain, ['is_available_at', 'in', [this.locationId]]);
         options = _.extend(options, {domain: domain});