From df2bed3c16617aa88f525cca9c95147690ad1638 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 31 Aug 2015 09:53:53 +0200
Subject: [PATCH] [FIX] website_customer: rename tag into website tag

Confusing since b51795e92405250132a59615b7adff2cb9b3c777

todo: merge 2 models?
---
 addons/website_customer/models/website_customer.py      | 4 ++--
 addons/website_customer/views/website_customer_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_customer/models/website_customer.py b/addons/website_customer/models/website_customer.py
index f84905e25c5..78c5b080cef 100644
--- a/addons/website_customer/models/website_customer.py
+++ b/addons/website_customer/models/website_customer.py
@@ -7,7 +7,7 @@ class res_partner(osv.Model):
     _inherit = 'res.partner'
 
     _columns = {
-        'tag_ids': fields.many2many('res.partner.tag', id1='partner_id', id2='tag_id', string='Tags'),
+        'website_tag_ids': fields.many2many('res.partner.tag', id1='partner_id', id2='tag_id', string='Website tags', oldname="tag_ids"),
     }
 
 
@@ -23,7 +23,7 @@ class res_partner_tags(osv.Model):
     _columns = {
         'name': fields.char('Category Name', required=True, translate=True),
         'partner_ids': fields.many2many('res.partner', 'res_partner_res_partner_tag_rel', id1='tag_id', id2='partner_id', string='Partners'),
-        'classname': fields.selection(get_selection_class, 'Class', help="Bootstrap class to customize the color of the tag", required=True),
+        'classname': fields.selection(get_selection_class, 'Class', help="Bootstrap class to customize the color", required=True),
         'active': fields.boolean('Active'),
     }
     _defaults = {
diff --git a/addons/website_customer/views/website_customer_view.xml b/addons/website_customer/views/website_customer_view.xml
index 7fc1f8bdc7c..9d7c9bb3e1b 100644
--- a/addons/website_customer/views/website_customer_view.xml
+++ b/addons/website_customer/views/website_customer_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='company_id']" position="after">
-                        <field name="tag_ids" widget="many2many_tags" string="Website Tags"/>
+                        <field name="website_tag_ids" widget="many2many_tags" string="Website Tags"/>
                     </xpath>
                 </data>
             </field>