diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-11-20 16:14:39 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-11-20 16:14:39 +0100 |
| commit | bbe50b786aadb5fe31e8397d7ff2cfac9e39db4d (patch) | |
| tree | c20a369564a4244d0ddb1971f9189fce83174722 /addons/project/project_data.xml | |
| parent | c26c178f98cec86de1591920eedb888c6fb4b67c (diff) | |
| parent | 40f974bfc181fd814e656a75866bbeb36f861f76 (diff) | |
[MERGE] [FIX] project: add noupdate on data to avoid erasing changes on stages, exclude mail.message.subtypes (want overwrite), courtesy of Alex Comba (Agile BG)
lp bug: https://launchpad.net/bugs/1172149 fixed
bzr revid: mat@openerp.com-20131120151439-96l2z98tebj46fzs
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 7bf1a623a2c..14142195400 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> @@ -78,7 +78,9 @@ <field name="case_default" eval="True"/> <field name="fold" 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> |