[MERGE]Merge with trunk upto revision no 833.

bzr revid: kch@tinyerp.com-20110817050802-2y0a3osy7jk52xps
bzr revid: kch@tinyerp.com-20110819055525-vrklylpqm8ck7pci

diff --cc addons/base/controllers/main.py
index f6c473e,d5eaafa..f04e596
--- 1/addons/base/controllers/main.py
--- 2/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@@ -140,10 -141,9 +141,10 @@@ class WebClient(openerpweb.Controller)
  
      @openerpweb.httprequest
      def home(self, req, s_action=None):
 +
          # script tags
          jslist = ['/base/webclient/js']
-         if 1: # debug == 1
+         if req.debug:
              jslist = manifest_glob(['base'], 'js')
          js = "\n        ".join(['<script type="text/javascript" src="%s"></script>'%i for i in jslist])
  

diff --cc addons/base/static/src/js/boot.js
index 13b3b24,e880706..eec8905
--- 1/addons/base/static/src/js/boot.js
--- 2/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@@ -57,36 -53,12 +53,15 @@@ openerp.base = function(instance) 
      openerp.base.formats(instance);
      openerp.base.chrome(instance);
      openerp.base.data(instance);
-     if (openerp.base.views) {
-         openerp.base.views(instance);
-     }
-     if (openerp.base.search) {
-         openerp.base.search(instance);
-     }
-     if (openerp.base.list) {
-         openerp.base.list(instance);
-     }
-     if (openerp.base. m2o) {
-         openerp.base.m2o(instance);
-     }
-     if (openerp.base.form) {
-         openerp.base.form(instance);
-     }
-     if (openerp.base.list && openerp.base.list.editable) {
-         openerp.base.list.editable(instance);
-     }
-     if (openerp.web_mobile) {
-         openerp.web_mobile(instance);
-     }
-     if (openerp.base.view_tree) {
-         openerp.base.view_tree(instance);
-     }
-     if (openerp.base.data_export) {
-         openerp.base.data_export(instance);
+     files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"];
+     for(i=0; i<files.length; i++) {
+         if(openerp.base[files[i]]) {
+             openerp.base[files[i]](instance);
+         }
      }
 +    if (openerp.base.data_import){
 +        openerp.base.data_import(instance);
 +    }
  };
  
  // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

diff --cc addons/base/static/src/js/chrome.js
index 1293f37,3aff7b5..7958071
--- 1/addons/base/static/src/js/chrome.js
--- 2/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@@ -752,7 -800,7 +800,7 @@@ openerp.base.WebClient = openerp.base.W
              self.execute_home_action(home_action[0], ds);
          })
      },
--    default_home: function () { 
++    default_home: function () {
      },
      /**
       * Bundles the execution of the home action

diff --cc addons/base/static/src/js/views.js
Simple merge

diff --cc addons/base/static/src/xml/base.xml
Simple merge