[MERGE]

bzr revid: apa@tinyerp.com-20121029122115-zga92n7f0f1zntkp

diff --cc addons/pad/static/src/js/pad.js
index 0558fc5,7bfcc95..f88bdba
--- 1/addons/pad/static/src/js/pad.js
--- 2/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@@ -12,15 -12,12 +12,19 @@@ openerp.pad = function(instance) 
                          field_name: self.name,
                          object_id: self.view.datarecord.id
                      }}).then(function(data) {
++<<<<<<< TREE
 +                    if(data&&data.url){
 +                        // is there any reason to call super here ? why ?
 +                       // _super.apply(self,[data.url]);
 +                        self.renderElement();
++=======
+                     if(data && data.url){
+                         self.set_value(data.url);
++>>>>>>> MERGE-SOURCE
                      }
                  });
-             } else {
-                 self.renderElement();
              }
+             self.renderElement();
              this._dirty_flag = true;
          },
          renderElement: function(){