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
=== modified file 'user_story/data/user_story_template.xml'
--- user_story/data/user_story_template.xml 2014-03-26 20:23:50 +0000
+++ user_story/data/user_story_template.xml 2014-04-10 20:37:13 +0000
@@ -17,7 +17,6 @@
17 -->17 -->
18 <field name="mail_server_id">1</field>18 <field name="mail_server_id">1</field>
19 <field name="email_to"></field>19 <field name="email_to"></field>
20 <field name="sequence">5</field>
21 <field name="body_html"><![CDATA[20 <field name="body_html"><![CDATA[
22<html>21<html>
23 <head>22 <head>
@@ -502,7 +501,6 @@
502 <field name="auto_delete" eval="True"/>501 <field name="auto_delete" eval="True"/>
503 <field name="mail_server_id">1</field>502 <field name="mail_server_id">1</field>
504 <field name="email_to"></field>503 <field name="email_to"></field>
505 <field name="sequence">5</field>
506 <field name="body_html"><![CDATA[504 <field name="body_html"><![CDATA[
507<html>505<html>
508 <head>506 <head>
509507
=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py 2014-03-26 19:54:15 +0000
+++ user_story/model/user_story.py 2014-04-10 20:37:13 +0000
@@ -185,16 +185,6 @@
185185
186186
187 return False187 return False
188
189 def create(self, cr, uid, vals, context=None):
190 if context is None: context = {}
191 # Prevent double project creation when 'use_tasks' is checked!
192 context = dict(context, user_story_creation_in_progress=True)
193 context['name'] = "User Story / %s" % (vals['name'])
194 if vals.get('type', False) not in ('template','contract'):
195 vals['type'] = 'contract'
196 user_story_id = super(user_story, self).create(cr, uid, vals, context=context)
197 return user_story_id
198 188
199 _columns = {189 _columns = {
200 'name': fields.char('Title', size=255, required=True, readonly=False,190 'name': fields.char('Title', size=255, required=True, readonly=False,