[ADD] *: add color field on tags

12 files changed, 28 insertions, 1 deletions

diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index d9abc569738..54832597a49 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -34,6 +34,7 @@ class AccountAccountTag(models.Model):
 
     name = fields.Char(required=True)
     applicability = fields.Selection([('accounts', 'Accounts'), ('taxes', 'Taxes')], required=True, default='accounts')
+    color = fields.Integer('Color Index')
 
 #----------------------------------------------------------
 # Accounts
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index e5cd683fc59..35ec3a0992b 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -8,6 +8,7 @@ class account_analytic_tag(models.Model):
     _name = 'account.analytic.tag'
     _description = 'Analytic Tags'
     name = fields.Char(string='Analytic Tag', index=True, required=True)
+    color = fields.Integer('Color Index')
 
 
 class account_analytic_account(models.Model):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7970a2c933b..dae722e70ac 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1213,6 +1213,7 @@ class crm_lead_tag(osv.Model):
     _description = "Category of lead"
     _columns = {
         'name': fields.char('Name', required=True),
+        'color': fields.integer('Color Index'),
         'team_id': fields.many2one('crm.team', 'Sales Team'),
     }
     _sql_constraints = [
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 8299a6aaed5..0b8519ef30a 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -6,34 +6,42 @@
         <record model="crm.lead.tag" id="categ_oppor1">
             <field name="name">Product</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="1"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor2">
             <field name="name">Software</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="2"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor3">
             <field name="name">Services</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="3"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor4">
             <field name="name">Information</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="4"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor5">
             <field name="name">Design</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="5"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor6">
             <field name="name">Training</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="6"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor7">
             <field name="name">Consulting</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="7"/>
         </record>
         <record model="crm.lead.tag" id="categ_oppor8">
             <field name="name">Other</field>
             <field name="team_id" ref="sales_team.team_sales_department"/>
+            <field name="color" eval="8"/>
         </record>
 
         <!--  Demo Leads -->
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 679c9dcedb1..ed21c793d48 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -48,6 +48,7 @@
                     <group>
                         <field name="name"/>
                         <field name="team_id"/>
+                        <field name="color"/>
                     </group>
                 </form>
             </field>
@@ -60,6 +61,7 @@
                 <tree string="Sales Tags">
                     <field name="name"/>
                     <field name="team_id"/>
+                    <field name="color"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index d403c0a955a..877e7eb31f9 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -78,6 +78,7 @@ class fleet_vehicle_tag(osv.Model):
     _name = 'fleet.vehicle.tag'
     _columns = {
         'name': fields.char('Name', required=True),
+        'color': fields.integer('Color Index'),
     }
     _sql_constraints = [
             ('name_uniq', 'unique (name)', "Tag name already exists !"),
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
index 2336c589cf3..85f4f603207 100644
--- a/addons/fleet/fleet_data.xml
+++ b/addons/fleet/fleet_data.xml
@@ -418,34 +418,42 @@
 
       <record id="vehicle_tag_junior" model="fleet.vehicle.tag" >
         <field name="name">Junior</field>
+        <field name="color" eval="1"/>
       </record>
 
       <record id="vehicle_tag_senior" model="fleet.vehicle.tag" >
         <field name="name">Senior</field>
+        <field name="color" eval="2"/>
       </record>
 
       <record id="vehicle_tag_leasing" model="fleet.vehicle.tag" >
         <field name="name">Employee Car</field>
+        <field name="color" eval="3"/>
       </record>
 
       <record id="vehicle_tag_purchased" model="fleet.vehicle.tag" >
         <field name="name">Purchased</field>
+        <field name="color" eval="4"/>
       </record>
 
       <record id="vehicle_tag_compact" model="fleet.vehicle.tag" >
         <field name="name">Compact</field>
+        <field name="color" eval="5"/>
       </record>
 
       <record id="vehicle_tag_sedan" model="fleet.vehicle.tag" >
         <field name="name">Sedan</field>
+        <field name="color" eval="6"/>
       </record>
 
       <record id="vehicle_tag_convertible" model="fleet.vehicle.tag" >
         <field name="name">Convertible</field>
+        <field name="color" eval="7"/>
       </record>
 
       <record id="vehicle_tag_break" model="fleet.vehicle.tag" >
         <field name="name">Break</field>
+        <field name="color" eval="8"/>
       </record>
 
       <record id="model_corsa" model="fleet.vehicle.model">
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 77952ff1530..0a2ac691a0a 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -47,6 +47,7 @@
         <!-- Create campaign and mailings -->
         <record id="mass_mail_tag_1" model="mail.mass_mailing.tag">
             <field name="name">Marketing</field>
+            <field name="color" eval="1"/>
         </record>
         <record id="mass_mail_campaign_1" model="mail.mass_mailing.campaign">
             <field name="name">Newsletter</field>
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 10b2a22f11f..0e597755f20 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -20,6 +20,7 @@ class MassMailingTag(osv.Model):
 
     _columns = {
         'name': fields.char('Name', required=True),
+        'color': fields.integer('Color Index'),
     }
     _sql_constraints = [
             ('name_uniq', 'unique (name)', "Tag name already exists !"),
diff --git a/addons/note/note.py b/addons/note/note.py
index be2a51ceb46..98055143ee3 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -26,7 +26,8 @@ class note_tag(osv.osv):
     _name = "note.tag"
     _description = "Note Tag"
     _columns = {
-        'name' : fields.char('Tag Name', required=True),
+        'name': fields.char('Tag Name', required=True),
+        'color': fields.integer('Color Index'),
     }
     _sql_constraints = [
             ('name_uniq', 'unique (name)', "Tag name already exists !"),
diff --git a/addons/project/project.py b/addons/project/project.py
index cd8aadb5ba5..9f4358fadf4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1013,6 +1013,7 @@ class project_tags(osv.Model):
     _description = "Tags of project's tasks, issues..."
     _columns = {
         'name': fields.char('Name', required=True),
+        'color': fields.integer('Color Index'),
     }
     _sql_constraints = [
             ('name_uniq', 'unique (name)', "Tag name already exists !"),
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index b4169fec188..a0459eb6c00 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -186,6 +186,7 @@
 
         <record id="project_tag_data" model="project.tags">
             <field name="name">NeedAssistance</field>
+            <field name="color" eval="5"/>
         </record>
 
         <record id="project_task_data_6" model="project.task">