diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-24 15:45:33 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-24 15:45:33 +0200 |
| commit | 7a7d7febf8d51cdc693e77678fc9eaee3864b3b2 (patch) | |
| tree | d2bb635b1441f04267727e39a4bfbd219a4b7b6b /addons/gamification/data | |
| parent | 96b9d8b9d59dc7b240a096e6c6775c7a45ac88c4 (diff) | |
| parent | 52cfc16c2e2f33395a53b255825a8153ec80ce40 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
Diffstat (limited to 'addons/gamification/data')
| -rw-r--r-- | addons/gamification/data/badge.xml | 4 | ||||
| -rw-r--r-- | addons/gamification/data/cron.xml | 2 | ||||
| -rw-r--r-- | addons/gamification/data/goal_base.xml | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml index 33d02bf016e..cc9df921309 100644 --- a/addons/gamification/data/badge.xml +++ b/addons/gamification/data/badge.xml @@ -41,10 +41,6 @@ <field name="description">Badge Granted</field> </record> - </data> - - - <data noupdate="0"> <record id="email_template_badge_received" model="email.template"> <field name="name">Received Badge</field> diff --git a/addons/gamification/data/cron.xml b/addons/gamification/data/cron.xml index 8585771c97d..105f7d25681 100644 --- a/addons/gamification/data/cron.xml +++ b/addons/gamification/data/cron.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <openerp> - <data> + <data noupdate="1"> <record forcecreate="True" id="ir_cron_check_challenge" model="ir.cron"> <field name="name">Run Goal Challenge Checker</field> diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml index c12763025f6..f249e566b9f 100644 --- a/addons/gamification/data/goal_base.xml +++ b/addons/gamification/data/goal_base.xml @@ -90,10 +90,6 @@ ]]></field> </record> - </data> - - <data> - <!-- goal definitions --> <record model="gamification.goal.definition" id="definition_base_timezone"> <field name="name">Set your Timezone</field> |