From 52b14d5ee0e41ba4d409e4a2c789a9c0a79252c4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 14:21:13 +0200
Subject: [PATCH 1/3] [IMP] rename website_crm_partner_assign to
 website_worldmap

bzr revid: chm@openerp.com-20130829122113-uzau2huz0sb067f8
---
 addons/website_contract/__openerp__.py        |   2 +-
 .../views/website_contract.xml                |  19 ++++++++++--------
 addons/website_crm_partner_assign/__init__.py |   2 --
 addons/website_worldmap/__init__.py           |   2 ++
 .../__openerp__.py                            |   2 +-
 .../controllers/__init__.py                   |   0
 .../controllers/main.py                       |  16 +--------------
 .../static/src/img/partners.png               | Bin
 .../static/src/js/markerclusterer.js          |   0
 .../static/src/js/markerclusterer_compiled.js |   0
 .../static/src/js/worldmap.js                 |   2 +-
 .../views/worldmap.xml                        |   4 ++--
 .../website_worldmap.py}                      |   0
 13 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 addons/website_crm_partner_assign/__init__.py
 create mode 100644 addons/website_worldmap/__init__.py
 rename addons/{website_crm_partner_assign => website_worldmap}/__openerp__.py (81%)
 rename addons/{website_crm_partner_assign => website_worldmap}/controllers/__init__.py (100%)
 rename addons/{website_crm_partner_assign => website_worldmap}/controllers/main.py (78%)
 rename addons/{website_crm_partner_assign => website_worldmap}/static/src/img/partners.png (100%)
 rename addons/{website_crm_partner_assign => website_worldmap}/static/src/js/markerclusterer.js (100%)
 rename addons/{website_crm_partner_assign => website_worldmap}/static/src/js/markerclusterer_compiled.js (100%)
 rename addons/{website_crm_partner_assign => website_worldmap}/static/src/js/worldmap.js (94%)
 rename addons/{website_crm_partner_assign => website_worldmap}/views/worldmap.xml (81%)
 rename addons/{website_crm_partner_assign/website_crm_partner_assign.py => website_worldmap/website_worldmap.py} (100%)

diff --git a/addons/website_contract/__openerp__.py b/addons/website_contract/__openerp__.py
index 69444c4a028..d1b26a02470 100644
--- a/addons/website_contract/__openerp__.py
+++ b/addons/website_contract/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP Blog
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale', 'website_crm_partner_assign'],
+    'depends': ['website', 'sale', 'website_worldmap'],
     'data': [
         'views/website_contract.xml',
     ],
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index c5709b9dbc8..051752fe86c 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -36,7 +36,16 @@
                                 <t t-set="classname">pull-left</t>
                             </t>
                             <form action="/references/" method="get" class="navbar-search pull-right pagination">
-                                <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
+                                <input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
+                                <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
+                                    <t t-foreach="countries">
+                                        <t t-if="country_id">
+                                        <option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
+                                            <t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
+                                        </option>
+                                        </t>
+                                    </t>
+                                </select>
                             </form>
                         </div>
                     </div>
@@ -57,19 +66,13 @@
         </t>
     </template>
 
-    <template id="ref_country" inherit_id="website_contract.index" inherit_option_id="website_contract.index" name="Left Country Categories">
+    <template id="ref_country" inherit_id="website_contract.index" inherit_option_id="website_contract.index" name="Left World Map">
         <xpath expr="//div[@id='ref_content']" position="before">
             <div class="span4">
                 <ul class="nav nav-list">
                     <li class="nav-header">World Map</li>
                     <iframe t-attf-src="/worldmap/?width=320&amp;height=240&amp;partner_ids=#{ worldmap_partner_ids }&amp;partner_url=/references/"
                         style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
-                    <li class="nav-header">Location</li>
-                    <t t-foreach="countries">
-                        <li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''">
-                            <a t-attf-href="/references/#{ search_path }&amp;country=#{ country_id[0] }"><t t-esc="country_id[1]"/><small>(<t t-esc="country_id_count"/>)</small></a>
-                        </li>
-                    </t>
                 </ul>
             </div>
         </xpath>
diff --git a/addons/website_crm_partner_assign/__init__.py b/addons/website_crm_partner_assign/__init__.py
deleted file mode 100644
index 8fddc880d43..00000000000
--- a/addons/website_crm_partner_assign/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import controllers
-import website_crm_partner_assign
\ No newline at end of file
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_crm_partner_assign/__openerp__.py b/addons/website_worldmap/__openerp__.py
similarity index 81%
rename from addons/website_crm_partner_assign/__openerp__.py
rename to addons/website_worldmap/__openerp__.py
index 7ce09ad4e27..416f6ca45b2 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_worldmap/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP Website Worldmap
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'website_crm', 'crm_partner_assign'],
+    'depends': ['website', 'crm_partner_assign'],
     'data': [
         'views/worldmap.xml',
     ],
diff --git a/addons/website_crm_partner_assign/controllers/__init__.py b/addons/website_worldmap/controllers/__init__.py
similarity index 100%
rename from addons/website_crm_partner_assign/controllers/__init__.py
rename to addons/website_worldmap/controllers/__init__.py
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_worldmap/controllers/main.py
similarity index 78%
rename from addons/website_crm_partner_assign/controllers/main.py
rename to addons/website_worldmap/controllers/main.py
index 299be4fddca..2e8c203244a 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_worldmap/controllers/main.py
@@ -7,22 +7,8 @@ import simplejson
 import werkzeug.wrappers
 from datetime import datetime
 
-from urllib import quote_plus
-
 class contactus(http.Controller):
 
-    @http.route(['/crm/contactus'], type='http', auth="admin")
-    def contactus(self, *arg, **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 ''))
-        })
-        return website.render("website_crm.thanks", values)
-
     @http.route(['/worldmap/'], type='http', auth="admin")
     def worldmap(self, *arg, **post):
         website = request.registry['website']
@@ -31,7 +17,7 @@ class contactus(http.Controller):
         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)
+        return website.render("website_worldmap.worldmap", values)
 
     @http.route(['/worldmap/partners.json'], type='http', auth="admin")
     def worldmap_data(self, *arg, **post):
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 @@
     <script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script type="text/javascript" t-attf-src="/worldmap/partners.json?partner_ids=#{ partner_ids }"></script>
-    <script type="text/javascript" src="/website_crm_partner_assign/static/src/js/markerclusterer_compiled.js"></script>
+    <script type="text/javascript" src="/website_worldmap/static/src/js/markerclusterer_compiled.js"></script>
     <script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
-    <script type="text/javascript" src="/website_crm_partner_assign/static/src/js/worldmap.js"></script>
+    <script type="text/javascript" src="/website_worldmap/static/src/js/worldmap.js"></script>
   </head>
   <body>
     <div id="map" t-attf-style="width: #{ width }px; height:  #{ height }px"></div>
diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_worldmap/website_worldmap.py
similarity index 100%
rename from addons/website_crm_partner_assign/website_crm_partner_assign.py
rename to addons/website_worldmap/website_worldmap.py

From 9d93cd3958a204df31bf3cad0c629a971471ffd7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 15:00:40 +0200
Subject: [PATCH 2/3] [IMP] website_crm_partner_assign: create module: list of
 partner with a grade

bzr revid: chm@openerp.com-20130829130040-s4kyjakzwrmc9pt9
---
 addons/website_contract/controllers/main.py   |  16 ++-
 addons/website_contract/website_contract.py   |   1 -
 addons/website_crm_partner_assign/__init__.py |   2 +
 .../website_crm_partner_assign/__openerp__.py |  18 +++
 .../controllers/__init__.py                   |   1 +
 .../controllers/main.py                       |  80 +++++++++++
 .../views/website_crm_partner_assign.xml      | 126 ++++++++++++++++++
 .../website_crm_partner_assign.py             |  13 ++
 8 files changed, 250 insertions(+), 7 deletions(-)
 create mode 100644 addons/website_crm_partner_assign/__init__.py
 create mode 100644 addons/website_crm_partner_assign/__openerp__.py
 create mode 100644 addons/website_crm_partner_assign/controllers/__init__.py
 create mode 100644 addons/website_crm_partner_assign/controllers/main.py
 create mode 100644 addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
 create mode 100644 addons/website_crm_partner_assign/website_crm_partner_assign.py

diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index 359f2a2299e..af600cf1311 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -14,24 +14,28 @@ class website_contract(http.Controller):
         partner_obj = request.registry['res.partner']
         account_obj = request.registry['account.analytic.account']
 
-        domain = []
+        # check contracts
+        contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
+        contract_project_ids = [contract.partner_id.id 
+            for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id]
+        domain = ['|', ('id', "in", contract_project_ids), ('id', "child_of", contract_project_ids)]
+
         if post.get('search'):
             domain += ['|',
                 ('name', 'ilike', "%%%s%%" % post.get("search")), 
                 ('website_description', 'ilike', "%%%s%%" % post.get("search"))]
 
+
         # public partner profile
         partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
         worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
 
         if request.uid != website.get_public_user().id:
-            contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
-            contract_project_ids = [contract.partner_id.id 
-                for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id]
-            # search for check access rules
-            partner_ids += partner_obj.search(request.cr, request.uid, domain + ['|', ('id', "in", contract_project_ids), ('id', "child_of", contract_project_ids)])
+            # search without website_published
+            partner_ids += partner_obj.search(request.cr, request.uid, domain)
             partner_ids = list(set(partner_ids))
 
+
         # group by 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"))})
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/__init__.py b/addons/website_crm_partner_assign/__init__.py
new file mode 100644
index 00000000000..8fddc880d43
--- /dev/null
+++ b/addons/website_crm_partner_assign/__init__.py
@@ -0,0 +1,2 @@
+import controllers
+import website_crm_partner_assign
\ No newline at end of file
diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
new file mode 100644
index 00000000000..6dd9b5b5726
--- /dev/null
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -0,0 +1,18 @@
+{
+'name': 'Public Partners References',
+    'category': 'Website',
+    'summary': 'Publish Customer References',
+    'version': '1.0',
+    'description': """
+OpenERP Blog
+============
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website', 'website_worldmap'],
+    'data': [
+        '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
new file mode 100644
index 00000000000..8ee9bae18d9
--- /dev/null
+++ b/addons/website_crm_partner_assign/controllers/__init__.py
@@ -0,0 +1 @@
+import main
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
new file mode 100644
index 00000000000..fb9fe9f9f0d
--- /dev/null
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+
+import openerp
+from openerp.addons.web import http
+from openerp.tools.translate import _
+from openerp.addons.web.http import request
+import urllib
+
+class website_crm_partner_assign(http.Controller):
+
+    @http.route(['/partners/', '/partners/page/<int:page>/'], type='http', auth="public")
+    def partners(self, page=0, **post):
+        website = request.registry['website']
+        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_partner_assign.index", values)
+
+    @http.route(['/partners/<int:ref_id>/'], type='http', auth="public")
+    def partners_ref(self, ref_id=0, **post):
+        website = request.registry['website']
+        partner_obj = request.registry['res.partner']
+        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, [('id', '=', ref_id)])
+
+        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)
+
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..43987ed06ed
--- /dev/null
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+
+    <!-- Layout add nav and footer -->
+
+    <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
+        <xpath expr="//body/footer//a[@href='/page/website.aboutus']" position="after">
+            <li><a href="/partners/">Partners</a></li>
+        </xpath>
+    </template>
+
+    <!-- Page --> 
+
+    <template id="layout" name="Partners Layout">
+        <t t-call="website.layout">
+            <t t-set="title">Partners</t>
+            <div class="container">
+                <div class="row">
+                    <t t-raw="ref_content" />
+                </div>
+            </div>
+        </t>
+    </template>
+
+    <template id="index" name="Partners">
+        <t t-call="website_crm_partner_assign.layout">
+            <t t-set="ref_content">
+                <h1 class="span12 text-center">Want services on OpenERP?</h1>
+                <h2 class="span12 text-center">Contact a local partner</h2>
+                <div class="span12" id="ref_content">
+                    <div class='navbar navbar-inverse'>
+                        <div class='navbar-inner'>
+                            <t t-call="website.pager" >
+                                <t t-set="classname">pull-left</t>
+                            </t>
+                            <form action="/references/" method="get" class="navbar-search pull-right pagination">
+                                <input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
+                                <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
+                                    <t t-foreach="countries">
+                                        <t t-if="country_id">
+                                        <option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
+                                            <t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
+                                        </option>
+                                        </t>
+                                    </t>
+                                </select>
+                                <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
+                                    <t t-foreach="grades">
+                                        <t t-if="grade_id">
+                                        <option t-att-selected="searches.get('country') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
+                                            <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
+                                        </option>
+                                        </t>
+                                    </t>
+                                </select>
+                            </form>
+                        </div>
+                    </div>
+                    <div>
+                        <div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
+                            <a class="pull-left" t-attf-href="/references/#{ partner.id }/">
+                                <img class="media-object" t-att-src="partner.img('image_small')"/>
+                            </a>
+                            <div class="media-body">
+                                <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
+                                <a class="media-heading" t-attf-href="/references/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
+                                <div t-field="partner.website_short_description"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </t>
+        </t>
+    </template>
+
+    <template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
+        <xpath expr="//div[@id='ref_content']" position="before">
+            <div class="span4">
+                <ul class="nav nav-list">
+                    <li class="nav-header">World Map</li>
+                    <iframe t-attf-src="/worldmap/?width=320&amp;height=240&amp;partner_ids=#{ worldmap_partner_ids }&amp;partner_url=/references/"
+                        style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+                </ul>
+            </div>
+        </xpath>
+        <xpath expr="//div[@id='ref_content']" position="attributes">
+            <attribute name="class">span8</attribute>
+        </xpath>
+    </template>
+
+    <template id="details" name="Partner Detail">
+        <t t-call="website_crm_partner_assign.layout">
+            <t t-set="ref_content">
+                <t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
+                <h1 class="span12 text-center" t-field="partner_id.name"/>
+                <div class="span4">
+                    <div class="text-center">
+                        <img t-att-src="partner_id.img('image_medium')"/>
+                    </div>
+                        <address>
+                        <table style="margin: auto;" class="well">
+                            <colgroup>
+                                <col width="100"/>
+                                <col/>
+                            </colgroup>
+                            <tbody>
+                                <t t-set="address" t-value="'&lt;br/&gt;'.join(partner_id.name_get()[0][1].split('\n')[1:])"/>
+                                <tr t-if="address or editable"><th>Address</th><td class="span2" t-raw="address"/></tr>
+                                <tr t-if="partner_id.website or editable"><th>Website</th><td class="span2" t-field="partner_id.website"/></tr>
+                                <tr t-if="partner_id.phone or editable"><th>Tel</th><td class="span2" t-field="partner_id.phone"/></tr>
+                                <tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2" t-field="partner_id.mobile"/></tr>
+                                <tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2" t-field="partner_id.fax"/></tr>
+                                <tr t-if="partner_id.email or editable"><th>Email</th><td class="span2" t-field="partner_id.email"/></tr>
+                            </tbody>
+                        </table>
+                    </address>
+                </div>
+                <div class="span8 mt32" t-field="partner_id.website_description"/>
+            </t>
+        </t>
+    </template>
+
+ </data>
+</openerp>
diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_crm_partner_assign/website_crm_partner_assign.py
new file mode 100644
index 00000000000..1d89a2bdf4e
--- /dev/null
+++ b/addons/website_crm_partner_assign/website_crm_partner_assign.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        '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])

From 7d1f9886811e9c1582a4dce92f63d702f32244b1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 15:05:29 +0200
Subject: [PATCH 3/3] [FIX] website_crm_partner_assign: search

bzr revid: chm@openerp.com-20130829130529-t4ngwalol808nmm3
---
 .../views/website_crm_partner_assign.xml             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 43987ed06ed..68662bb908f 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
@@ -35,7 +35,7 @@
                             <t t-call="website.pager" >
                                 <t t-set="classname">pull-left</t>
                             </t>
-                            <form action="/references/" method="get" class="navbar-search pull-right pagination">
+                            <form action="/partners/" method="get" class="navbar-search pull-right pagination">
                                 <input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
                                 <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
                                     <t t-foreach="countries">
@@ -46,10 +46,10 @@
                                         </t>
                                     </t>
                                 </select>
-                                <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
+                                <select class="search-query span2 mt4" name="grade" t-if="len(countries) > 1" onchange="submit()">
                                     <t t-foreach="grades">
                                         <t t-if="grade_id">
-                                        <option t-att-selected="searches.get('country') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
+                                        <option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
                                             <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
                                         </option>
                                         </t>
@@ -60,12 +60,12 @@
                     </div>
                     <div>
                         <div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
-                            <a class="pull-left" t-attf-href="/references/#{ partner.id }/">
+                            <a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
                                 <img class="media-object" t-att-src="partner.img('image_small')"/>
                             </a>
                             <div class="media-body">
                                 <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
-                                <a class="media-heading" t-attf-href="/references/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
+                                <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
                                 <div t-field="partner.website_short_description"/>
                             </div>
                         </div>
@@ -80,7 +80,7 @@
             <div class="span4">
                 <ul class="nav nav-list">
                     <li class="nav-header">World Map</li>
-                    <iframe t-attf-src="/worldmap/?width=320&amp;height=240&amp;partner_ids=#{ worldmap_partner_ids }&amp;partner_url=/references/"
+                    <iframe t-attf-src="/worldmap/?width=320&amp;height=240&amp;partner_ids=#{ worldmap_partner_ids }&amp;partner_url=/partners/"
                         style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
                 </ul>
             </div>