From 558063ed4c18b1955a0b6f85bf44c3428023141e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 14:57:06 +0200 Subject: [PATCH 1/7] [IMP] website_customer: set explicit dependency to crvm_partner_assign; already present due to google_map, but explicit is better than implicit. --- addons/website_customer/__openerp__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/website_customer/__openerp__.py b/addons/website_customer/__openerp__.py index c0b620f78e1..c6d26dad04a 100644 --- a/addons/website_customer/__openerp__.py +++ b/addons/website_customer/__openerp__.py @@ -30,8 +30,9 @@ OpenERP Customer References """, 'author': 'OpenERP SA', 'depends': [ + 'crm_partner_assign', 'website_partner', - 'website_google_map' + 'website_google_map', ], 'demo': [ 'website_customer_demo.xml', From e9ce6f6f743c463aa0d878617e412e2dfcdd6915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 14:57:44 +0200 Subject: [PATCH 2/7] [FIX] website_partner: css styling, add margin under partner image, before address --- addons/website_partner/views/website_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml index 3a2466fb00b..32c1aa63bd3 100644 --- a/addons/website_partner/views/website_partner_view.xml +++ b/addons/website_partner/views/website_partner_view.xml @@ -23,7 +23,7 @@

-
+
+
+

Looking For a Local Store?

@@ -65,13 +71,6 @@

-
-
-
- -
-
-

No result found

@@ -91,6 +90,11 @@
@@ -118,7 +122,11 @@ @@ -130,5 +138,24 @@ + + From 93c4e0da57511eaab1d441cb29ae4d4016cae8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 16:28:55 +0200 Subject: [PATCH 4/7] [IMP] crm_partner_assign: added computed field counting the number of references of a partner. This allows to order / filter / do whatever you want with the number of references. --- .../crm_partner_assign/crm_partner_assign.py | 21 +++++++++++++++++++ .../crm_partner_assign/res_partner_view.xml | 1 + 2 files changed, 22 insertions(+) diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py index 046babccf73..317d1f289eb 100644 --- a/addons/crm_partner_assign/crm_partner_assign.py +++ b/addons/crm_partner_assign/crm_partner_assign.py @@ -53,6 +53,22 @@ class res_partner_activation(osv.osv): class res_partner(osv.osv): _inherit = "res.partner" + + def _get_implemented_count(self, cr, uid, ids, field_name, arg, context): + res = dict.fromkeys(ids, 0) + for partner in self.browse(cr, uid, ids, context=context): + res[partner.id] = len(partner.implemented_partner_ids) + return res + + def _get_partner_from_implementation(self, cr, uid, ids, context=None): + pids = set() + for partner in self.browse(cr, uid, ids, context=context): + pids.add(partner.id) + if partner.assigned_partner_id: + pids.add(partner.assigned_partner_id.id) + pids = pids | set([p.id for p in partner.implemented_partner_ids]) + return list(pids) + _columns = { 'partner_weight': fields.integer('Grade Weight', help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"), @@ -71,6 +87,11 @@ class res_partner(osv.osv): 'res.partner', 'assigned_partner_id', string='Implementation References', ), + 'implemented_count': fields.function( + _get_implemented_count, string="Implementations", type='integer', + store={ + 'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10), + }), } _defaults = { 'partner_weight': lambda *args: 0 diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index c298832a2e6..67ac508ef00 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -112,6 +112,7 @@ + From 2ed511855f41bf9f0780219abe5f540e859eea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 16:29:36 +0200 Subject: [PATCH 5/7] [IMP] website_partner_crm: display partners in a category ordered by descending number of references + some tweaking in the view. --- .../controllers/main.py | 2 +- .../views/website_crm_partner_assign.xml | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index c9621b7a0e9..86018ecd04d 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -101,7 +101,7 @@ class WebsiteCrmPartnerAssign(http.Controller): partner_ids = partner_obj.search( request.cr, SUPERUSER_ID, base_partner_domain, offset=pager['offset'], limit=self._references_per_page, - order="grade_id DESC, partner_weight DESC", + order="grade_id DESC, implemented_count DESC", context=request.context) google_map_partner_ids = ','.join(map(str, partner_ids)) partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context) 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 index aa617c266bf..0dbfcdb15fc 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -29,12 +29,6 @@
- -
-
- -
-

Looking For a Local Store?

@@ -70,7 +64,17 @@

-
+
+
+
+ +
+
+ +
+
+
+

No result found

@@ -90,9 +94,9 @@ From 2ece5f9c4cd010108d16f008d9ef40e66ff1bc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 16:47:12 +0200 Subject: [PATCH 6/7] [IMP] website_customer: add an offset on the main content of customer display --- addons/website_customer/views/website_customer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index a2a5fc99c16..a41d5b77f5a 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -25,7 +25,7 @@
-
+
From a6b92693988b8ebe424417c325afd1bca4194cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 16 May 2014 17:14:03 +0200 Subject: [PATCH 7/7] [REF] Achieved the same result with a sorting to avoid having to add a field in stable release --- .../crm_partner_assign/crm_partner_assign.py | 39 ++++++++++--------- .../controllers/main.py | 11 ++++-- .../views/website_crm_partner_assign.xml | 4 +- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py index 317d1f289eb..dac23ecae32 100644 --- a/addons/crm_partner_assign/crm_partner_assign.py +++ b/addons/crm_partner_assign/crm_partner_assign.py @@ -54,20 +54,22 @@ class res_partner_activation(osv.osv): class res_partner(osv.osv): _inherit = "res.partner" - def _get_implemented_count(self, cr, uid, ids, field_name, arg, context): - res = dict.fromkeys(ids, 0) - for partner in self.browse(cr, uid, ids, context=context): - res[partner.id] = len(partner.implemented_partner_ids) - return res + # uncomment me in trunk + # def _get_implemented_count(self, cr, uid, ids, field_name, arg, context): + # res = dict.fromkeys(ids, 0) + # for partner in self.browse(cr, uid, ids, context=context): + # res[partner.id] = len(partner.implemented_partner_ids) + # return res - def _get_partner_from_implementation(self, cr, uid, ids, context=None): - pids = set() - for partner in self.browse(cr, uid, ids, context=context): - pids.add(partner.id) - if partner.assigned_partner_id: - pids.add(partner.assigned_partner_id.id) - pids = pids | set([p.id for p in partner.implemented_partner_ids]) - return list(pids) + # uncomment me in trunk + # def _get_partner_from_implementation(self, cr, uid, ids, context=None): + # pids = set() + # for partner in self.browse(cr, uid, ids, context=context): + # pids.add(partner.id) + # if partner.assigned_partner_id: + # pids.add(partner.assigned_partner_id.id) + # pids = pids | set([p.id for p in partner.implemented_partner_ids]) + # return list(pids) _columns = { 'partner_weight': fields.integer('Grade Weight', @@ -87,11 +89,12 @@ class res_partner(osv.osv): 'res.partner', 'assigned_partner_id', string='Implementation References', ), - 'implemented_count': fields.function( - _get_implemented_count, string="Implementations", type='integer', - store={ - 'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10), - }), + # uncomment me in trunk + # 'implemented_count': fields.function( + # _get_implemented_count, string="Implementations", type='integer', + # store={ + # 'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10), + # }), } _defaults = { 'partner_weight': lambda *args: 0 diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 86018ecd04d..3dd96798d09 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -100,11 +100,14 @@ class WebsiteCrmPartnerAssign(http.Controller): # search partners matching current search parameters partner_ids = partner_obj.search( request.cr, SUPERUSER_ID, base_partner_domain, - offset=pager['offset'], limit=self._references_per_page, - order="grade_id DESC, implemented_count DESC", - context=request.context) - google_map_partner_ids = ','.join(map(str, partner_ids)) + order="grade_id DESC", + context=request.context) # todo in trunk: order="grade_id DESC, implemented_count DESC", offset=pager['offset'], limit=self._references_per_page partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context) + # remove me in trunk + partners.sort(key=lambda x: (-1 * (x.grade_id and x.grade_id.id or 0), len(x.implemented_partner_ids)), reverse=True) + partners = partners[pager['offset']:pager['offset'] + self._references_per_page] + + google_map_partner_ids = ','.join(map(str, [p.id for p in partners])) values = { 'countries': countries, 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 index 0dbfcdb15fc..b215a14e6cb 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -94,9 +94,9 @@