diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index c491dd06138..f1a9769f803 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['email_template'],
+    'depends': ['email_template','google_map'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
@@ -53,7 +53,6 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'js': ['static/src/js/google_map.js'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 190445d6c20..69d0135d091 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -68,7 +68,7 @@
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                         <field name="address"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
@@ -77,7 +77,7 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div id="oe_mapbox" class="oe_mapbox"></div>
+                    <div class="oe_form_google_map"></div>
                 </group>
 
                 <notebook colspan="4">
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 8aa1b60ca88..a6e85c3cd66 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -38,6 +38,7 @@ Using this you can directly open Google Map from the URL widget.""",
                    'google_map_view.xml',
                   ],
     'demo_xml': [],
+    'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
     'certificate': '0029498930765',
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 4cd7e4ad7c4..eda86a0662f 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,8 +12,7 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
+                        <button name="open_map" string="Map" type="object" icon="gtk-zoom-in"/>
                         </group>
                     </field>
                 </field>
diff --git a/addons/event/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
similarity index 85%
rename from addons/event/static/src/js/google_map.js
rename to addons/google_map/static/src/js/google_map.js
index 4a02086b85a..cec51510fe2 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,7 +1,7 @@
-openerp.event = function(instance) {
-    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
-    
-    instance.web.GoogleMapConnector = instance.web.Class.extend({
+openerp.event = function(instance, mod) {
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+
+    instance.google_map.GoogleMapConnector = instance.web.Class.extend({
         init: function(){
             this.googleMapsLoaded = $.Deferred();
             this.map_load();
@@ -36,10 +36,10 @@ openerp.event = function(instance) {
             });
         },
     });
-    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+    instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.web.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector(); 
         },
         get_address:function(value){
             var self = this;
@@ -55,9 +55,8 @@ openerp.event = function(instance) {
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-
                 self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                    self.map.render_map(address,self.$(self.options.selector)[0]);
                 })
             });
         },
@@ -65,7 +64,6 @@ openerp.event = function(instance) {
             this._super(value);
             this.get_address(value);
         },
-
         render_value:function(no_recurse){
             this.get_address(this.get("value"));
             this._super(no_recurse);