diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-11-22 16:56:03 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-11-22 16:56:03 +0530 |
| commit | 7cffb9a12aadc1bc666233e48b0e94b42b77de8d (patch) | |
| tree | 7e4b00d8d1db8fbb3697eea273cfaae20670c871 /addons/web_process | |
| parent | 40e3f490a2dfffe81d164f0b8d8b68317a3e11cf (diff) | |
| parent | a738f4390f718c809b51f02597d1dac148e4314b (diff) | |
[MERGE]Merge trunk upto 1528 revision.
bzr revid: kch@tinyerp.com-20111122112603-m6g8vg233695whlf
Diffstat (limited to 'addons/web_process')
| -rw-r--r-- | addons/web_process/__openerp__.py | 3 | ||||
| -rw-r--r-- | addons/web_process/static/src/js/process.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py index fd1a48a3a0d..1ef47573d55 100644 --- a/addons/web_process/__openerp__.py +++ b/addons/web_process/__openerp__.py @@ -8,5 +8,8 @@ "css": [ "static/src/css/process.css" ], + 'qweb': [ + "static/src/xml/web_process.css" + ], 'active': True } diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 2b7eb9b8c35..e9ea3129125 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -1,6 +1,5 @@ openerp.web_process = function (openerp) { var QWeb = openerp.web.qweb; - QWeb.add_template('/web_process/static/src/xml/web_process.xml'); openerp.web.ViewManager.include({ start: function() { this._super(); @@ -305,7 +304,7 @@ openerp.web_process = function (openerp) { pager: false } }); - }, + } }); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: |