[MERGE] Sync with trunk

bzr revid: hmo@tinyerp.com-20121011115257-httrbpbtj3cmdill
bzr revid: hmo@tinyerp.com-20121011115740-mchi07zmrmngt30d
bzr revid: hmo@tinyerp.com-20121015074807-a1d81372bg16f8kk
bzr revid: hmo@tinyerp.com-20121019052244-r0css6nbvtrgkm6o
bzr revid: jam@tinyerp.com-20121022050159-nklz0b6su1nstkvm

2 files changed, 4 insertions, 5 deletions

diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css
index 7442db9bc4a..5f438622653 100644
--- a/addons/process/static/src/css/process.css
+++ b/addons/process/static/src/css/process.css
@@ -44,7 +44,7 @@ a.cta-a strong {
     background-color:#FFF;
 }
 .process_canvas svg{
-    height:500px;!important;
+    height:500px;
     padding:15px;
 }
 .oe_process {
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c593c1569fc..c214dbb0fdf 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -216,13 +216,12 @@ instance.web.ViewManager.include({
         var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
         var action_manager = new instance.web.ActionManager(self);
         dataset.call('get',
-            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
-            function(res) {
+            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
                 var action = res[0][res[0].length - 1];
                 self.rpc("/web/action/load", {
                     action_id: action.id,
                     context: dataset.context
-                    }, function(result) {
+                    }).then(function(result) {
                         action_manager.replace(self.$el);
                         action_manager.do_action(result.result);
                     })
@@ -239,7 +238,7 @@ instance.web.ViewManager.include({
                 title: _t('Process')
             });
         var form_controller = pop.view_form;
-        pop.on('on_write_complete', self, self.initialize_process_view);
+        pop.on('write_completed', self, self.initialize_process_view);
     }
 });
 };