From 8c31ecd368f499b0217403283510519f107a8cae Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Mon, 17 Aug 2015 16:52:29 +0200
Subject: [PATCH] [REV] website_crm,website_sale: revert afc9507

The website_crm module doesn't depend on website_sale, so the
salesteam_id field may not exist on website in contactus.

There is clearly a strange overlap with the website salesteam
between website_crm and website_sale, as indicated by the xml_id's.

The previous version didn't crash when the xml_id was not found,
though, while this one would always crash when you try to use
website_crm without website_sale, so I prefer to revert it.

A proper fix would be to set the salesteam at the level of the
website module, but I'm not sure it would make sense considering
that it wouldn't be used at all unless you happen to install one
of those two modules.

In the meantime, I'm reverting afc9507f3a210e41f37304fb17c681873eeeb1fd.
---
 addons/website_crm/controllers/main.py  | 2 +-
 addons/website_sale/controllers/main.py | 2 +-
 addons/website_sale/data/data.xml       | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 44f1fa8efc0..3b1b2e1d803 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -61,7 +61,7 @@ class contactus(http.Controller):
         values = {}
 
         values['medium_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'crm.crm_medium_website')
-        values['team_id'] = request.website.salesteam_id.id
+        values['team_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'website.salesteam_website_sales')
 
         for field_name, field_value in kwargs.items():
             if hasattr(field_value, 'filename'):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index d35ef34f3c1..23b7bda4103 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -574,7 +574,7 @@ class website_sale(http.Controller):
             orm_partner.write(cr, SUPERUSER_ID, [partner_id], billing_info, context=context)
         else:
             # create partner
-            billing_info['team_id'] = request.website.salesteam_id.id
+            billing_info['team_id'] = request.registry.get('ir.model.data').xmlid_to_res_id(cr, uid, 'website.salesteam_website_sales')
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
         # create a new shipping partner
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index e0eaeec4b5a..8a77cd46d58 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -33,11 +33,6 @@
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
             <field name="use_quotations" eval="False"/>
         </record>
-
-        <record model="website" id="website.default_website">
-            <field name="salesteam_id" ref="website.salesteam_website_sales"/>
-        </record>
-
         <record id="wlist0" model="website_pricelist">
             <field name="selectable" eval="True" />
             <field name="website_id" ref="website.default_website" />