From 57a582f52795e3dc1323b97ba8fcfa99a6071ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 7 Oct 2013 16:42:23 +0200 Subject: [PATCH] [IMP] wsebsite_google_map: now dependant only from base_geolocalize. Type based on partner grade is removed. bzr revid: tde@openerp.com-20131007144223-d7yq7c6f2ewu2u7e --- addons/website_google_map/__openerp__.py | 4 ++-- addons/website_google_map/models/res_partner.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py index d7d188219af..dcb48b40320 100644 --- a/addons/website_google_map/__openerp__.py +++ b/addons/website_google_map/__openerp__.py @@ -9,10 +9,10 @@ OpenERP Website Google Map """, 'author': 'OpenERP SA', - 'depends': ['website_partner', 'crm_partner_assign'], + 'depends': ['base_geolocalize', 'website_partner'], 'data': [ 'views/google_map.xml', ], 'installable': True, - 'auto_install': True, + 'auto_install': False, } diff --git a/addons/website_google_map/models/res_partner.py b/addons/website_google_map/models/res_partner.py index 066428ec86e..26da7dffb5a 100644 --- a/addons/website_google_map/models/res_partner.py +++ b/addons/website_google_map/models/res_partner.py @@ -13,16 +13,15 @@ class res_partner(osv.Model): data = { "counter": len(ids), "partners": [] - } + } for partner in self.pool.get('res.partner').browse(cr, uid, ids, context={'show_address': True}): data["partners"].append({ 'id': partner.id, 'name': partner.name, 'address': '\n'.join(partner.name_get()[0][1].split('\n')[1:]), - 'type': partner.grade_id.name, 'latitude': partner.partner_latitude, 'longitude': partner.partner_longitude, - }) + }) mime = 'application/json' body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {"))