From 8d2ec1cd3549fc9f9d71f83ee491640821f7533a Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Thu, 8 Nov 2012 13:09:52 +0530
Subject: [PATCH 1/3] [IMP] Remove the error after click on 'Show more' go on
 top and try to open any record

bzr revid: hip@tinyerp.com-20121108073952-p5zbzr21junjjvh0
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 76920da6a47..5650a949611 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -640,7 +640,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         var self = this;
         this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
             'limit': self.view.limit,
-            'offset': self.dataset_offset += self.view.limit
+            'offset': self.dataset_offset
         }).then(this.do_add_records);
     },
     do_add_records: function(records, prepend) {

From 8f331174f9e03997e622ef353c43efa5551b4f55 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Mon, 12 Nov 2012 10:51:31 +0530
Subject: [PATCH 2/3] [IMP] Improve code

bzr revid: hip@tinyerp.com-20121112052131-pbiei5kj9c2gglk1
---
 addons/web_kanban/static/src/js/kanban.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index f2687c28a80..0e739f2c080 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -428,8 +428,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 } else if (262*unfolded<self.$el.width()) {
                     group.$el.children(':first').css('width', "250px");
                 } else {
-		    // -12 because of padding 6 between cards
-		    // -1 because of the border of the latest dummy column
+            // -12 because of padding 6 between cards
+            // -1 because of the border of the latest dummy column
                     group.$el.children(':first').css('width', Math.floor((self.$el.width()-1)/unfolded)-12 + 'px');
                 }
             }
@@ -640,11 +640,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         var self = this;
         return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
             'limit': self.view.limit,
-<<<<<<< TREE
             'offset': self.dataset_offset
-        }).then(this.do_add_records);
-=======
-            'offset': self.dataset_offset += self.view.limit
         }).then(function(records) {
             records.forEach(function(r) {
                 self.view.dataset.ids.push(r.id);
@@ -652,7 +648,6 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
             self.do_add_records(records);
             return records;
         });
->>>>>>> MERGE-SOURCE
     },
     do_add_records: function(records, prepend) {
         var self = this;

From e87a18037b468defc0ac8d57072260672ec3d9dd Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Mon, 26 Nov 2012 17:37:52 +0530
Subject: [PATCH 3/3] [IMP] remove unnecessary change

bzr revid: hip@tinyerp.com-20121126120752-77sjjth3h23i2yj2
---
 addons/web_kanban/static/src/js/kanban.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 98dba6df611..92da5dadf95 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -428,8 +428,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 } else if (262*unfolded<self.$el.width()) {
                     group.$el.children(':first').css('width', "250px");
                 } else {
-            // -12 because of padding 6 between cards
-            // -1 because of the border of the latest dummy column
+		    // -12 because of padding 6 between cards
+		    // -1 because of the border of the latest dummy column
                     group.$el.children(':first').css('width', Math.floor((self.$el.width()-1)/unfolded)-12 + 'px');
                 }
             }