@@ -57,19 +66,13 @@
-
+
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py
index 1eab700456d..1d89a2bdf4e 100644
--- a/addons/website_contract/website_contract.py
+++ b/addons/website_contract/website_contract.py
@@ -5,7 +5,6 @@ from openerp.osv import osv, fields
class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
- 'website_published': fields.boolean('Available in the website'),
'website_description': fields.html('Description for the website'),
'website_short_description': fields.text('Sort description for the website'),
}
diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
index 7ce09ad4e27..6dd9b5b5726 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -1,17 +1,18 @@
{
- 'name': 'Website Worldmap',
+'name': 'Public Partners References',
'category': 'Website',
- 'summary': '',
+ 'summary': 'Publish Customer References',
'version': '1.0',
'description': """
-OpenERP Website Worldmap
-========================
+OpenERP Blog
+============
""",
'author': 'OpenERP SA',
- 'depends': ['website', 'website_crm', 'crm_partner_assign'],
+ 'depends': ['website', 'website_worldmap'],
'data': [
- 'views/worldmap.xml',
+ 'views/website_crm_partner_assign.xml',
],
+ 'qweb': ['static/src/xml/*.xml'],
'installable': True,
}
diff --git a/addons/website_crm_partner_assign/controllers/__init__.py b/addons/website_crm_partner_assign/controllers/__init__.py
index e11f9ba81bb..8ee9bae18d9 100644
--- a/addons/website_crm_partner_assign/controllers/__init__.py
+++ b/addons/website_crm_partner_assign/controllers/__init__.py
@@ -1,3 +1 @@
import main
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 299be4fddca..fb9fe9f9f0d 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -2,82 +2,79 @@
import openerp
from openerp.addons.web import http
+from openerp.tools.translate import _
from openerp.addons.web.http import request
-import simplejson
-import werkzeug.wrappers
-from datetime import datetime
+import urllib
-from urllib import quote_plus
+class website_crm_partner_assign(http.Controller):
-class contactus(http.Controller):
-
- @http.route(['/crm/contactus'], type='http', auth="admin")
- def contactus(self, *arg, **post):
+ @http.route(['/partners/', '/partners/page//'], type='http', auth="public")
+ def partners(self, page=0, **post):
website = request.registry['website']
- post['user_id'] = False
- request.registry['crm.lead'].create(request.cr, request.uid, post)
- values = website.get_rendering_context()
- company = values['res_company']
- values.update({
- 'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=8&size=298x298" % quote_plus('%s, %s %s, %s' % (company.street, company.city, company.zip, company.country_id and company.country_id.name_get()[0][1] or ''))
+ partner_obj = request.registry['res.partner']
+
+ def dom_without(without):
+ domain = [('grade_id', '!=', False)]
+ domain += openerp.SUPERUSER_ID != request.uid and [('website_published', '=', True)] or [(1, "=", 1)]
+ for key, search in domain_search.items():
+ if key != without:
+ domain += search
+ return domain
+
+ # search domains
+ domain_search = {}
+ if post.get('search'):
+ domain_search["search"] += ['|',
+ ('name', 'ilike', "%%%s%%" % post.get("search")),
+ ('website_description', 'ilike', "%%%s%%" % post.get("search"))]
+ if post.get("grade", "all") != 'all':
+ domain_search["grade"] = [("grade_id", "=", int(post.get("grade")))]
+ if post.get("country", "all") != 'all':
+ domain_search["country"] = [("country_id", "=", int(post.get("country")))]
+
+
+ # public partner profile
+ partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, dom_without(False) )
+ worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
+
+
+ # group by country
+ domain = dom_without("country")
+ countries = partner_obj.read_group(request.cr, request.uid, domain, ["id", "country_id"], groupby="country_id", orderby="country_id")
+ countries.insert(0, {'country_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))})
+
+ # group by grade
+ domain = dom_without("grade")
+ grades = partner_obj.read_group(request.cr, request.uid, domain, ["id", "grade_id"], groupby="grade_id", orderby="grade_id")
+ grades.insert(0, {'grade_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'grade_id': ("all", _("All Grade"))})
+
+
+ step = 20
+ pager = website.pager(url="/partners/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post)
+ partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
+
+
+ values = website.get_rendering_context({
+ 'countries': countries,
+ 'grades': grades,
+ 'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids),
+ 'worldmap_partner_ids': worldmap_partner_ids,
+ 'pager': pager,
+ 'searches': post,
+ 'search_path': "?%s" % urllib.urlencode(post),
})
- return website.render("website_crm.thanks", values)
+ return website.render("website_crm_partner_assign.index", values)
- @http.route(['/worldmap/'], type='http', auth="admin")
- def worldmap(self, *arg, **post):
- website = request.registry['website']
- values = website.get_rendering_context()
- values['partner_ids'] = post.get('partner_ids', "")
- values['width'] = post.get('width', 900)
- values['height'] = post.get('height', 460)
- values['partner_url'] = post.get('partner_url')
- return website.render("website_crm_partner_assign.worldmap", values)
-
- @http.route(['/worldmap/partners.json'], type='http', auth="admin")
- def worldmap_data(self, *arg, **post):
+ @http.route(['/partners//'], type='http', auth="public")
+ def partners_ref(self, ref_id=0, **post):
website = request.registry['website']
partner_obj = request.registry['res.partner']
-
- domain = [("id", "in", [int(p) for p in post.get('partner_ids', "").split(",") if p])]
- partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
+ partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_published', '=', True), ('id', '=', ref_id)])
if request.uid != website.get_public_user().id:
- partner_ids += partner_obj.search(request.cr, request.uid, domain)
- partner_ids = list(set(partner_ids))
+ partner_ids += partner_obj.search(request.cr, request.uid, [('id', '=', ref_id)])
- data = {
- "counter": len(partner_ids),
- "partners": []
- }
- for partner in partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_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,
- })
+ values = website.get_rendering_context({
+ 'partner_id': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids[0], context={'show_address': True}),
+ })
+ return website.render("website_crm_partner_assign.details", values)
- mime = 'application/json'
- body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {"))
- return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
-
- @http.route(['/worldmap/set_partner_position/'], type='http', auth="admin")
- def worldmap_set_partner_position(self, *arg, **post):
- website = request.registry['website']
- partner_obj = request.registry['res.partner']
-
- partner_id = post.get('partner_id') and int(post['partner_id'])
- latitude = post.get('latitude') and float(post['latitude'])
- longitude = post.get('longitude') and float(post['longitude'])
-
- if request.uid != website.get_public_user().id and partner_id and (latitude or longitude):
- values = {
- 'partner_latitude': latitude,
- 'partner_longitude': longitude,
- 'date_localization': datetime.now().strftime('%Y-%m-%d'),
- }
- partner_obj.write(request.cr, request.uid, [partner_id], values)
-
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
new file mode 100644
index 00000000000..68662bb908f
--- /dev/null
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+ Partners
+
+
+
+
+
+
+
+ Partners
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ span8
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_crm_partner_assign/website_crm_partner_assign.py
index 82d5390ec71..1d89a2bdf4e 100644
--- a/addons/website_crm_partner_assign/website_crm_partner_assign.py
+++ b/addons/website_crm_partner_assign/website_crm_partner_assign.py
@@ -5,5 +5,9 @@ from openerp.osv import osv, fields
class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
- 'website_published': fields.boolean('Available in the website'),
+ 'website_description': fields.html('Description for the website'),
+ 'website_short_description': fields.text('Sort description for the website'),
}
+
+ def img(self, cr, uid, ids, field='image_small', context=None):
+ return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
diff --git a/addons/website_worldmap/__init__.py b/addons/website_worldmap/__init__.py
new file mode 100644
index 00000000000..caea2afbd53
--- /dev/null
+++ b/addons/website_worldmap/__init__.py
@@ -0,0 +1,2 @@
+import controllers
+import website_worldmap
\ No newline at end of file
diff --git a/addons/website_worldmap/__openerp__.py b/addons/website_worldmap/__openerp__.py
new file mode 100644
index 00000000000..416f6ca45b2
--- /dev/null
+++ b/addons/website_worldmap/__openerp__.py
@@ -0,0 +1,17 @@
+{
+ 'name': 'Website Worldmap',
+ 'category': 'Website',
+ 'summary': '',
+ 'version': '1.0',
+ 'description': """
+OpenERP Website Worldmap
+========================
+
+ """,
+ 'author': 'OpenERP SA',
+ 'depends': ['website', 'crm_partner_assign'],
+ 'data': [
+ 'views/worldmap.xml',
+ ],
+ 'installable': True,
+}
diff --git a/addons/website_worldmap/controllers/__init__.py b/addons/website_worldmap/controllers/__init__.py
new file mode 100644
index 00000000000..e11f9ba81bb
--- /dev/null
+++ b/addons/website_worldmap/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_worldmap/controllers/main.py b/addons/website_worldmap/controllers/main.py
new file mode 100644
index 00000000000..2e8c203244a
--- /dev/null
+++ b/addons/website_worldmap/controllers/main.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+import openerp
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+import simplejson
+import werkzeug.wrappers
+from datetime import datetime
+
+class contactus(http.Controller):
+
+ @http.route(['/worldmap/'], type='http', auth="admin")
+ def worldmap(self, *arg, **post):
+ website = request.registry['website']
+ values = website.get_rendering_context()
+ values['partner_ids'] = post.get('partner_ids', "")
+ values['width'] = post.get('width', 900)
+ values['height'] = post.get('height', 460)
+ values['partner_url'] = post.get('partner_url')
+ return website.render("website_worldmap.worldmap", values)
+
+ @http.route(['/worldmap/partners.json'], type='http', auth="admin")
+ def worldmap_data(self, *arg, **post):
+ website = request.registry['website']
+ partner_obj = request.registry['res.partner']
+
+ domain = [("id", "in", [int(p) for p in post.get('partner_ids', "").split(",") if p])]
+ partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
+ if request.uid != website.get_public_user().id:
+ partner_ids += partner_obj.search(request.cr, request.uid, domain)
+ partner_ids = list(set(partner_ids))
+
+ data = {
+ "counter": len(partner_ids),
+ "partners": []
+ }
+ for partner in partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_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("}, {"))
+ return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
+
+ @http.route(['/worldmap/set_partner_position/'], type='http', auth="admin")
+ def worldmap_set_partner_position(self, *arg, **post):
+ website = request.registry['website']
+ partner_obj = request.registry['res.partner']
+
+ partner_id = post.get('partner_id') and int(post['partner_id'])
+ latitude = post.get('latitude') and float(post['latitude'])
+ longitude = post.get('longitude') and float(post['longitude'])
+
+ if request.uid != website.get_public_user().id and partner_id and (latitude or longitude):
+ values = {
+ 'partner_latitude': latitude,
+ 'partner_longitude': longitude,
+ 'date_localization': datetime.now().strftime('%Y-%m-%d'),
+ }
+ partner_obj.write(request.cr, request.uid, [partner_id], values)
+
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_crm_partner_assign/static/src/img/partners.png b/addons/website_worldmap/static/src/img/partners.png
similarity index 100%
rename from addons/website_crm_partner_assign/static/src/img/partners.png
rename to addons/website_worldmap/static/src/img/partners.png
diff --git a/addons/website_crm_partner_assign/static/src/js/markerclusterer.js b/addons/website_worldmap/static/src/js/markerclusterer.js
similarity index 100%
rename from addons/website_crm_partner_assign/static/src/js/markerclusterer.js
rename to addons/website_worldmap/static/src/js/markerclusterer.js
diff --git a/addons/website_crm_partner_assign/static/src/js/markerclusterer_compiled.js b/addons/website_worldmap/static/src/js/markerclusterer_compiled.js
similarity index 100%
rename from addons/website_crm_partner_assign/static/src/js/markerclusterer_compiled.js
rename to addons/website_worldmap/static/src/js/markerclusterer_compiled.js
diff --git a/addons/website_crm_partner_assign/static/src/js/worldmap.js b/addons/website_worldmap/static/src/js/worldmap.js
similarity index 94%
rename from addons/website_crm_partner_assign/static/src/js/worldmap.js
rename to addons/website_worldmap/static/src/js/worldmap.js
index 1dc91eb54fb..045cd2f28da 100644
--- a/addons/website_crm_partner_assign/static/src/js/worldmap.js
+++ b/addons/website_worldmap/static/src/js/worldmap.js
@@ -14,7 +14,7 @@ function initialize(pt) {
infoWindow.close();
});
- var partners = new google.maps.MarkerImage("/website_crm_partner_assign/static/src/img/partners.png",new google.maps.Size(25, 25));
+ var partners = new google.maps.MarkerImage("/website_worldmap/static/src/img/partners.png",new google.maps.Size(25, 25));
var markers = [];
diff --git a/addons/website_crm_partner_assign/views/worldmap.xml b/addons/website_worldmap/views/worldmap.xml
similarity index 81%
rename from addons/website_crm_partner_assign/views/worldmap.xml
rename to addons/website_worldmap/views/worldmap.xml
index 9e024982780..7b4c4bc4d91 100644
--- a/addons/website_crm_partner_assign/views/worldmap.xml
+++ b/addons/website_worldmap/views/worldmap.xml
@@ -28,9 +28,9 @@
-
+
-
+
diff --git a/addons/website_worldmap/website_worldmap.py b/addons/website_worldmap/website_worldmap.py
new file mode 100644
index 00000000000..82d5390ec71
--- /dev/null
+++ b/addons/website_worldmap/website_worldmap.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+class res_partner(osv.osv):
+ _inherit = 'res.partner'
+ _columns = {
+ 'website_published': fields.boolean('Available in the website'),
+ }
+
+
+
+ Want services on OpenERP?
+Contact a local partner
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ | Address | |
|---|---|
| Website | |
| Tel | |
| Tel | |
| Fax | |