Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-fix-user_story-dev-yani into lp:addons-vauxoo/7.0

  1. 7.0-fix-user_story-dev-yani
  2. Merge into 7.0
Proposed by Yanina Aular (Vauxoo)
Status: Merged
Merged at revision: 1000
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-fix-user_story-dev-yani
Merge into: lp:addons-vauxoo/7.0
Diff against target: 40 lines (+0/-12)
2 files modified
user_story/data/user_story_template.xml (+0/-2)
user_story/model/user_story.py (+0/-10)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-fix-user_story-dev-yani
Reviewer Review Type Date Requested Status
Yanina Aular (Vauxoo) Approve
Review via email: mp+215297@code.launchpad.net

Description of the change

Fix in user_story

To post a comment you must log in.
Revision history for this message
Yanina Aular (Vauxoo) (yanina-aular) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user_story/data/user_story_template.xml'
2--- user_story/data/user_story_template.xml 2014-03-26 20:23:50 +0000
3+++ user_story/data/user_story_template.xml 2014-04-10 20:37:13 +0000
4@@ -17,7 +17,6 @@
5 -->
6 <field name="mail_server_id">1</field>
7 <field name="email_to"></field>
8- <field name="sequence">5</field>
9 <field name="body_html"><![CDATA[
10 <html>
11 <head>
12@@ -502,7 +501,6 @@
13 <field name="auto_delete" eval="True"/>
14 <field name="mail_server_id">1</field>
15 <field name="email_to"></field>
16- <field name="sequence">5</field>
17 <field name="body_html"><![CDATA[
18 <html>
19 <head>
20
21=== modified file 'user_story/model/user_story.py'
22--- user_story/model/user_story.py 2014-03-26 19:54:15 +0000
23+++ user_story/model/user_story.py 2014-04-10 20:37:13 +0000
24@@ -185,16 +185,6 @@
25
26
27 return False
28-
29- def create(self, cr, uid, vals, context=None):
30- if context is None: context = {}
31- # Prevent double project creation when 'use_tasks' is checked!
32- context = dict(context, user_story_creation_in_progress=True)
33- context['name'] = "User Story / %s" % (vals['name'])
34- if vals.get('type', False) not in ('template','contract'):
35- vals['type'] = 'contract'
36- user_story_id = super(user_story, self).create(cr, uid, vals, context=context)
37- return user_story_id
38
39 _columns = {
40 'name': fields.char('Title', size=255, required=True, readonly=False,