diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 50d5ee662aa..85420f28a21 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -471,6 +471,15 @@ class res_partner(osv.osv):
         }
         return urlplus('https://maps.google.be/maps' , params)
 
+class res_company(osv.osv):
+    _inherit = "res.company"
+    def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
+        partner = self.browse(cr, openerp.SUPERUSER_ID, ids[0], context=context).parent_id
+        return partner and partner.google_map_img(zoom, width, height, context=context) or None
+    def google_map_link(self, cr, uid, ids, zoom=8, context=None):
+        partner = self.browse(cr, openerp.SUPERUSER_ID, ids[0], context=context).parent_id
+        return partner and partner.google_map_link(zoom, context=context) or None
+
 class base_language_install(osv.osv):
     _inherit = "base.language.install"
     _columns = {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b635a37de6e..5e546aa3baa 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -468,8 +468,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 <span>&amp;#x2706; <span t-field="res_company.phone"></span></span><br />
                 <i class="icon-envelope"></i> <span t-field="res_company.email"></span>
             </address>
-             <a t-att-href="res_company.partner_id.google_map_link()" target="_BLANK">
-                <img class="thumbnail img-responsive" t-att-src="res_company.partner_id.google_map_img()" />
+             <a t-att-href="res_company.google_map_link()" target="_BLANK">
+                <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
             </a>
         </template>