diff options
| author | Olivier Dony <odo@openerp.com> | 2013-11-21 16:42:05 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-11-21 16:42:05 +0100 |
| commit | 2cba6a535568471b29fed18bad6fda665ca5d1d1 (patch) | |
| tree | cd5fa321d4806d5a9e3a4dfc73d06344e17434f6 /addons/project/project_data.xml | |
| parent | d602f9de03a3ab45cc4a5494bd47748c8e538307 (diff) | |
| parent | 17144e9914eb21e42dcd287b794813ec1cb5ad20 (diff) | |
[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
Diffstat (limited to 'addons/project/project_data.xml')
| -rw-r--r-- | addons/project/project_data.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 1f49451a377..bc53c4a436f 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <!-- This will set the unit of measure used in projects and tasks.--> <record id="base.main_company" model="res.company"> <field name="project_time_mode_id" ref="product.product_uom_hour"></field> @@ -72,7 +72,9 @@ <field name="fold" eval="True"/> <field name="closed" eval="True"/> </record> + </data> + <data> <!-- Task-related subtypes for messaging / Chatter --> <record id="mt_task_new" model="mail.message.subtype"> <field name="name">Task Created</field> |