diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py index a267a7631c0..0923b6324de 100644 --- a/addons/base_contact/__terp__.py +++ b/addons/base_contact/__terp__.py @@ -22,7 +22,9 @@ """, "depends" : ["base"], "init_xml" : [], - "demo_xml" : ["base_contact_demo.xml"], + "demo_xml" : [ + "base_contact_demo.xml" + ], "update_xml" : [ "security/ir.model.access.csv", 'base_contact_view.xml' diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 00104813896..09cca7acdb6 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,326 +1,326 @@ - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 - - - - - - - - - - - + + + + + + + + + + + 5 - - - - - - + + + + + + 5 - - - - - - + + + + + + 1 - - + + diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 0ae8fda9eda..c06f6323392 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -35,7 +35,7 @@ - +
@@ -103,7 +103,7 @@ - + @@ -222,7 +222,7 @@ form - + diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 0b4720e4254..5491bde1c62 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -70,7 +70,7 @@ class project_project(osv.osv): def name_get(self, cr, user, ids, context=None): result = [] for project in self.browse(cr, user, ids, context): - if project.category_id: + if project.category_id and projet.category_id.code: result.append((project.id, '['+(project.category_id.code or '')+'] '+project.name)) else: result.append((project.id, '[?] '+project.name))