From b44fdabb9a4db30ec51b07b9cf6ff7fb17ae5f14 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 Mar 2011 17:58:21 +0100
Subject: [PATCH 1/4] [FIX] trailing commas and missing semicolons

bzr revid: xmo@openerp.com-20110318165821-5zyvlfzi7xt25gu0
---
 addons/base/static/openerp/js/base_chrome.js | 2 +-
 addons/base/static/openerp/js/base_views.js  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index b336f0144b5..d03853fe617 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -105,7 +105,7 @@ openerp.base.BasicController = Class.extend({
 openerp.base.Console =  openerp.base.BasicController.extend({
     init: function(element_id, server, port) {
         this._super(element_id);
-    },
+    }
 });
 
 openerp.base.Database = openerp.base.BasicController.extend({
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 7b7a2db949b..1e9b5f76212 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -273,9 +273,9 @@ openerp.base.FormView =  openerp.base.Controller.extend({
     },
     on_record_loaded: function() {
         for (var f in this.fields) {
-            this.fields[f].set_value()
+            this.fields[f].set_value();
         }
-    },
+    }
 });
 
 openerp.base.ListView = openerp.base.Controller.extend({
@@ -536,7 +536,7 @@ openerp.base.FieldChar = openerp.base.Field.extend({
     },
     on_change: function() {
         //this.view.update_field(this.name,value);
-    },
+    }
 });
 
 openerp.base.FieldEmail = openerp.base.Field.extend({
@@ -637,7 +637,7 @@ openerp.base.widgets = {
     'boolean' : openerp.base.FieldBoolean,
     'float' : openerp.base.FieldFloat,
     'button' : openerp.base.WidgetButton
-}
+};
 
 openerp.base.CalendarView = openerp.base.Controller.extend({
 // Dhtmlx scheduler ?

From c0068f172aec387c8c064ccbaf70dc6409470868 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 Mar 2011 18:01:11 +0100
Subject: [PATCH 2/4] [FIX] remove annoying alert in base_hello, remove
 trailing commas and add missing semicolons

bzr revid: xmo@openerp.com-20110318170111-9t5m1uqngu3cfyph
---
 addons/base_hello/static/openerp/base_hello.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_hello/static/openerp/base_hello.js b/addons/base_hello/static/openerp/base_hello.js
index 973b04536a7..5d6a02d355b 100644
--- a/addons/base_hello/static/openerp/base_hello.js
+++ b/addons/base_hello/static/openerp/base_hello.js
@@ -7,12 +7,12 @@ openerp.base_hello = function(openerp) {
 openerp.base.SearchView = openerp.base.SearchView.extend({
     init:function() {
         this._super.apply(this,arguments);
-        this.on_search.add(function(){alert('hello')});
-    },
+        this.on_search.add(function(){console.log('hello');});
+    }
 });
 
 // here you may tweak globals object, if any, and play with on_* or do_* callbacks on them
 
-}
+};
 
 // vim:et fdc=0 fdl=0:

From fd36eabd0c97be3046944c05b36b437d30ce4a2a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Sat, 19 Mar 2011 14:32:25 +0100
Subject: [PATCH 3/4] Add note/todo in production doc

bzr revid: xmo@openerp.com-20110319133225-y4wwadkopb99cpfm
---
 doc/source/production.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/source/production.rst b/doc/source/production.rst
index a45628f90fa..2524471f327 100644
--- a/doc/source/production.rst
+++ b/doc/source/production.rst
@@ -3,6 +3,12 @@ Deploying OpenERP Web
 
 .. After release one, add upgrade instructions if any
 
+.. How about running the web client on alternative Python
+.. implementations e.g. pypy or Jython? Since the only lib with C
+.. accelerators we're using right now is SimpleJSON and it has a pure
+.. Python base component, we should be able to test and deploy on
+.. non-cpython no?
+
 In-depth configuration
 ----------------------
 

From f252f3ff3c6dc10dfc650240f98bc812d9ff780b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Sat, 19 Mar 2011 15:31:31 +0100
Subject: [PATCH 4/4] [ADD] placeholder document for differences between 6 and
 6.1

bzr revid: xmo@openerp.com-20110319143131-9i7hy4057lcc97cj
---
 doc/source/index.rst       |  1 +
 doc/source/old-version.rst | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 doc/source/old-version.rst

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 6d5d1551373..10ea0bcd4f1 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -17,6 +17,7 @@ Contents:
    addons
    development
    project
+   old-version
 
 Indices and tables
 ==================
diff --git a/doc/source/old-version.rst b/doc/source/old-version.rst
new file mode 100644
index 00000000000..d7458063be7
--- /dev/null
+++ b/doc/source/old-version.rst
@@ -0,0 +1,11 @@
+Main differences with the 6.0 client
+====================================
+
+.. No more populate.sh, use virtualenvs
+
+.. Logic is mainly in Javascript (had to make a choice between JS and
+.. Python logic)
+
+.. Templating language changes
+
+.. How to port addons and modules?