[MERGE] Missing tab title made multi-tab use of OpenERP quite difficult - now fixed.

bzr revid: odo@openerp.com-20120612141943-ukcwg62lsm3auy0d

diff --cc addons/web/static/src/js/chrome.js
index 7d451ac,bd86f22..0b15235
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -1045,6 -1073,18 +1045,18 @@@ openerp.web.WebClient = openerp.web.Old
  
          this._current_state = null;
      },
+     _get_version_label: function() {
+         if (this.session.openerp_entreprise) {
+             return 'OpenERP';
+         } else {
+             return _t("OpenERP - Unsupported/Community Version");
+         }
+     },
+     set_title: function(title) {
+         title = _.str.clean(title);
+         var sep = _.isEmpty(title) ? '' : ' - ';
 -        document.title = title + sep + this._get_version_label();
++        document.title = title + sep + 'OpenERP';
+     },
      start: function() {
          var self = this;
          this.$element = $(document.body);
@@@ -1182,6 -1204,10 +1194,7 @@@
          this._current_state = state;
      },
      do_push_state: function(state) {
 -        var title = state.title;
 -        delete state.title;
 -        this.set_title(title);
 -
++        this.set_title(state.title);
          var url = '#' + $.param(state);
          this._current_state = _.clone(state);
          $.bbq.pushState(url);

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