diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-04-21 13:58:22 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-04-21 15:21:42 +0200 |
| commit | 6768bbfcc02e0f498110cda2ba9adbc2fd23d24c (patch) | |
| tree | 7dccb1019434582874b285276189b1b3dcbb96a9 /addons/web/static/src/js/compatibility.js | |
| parent | e1bfd3fbda97ac7a64a585b07be161d5be606cf9 (diff) | |
| parent | 8e440b173e3b273b3aac541f2ec12527f67dfa60 (diff) | |
[MERGE] *: stop duplicating web
Avoid duplicating web addon in enterprise by extracting a common basis.
Enterprise features stay in enterprise, but use that common basis.
In web, mainly:
- JS refactoring and linting
- Conversion of .sass into .less split into multiple files
- Templates cleaning and DOM simplification
- Re-generation of web.pot, and update of .po files
Minor tweaks in some other addons to make them work with this new structure.
Diffstat (limited to 'addons/web/static/src/js/compatibility.js')
| -rw-r--r-- | addons/web/static/src/js/compatibility.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/web/static/src/js/compatibility.js b/addons/web/static/src/js/compatibility.js index 5532c8c388e..7fa2d4733db 100644 --- a/addons/web/static/src/js/compatibility.js +++ b/addons/web/static/src/js/compatibility.js @@ -22,7 +22,6 @@ var form_relational = require('web.form_relational'); // necessary var form_widgets = require('web.form_widgets'); // necessary var framework = require('web.framework'); var ListView = require('web.ListView'); -var Menu = require('web.Menu'); var Model = require('web.DataModel'); var pyeval = require('web.pyeval'); var Registry = require('web.Registry'); @@ -96,7 +95,6 @@ openerp.web.FormView = FormView; openerp.web.json_node_to_xml = utils.json_node_to_xml; openerp.web.ListView = ListView; -openerp.web.Menu = Menu; openerp.web.Model = Model; openerp.web.normalize_format = time.strftime_to_moment_format; openerp.web.py_eval = pyeval.py_eval; @@ -208,7 +206,7 @@ ListView.include({ }).value(); } - return this._super(data); + return this._super(); }, /** * Returns the style for the provided record in the current view (from the |
