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 @@
Product
+
Software
+
Services
+
Information
+
Design
+
Training
+
Consulting
+
Other
+
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 @@
+
@@ -60,6 +61,7 @@
+
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 @@
Junior
+
Senior
+
Employee Car
+
Purchased
+
Compact
+
Sedan
+
Convertible
+
Break
+
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 @@
Marketing
+
Newsletter
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 @@
NeedAssistance
+
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 2196d50c4c5..b35a40fb28d 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -84,6 +84,7 @@ class res_groups(osv.osv):
'view_access': fields.many2many('ir.ui.view', 'ir_ui_view_group_rel', 'group_id', 'view_id', 'Views'),
'comment' : fields.text('Comment', size=250, translate=True),
'category_id': fields.many2one('ir.module.category', 'Application', select=True),
+ 'color': fields.integer('Color Index'),
'full_name': fields.function(_get_full_name, type='char', string='Group Name', fnct_search=_search_group),
'share': fields.boolean('Share Group',
help="Group created to set access rights for sharing data with some users.")
diff --git a/openerp/addons/test_new_api/models.py b/openerp/addons/test_new_api/models.py
index bc07f360e9f..d98b0562b23 100644
--- a/openerp/addons/test_new_api/models.py
+++ b/openerp/addons/test_new_api/models.py
@@ -80,6 +80,7 @@ class Category(models.Model):
_name = 'test_new_api.category'
name = fields.Char(required=True)
+ color = fields.Integer('Color Index')
parent = fields.Many2one('test_new_api.category')
display_name = fields.Char(compute='_compute_display_name', inverse='_inverse_display_name')
dummy = fields.Char(store=False)