From: Vidhin Mehta (OpenERP) <vme@tinyerp.com>
Date: Thu, 3 Nov 2011 11:12:55 +0000 (+0530)
Subject: [merge]merge with main lp:openerp-web branch.
X-Git-Tag: 6.1.0-rc1-addons~1089^2~43^2~7
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=bf5046c4a1bb7292ffe7822eef22b864c934d49c;p=odoo%2Fodoo.git

[merge]merge with main lp:openerp-web branch.

bzr revid: vme@tinyerp.com-20111103111255-gcj2jfpk5d3640hg
---

bf5046c4a1bb7292ffe7822eef22b864c934d49c
diff --cc addons/web/static/src/js/view_editor.js
index ad680e8,71cda6f..c26fecc
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@@ -7,12 -7,12 +7,12 @@@ openerp.web.ViewEditor =   openerp.web.
          this.parent = parent
          this.dataset = dataset;
          this.model = dataset.model;
 -        this.xml_id = 0;
 +        this.xml_element_id = 0;
      },
      start: function() {
-         this.View_editor();
+         this.init_view_editor();
      },
-     View_editor : function() {
+     init_view_editor: function() {
          var self = this;
          var action = {
              name:'ViewEditor',