Merge lp:~vauxoo/addons-vauxoo/7.0-user_story-rev3-kty into lp:addons-vauxoo/7.0

[Katherine Zaoral (Vauxoo)]

[MERGE] module user story misspelling error and translation strings fixed, also update the pot template

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

I tested locally and LGTM

review: Approve

=== modified file 'user_story/i18n/user_story.pot'
--- user_story/i18n/user_story.pot	2014-03-01 07:53:36 +0000
+++ user_story/i18n/user_story.pot	2014-03-06 14:27:56 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-01 07:22+0000\n"
-"PO-Revision-Date: 2014-03-01 07:22+0000\n"
+"POT-Creation-Date: 2014-03-06 14:23+0000\n"
+"PO-Revision-Date: 2014-03-06 14:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -39,11 +39,6 @@
 
 #. module: user_story
 #: view:user.story:0
-msgid "Add a asumptions here ..."
-msgstr ""
-
-#. module: user_story
-#: view:user.story:0
 msgid "Progress"
 msgstr ""
 
@@ -58,6 +53,12 @@
 msgstr ""
 
 #. module: user_story
+#: view:user.story:0
+msgid "The link to the project, all projects listed here\n"
+"                    are of the lower level available in the Master WBS."
+msgstr ""
+
+#. module: user_story
 #: model:acceptability.criteria,name:user_story.ac_21
 msgid "criterion 2.1"
 msgstr ""
@@ -68,6 +69,11 @@
 msgstr ""
 
 #. module: user_story
+#: help:acceptability.criteria,accepted:0
+msgid "Check if this criterion apply"
+msgstr ""
+
+#. module: user_story
 #: model:ir.actions.act_window,name:user_story.action_user_story_priority
 #: model:ir.ui.menu,name:user_story.menu_config_user_story_priority
 #: view:user.story:0
@@ -78,6 +84,7 @@
 #. module: user_story
 #: view:acceptability.criteria:0
 #: model:ir.actions.act_window,name:user_story.action_acceptability_criteria
+#: model:ir.model,name:user_story.model_acceptability_criteria
 #: model:ir.ui.menu,name:user_story.menu_acceptability_criteria
 #: view:user.story:0
 #: field:user.story,accep_crit_ids:0
@@ -102,6 +109,11 @@
 msgstr ""
 
 #. module: user_story
+#: model:acceptability.criteria,scenario:user_story.ac_31
+msgid "sc 3.1"
+msgstr ""
+
+#. module: user_story
 #: field:user.story,message_ids:0
 msgid "Messages"
 msgstr ""
@@ -116,6 +128,11 @@
 msgstr ""
 
 #. module: user_story
+#: view:user.story:0
+msgid "Add assumptions here ..."
+msgstr ""
+
+#. module: user_story
 #: view:acceptability.criteria:0
 #: field:acceptability.criteria,user_id:0
 #: help:acceptability.criteria,user_id:0
@@ -134,16 +151,6 @@
 msgstr ""
 
 #. module: user_story
-#: view:user.story:0
-msgid "Add a Implementation Conclusions here ..."
-msgstr ""
-
-#. module: user_story
-#: view:acceptability.criteria:0
-msgid "Acceptabilit Criterion summary..."
-msgstr ""
-
-#. module: user_story
 #: model:acceptability.criteria,name:user_story.ac_12
 msgid "criterion 1.2"
 msgstr ""
@@ -171,11 +178,6 @@
 msgstr ""
 
 #. module: user_story
-#: view:user.story:0
-msgid "2.- Project related"
-msgstr ""
-
-#. module: user_story
 #: view:project.task:0
 #: field:user.story,planned_hours:0
 msgid "Planned Hours"
@@ -187,8 +189,13 @@
 msgstr ""
 
 #. module: user_story
-#: model:ir.model,name:user_story.model_acceptability_criteria
-msgid "acceptability.criteria"
+#: view:user.story:0
+msgid "Here in the description, you must be as explícit as you can,\n"
+"                    Remember you can upload a Youtube video, and insert \n"
+"                    directly here, embeded as a webpage, you can use vimeo and \n"
+"                    other elements as images, diagrams (using some \n"
+"                    online services) you just must copy and paste the embeded code,\n"
+"                    you can see an example about how to do that"
 msgstr ""
 
 #. module: user_story
@@ -207,11 +214,6 @@
 msgstr ""
 
 #. module: user_story
-#: view:project.project:0
-msgid "Add Description .."
-msgstr ""
-
-#. module: user_story
 #: selection:user.story,state:0
 msgid "New"
 msgstr ""
@@ -222,14 +224,24 @@
 msgstr ""
 
 #. module: user_story
+#: view:user.story:0
+msgid "6.- Assumptions"
+msgstr ""
+
+#. module: user_story
+#: selection:acceptability.criteria,difficulty:0
+msgid "Medium"
+msgstr ""
+
+#. module: user_story
 #: model:ir.actions.act_window,name:user_story.action_my_user_story
 #: model:ir.ui.menu,name:user_story.menu_action_my_user_story
-msgid "My User Stories Exc"
+msgid "My User Stories to Execute"
 msgstr ""
 
 #. module: user_story
-#: selection:acceptability.criteria,difficulty:0
-msgid "Medium"
+#: field:user.story,asumption:0
+msgid "Assumptions"
 msgstr ""
 
 #. module: user_story
@@ -282,13 +294,6 @@
 
 #. module: user_story
 #: view:user.story:0
-msgid "the link to the project, all projects listed here\n"
-"                    are of the lower level available in the Master WBS. This\n"
-"                    represent thumbs in your wbs"
-msgstr ""
-
-#. module: user_story
-#: view:user.story:0
 #: field:user.story,task_ids:0
 msgid "Tasks"
 msgstr ""
@@ -306,8 +311,13 @@
 msgstr ""
 
 #. module: user_story
-#: model:ir.model,name:user_story.model_user_story_priority
-msgid "user.story.priority"
+#: help:user.story,user_execute_id:0
+msgid "Person responsible for user story takes place, either by delegating work to other human resource or running it by itself. For delegate work should monitor the proper implementation of associated activities."
+msgstr ""
+
+#. module: user_story
+#: help:project.task,branch_to_clone:0
+msgid "Source branch to be clone and make merge proposal"
 msgstr ""
 
 #. module: user_story
@@ -331,12 +341,7 @@
 #: field:acceptability.criteria,user_execute_id:0
 #: help:acceptability.criteria,user_execute_id:0
 #: field:user.story,user_execute_id:0
-msgid "Responsible Execution"
-msgstr ""
-
-#. module: user_story
-#: view:user.story:0
-msgid "Add a other info here ..."
+msgid "Execution Responsible"
 msgstr ""
 
 #. module: user_story
@@ -350,8 +355,8 @@
 msgstr ""
 
 #. module: user_story
-#: field:user.story,asumption:0
-msgid "Asumptions"
+#: view:user.story:0
+msgid "Add another info here ..."
 msgstr ""
 
 #. module: user_story
@@ -380,6 +385,7 @@
 #: field:acceptability.criteria,accep_crit_id:0
 #: model:ir.actions.act_window,name:user_story.act_project_project_users_story_all
 #: model:ir.actions.report.xml,name:user_story.report_user_story
+#: model:ir.model,name:user_story.model_user_story
 #: model:ir.module.category,name:user_story.module_user_story
 #: model:ir.ui.menu,name:user_story.menu_conf_user_story
 #: model:ir.ui.menu,name:user_story.menu_user_story
@@ -417,11 +423,6 @@
 msgstr ""
 
 #. module: user_story
-#: help:user.story,user_id:0
-msgid "Person responsible for interacting with the client to give details of the progress or completion of the User History, in some cases also the supervisor for the correct execution of the user story."
-msgstr ""
-
-#. module: user_story
 #: selection:acceptability.criteria,difficulty:0
 msgid "Not Apply"
 msgstr ""
@@ -449,8 +450,18 @@
 msgstr ""
 
 #. module: user_story
-#: model:acceptability.criteria,scenario:user_story.ac_31
-msgid "sc 3.1"
+#: help:project.project,descriptions:0
+msgid "Reference on what the project is about"
+msgstr ""
+
+#. module: user_story
+#: help:user.story,user_id:0
+msgid "Person responsible for interacting with the client to give details of the progress or completion of the User Story, in some cases also the supervisor for the correct execution of the user story."
+msgstr ""
+
+#. module: user_story
+#: model:ir.model,name:user_story.model_user_story_priority
+msgid "User Story Priority Level"
 msgstr ""
 
 #. module: user_story
@@ -479,11 +490,6 @@
 msgstr ""
 
 #. module: user_story
-#: help:user.story,user_execute_id:0
-msgid "Person responsible for user story takes place, either by delegating work to other human capital or running it by itself. For delegate work should monitor the proper implementation of associated activities."
-msgstr ""
-
-#. module: user_story
 #: field:project.task,branch_to_clone:0
 msgid "Branch to clone"
 msgstr ""
@@ -529,15 +535,15 @@
 
 #. module: user_story
 #: view:user.story:0
+msgid "Add Implementation Conclusions here ..."
+msgstr ""
+
+#. module: user_story
+#: view:user.story:0
 msgid "Details"
 msgstr ""
 
 #. module: user_story
-#: help:project.task,branch_to_clone:0
-msgid "Branch source for clone and make merge proposal"
-msgstr ""
-
-#. module: user_story
 #: field:acceptability.criteria,development:0
 msgid "Development"
 msgstr ""
@@ -566,13 +572,23 @@
 msgstr ""
 
 #. module: user_story
+#: view:acceptability.criteria:0
+msgid "Acceptability Criterion summary..."
+msgstr ""
+
+#. module: user_story
 #: help:project.task,userstory_id:0
 msgid "Set here the User Story related with this task"
 msgstr ""
 
 #. module: user_story
-#: help:project.project,descriptions:0
-msgid "reference on what the project is about"
+#: view:user.story:0
+msgid "2.- Related Project"
+msgstr ""
+
+#. module: user_story
+#: view:project.project:0
+msgid "Add Description..."
 msgstr ""
 
 #. module: user_story
@@ -611,16 +627,6 @@
 msgstr ""
 
 #. module: user_story
-#: view:user.story:0
-msgid "Here in the description, you must be as explícit as you can,\n"
-"                    Remember you can upload a Youtube video, and insert \n"
-"                    directly here, embeded as a webpage, you can use vimeo and \n"
-"                    other elements as images, diagrams (using some \n"
-"                    online services) you just must copy and paste the embebed code,\n"
-"                    you can see an example about how to do that"
-msgstr ""
-
-#. module: user_story
 #: model:acceptability.criteria,name:user_story.ac_31
 msgid "criterion 3.1"
 msgstr ""
@@ -663,24 +669,9 @@
 msgstr ""
 
 #. module: user_story
-#: model:ir.model,name:user_story.model_user_story
-msgid "Email Thread"
-msgstr ""
-
-#. module: user_story
-#: view:user.story:0
-msgid "6.- Asumptions"
-msgstr ""
-
-#. module: user_story
 #: view:acceptability.criteria:0
 #: field:acceptability.criteria,sk_id:0
 #: view:user.story:0
 msgid "Sprint"
 msgstr ""
 
-#. module: user_story
-#: help:acceptability.criteria,accepted:0
-msgid "Chek if this criteria apply"
-msgstr ""
-

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2014-02-28 03:22:52 +0000
+++ user_story/model/user_story.py	2014-03-06 14:27:56 +0000
@@ -35,6 +35,7 @@
     """
 
     _name = 'user.story'
+    _description = 'User Story'
     _inherit = ['mail.thread']
 
     def _get_tasks(self, cr, uid, ids, field_name, arg, context=None):
@@ -104,10 +105,15 @@
             'Priority Level',
             help=('User story level priority, used to define priority for'
                   ' each user story')), 
-        'asumption': fields.text('Asumptions', translate=True),
+        'asumption': fields.text('Assumptions', translate=True),
         'date': fields.date('Date'),
-        'user_id': fields.many2one('res.users', 'Responsible Supervisor',help="Person responsible for interacting with the client to give details of the progress or completion of the User History, in some cases also the supervisor for the correct execution of the user story."),
-        'user_execute_id': fields.many2one('res.users', 'Responsible Execution',help="Person responsible for user story takes place, either by delegating work to other human capital or running it by itself. For delegate work should monitor the proper implementation of associated activities."),
+        'user_id': fields.many2one(
+            'res.users', 'Responsible Supervisor',
+            help=("Person responsible for interacting with the client to give"
+                  " details of the progress or completion of the User Story,"
+                  " in some cases also the supervisor for the correct"
+                  " execution of the user story.")),
+        'user_execute_id': fields.many2one('res.users', 'Execution Responsible',help="Person responsible for user story takes place, either by delegating work to other human resource or running it by itself. For delegate work should monitor the proper implementation of associated activities."),
         'sk_id': fields.many2one('sprint.kanban', 'Sprint Kanban'),
         'state': fields.selection(_US_STATE, 'State', readonly=True),
         'task_ids': fields.function(_get_tasks, type='many2many',
@@ -153,6 +159,7 @@
     """
 
     _name = 'user.story.priority'
+    _description = "User Story Priority Level"
     _columns = {
         'name': fields.char('Name', size=255, required=True),
     }
@@ -164,6 +171,7 @@
     """
 
     _name = 'acceptability.criteria'
+    _description = 'Acceptability Criteria'
 
     def _get_ac_ids_by_us_ids(self, cr, uid, us_ids, context=None):
         """
@@ -203,7 +211,7 @@
                                          'User Story',
                                          required=True),
         'accepted': fields.boolean('Accepted',
-                                   help='Chek if this criteria apply'),
+                                   help='Check if this criterion apply'),
         'development': fields.boolean('Development'),
         'difficulty': fields.selection(
             [('low','Low'),
@@ -255,8 +263,8 @@
             _get_user_story_field,
             type="many2one",
             relation="res.users",
-            string='Responsible Execution',
-            help='Responsible Execution',
+            string='Execution Responsible',
+            help='Execution Responsible',
             store={
                 'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
                 'user.story': (_get_ac_ids_by_us_ids, ['user_execute_id'], 20),
@@ -302,8 +310,7 @@
                                         #domain="[('sk_id', '=', sprint_id)]",
                                         help="Set here the User Story related with this task"),
         'branch_to_clone':fields.char('Branch to clone', 512,
-                                      help='Branch source for clone and'
-                                           ' make merge proposal'), 
+            help='Source branch to be clone and make merge proposal'), 
         
     }
 class inherit_project(osv.Model):
@@ -314,6 +321,5 @@
 
     _columns = {
             'descriptions':fields.text('Description',
-                                       help="reference on what the project "
-                                            "is about"),
+                help="Reference on what the project is about"),
             }

=== modified file 'user_story/view/project_view.xml'
--- user_story/view/project_view.xml	2014-02-17 01:03:49 +0000
+++ user_story/view/project_view.xml	2014-03-06 14:27:56 +0000
@@ -57,7 +57,7 @@
                 <field name="arch" type="xml">
                         <xpath expr="//page[last()]" position="after">
                             <page string="Description">
-                                <field name="descriptions" widget="html" attrs="{'readonly':[('state','=','done')]}" placeholder="Add Description .." />
+                                <field name="descriptions" widget="html" attrs="{'readonly':[('state','=','done')]}" placeholder="Add Description..." />
                             </page>
                         </xpath>
                         <xpath expr="//div[@name='buttons']" > 

=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2014-02-28 03:11:04 +0000
+++ user_story/view/userstory_view.xml	2014-03-06 14:27:56 +0000
@@ -51,14 +51,13 @@
 				</group>
 			</group>
 			<h3>
-		        <label for="project_id" string="2.- Project related" class="oe_horizontal_separator oe_clear"/>
+		        <label for="project_id" string="2.- Related Project" class="oe_horizontal_separator oe_clear"/>
 			</h3>
             <div>
                 <p class="oe_grey">
 		            <field name="project_id" domain="[('child_ids','=',False)]" context="{'current_model': 'project.project'}" />
-		            the link to the project, all projects listed here
-                    are of the lower level available in the Master WBS. This
-                    represent thumbs in your wbs
+		            The link to the project, all projects listed here
+                    are of the lower level available in the Master WBS.
                 </p>
             </div>
           <notebook colspan="4">
@@ -70,7 +69,7 @@
                     Remember you can upload a Youtube video, and insert 
                     directly here, embeded as a webpage, you can use vimeo and 
                     other elements as images, diagrams (using some 
-                    online services) you just must copy and paste the embebed code,
+                    online services) you just must copy and paste the embeded code,
                     you can see an example about how to do that 
                     <a href="youtube">here</a>
                     </p>
@@ -96,11 +95,11 @@
           
             <page string="GAP analysis results">
 			  <label for="info" colspan="4" string="5.- Technical Conclusions" class="oe_horizontal_separator oe_clear"/>
-              <field name="info" colspan="4" placeholder="Add a other info here ..."/> 
-              <label for="asumption" colspan="4" string="6.- Asumptions" class="oe_horizontal_separator oe_clear"/>
-              <field name="asumption" colspan="4" placeholder="Add a asumptions here ..."/>
+              <field name="info" colspan="4" placeholder="Add another info here ..."/> 
+              <label for="asumption" colspan="4" string="6.- Assumptions" class="oe_horizontal_separator oe_clear"/>
+              <field name="asumption" colspan="4" placeholder="Add assumptions here ..."/>
               <label for="implementation" colspan="4" string="7.- Implementation Conclusions" class="oe_horizontal_separator oe_clear"/>
-              <field name="implementation" colspan="4" placeholder="Add a Implementation Conclusions here ..."/>
+              <field name="implementation" colspan="4" placeholder="Add Implementation Conclusions here ..."/>
             </page>
             
             <page string="Tasks">
@@ -146,7 +145,7 @@
                 <sheet string="Acceptability Criterion">
                     <h1><label for="id" string="Acceptability Criterion" class="oe_horizontal_separator oe_clear"/>
                         <field name="id" readonly="True"/>
-                        <field name="name" placeholder="Acceptabilit Criterion summary..."/>
+                        <field name="name" placeholder="Acceptability Criterion summary..."/>
                     </h1>
                     <group>
                         <field name="scenario"/>
@@ -205,7 +204,7 @@
                     <filter name="accept_criteria_sk_id" string="Sprint" context="{'group_by':'sk_id'}"/>
                     <filter name="accept_criteria_categ_ids" string="Tag" context="{'group_by':'categ_ids'}"/>
                     <filter name="accept_criteria_user_id" string="Responsible Supervisor" context="{'group_by':'user_id'}"/>
-                    <filter name="accept_criteria_user_execute_id" string="Responsible Execution" context="{'group_by':'user_execute_id'}"/>
+                    <filter name="accept_criteria_user_execute_id" string="Execution Responsible" context="{'group_by':'user_execute_id'}"/>
                 </group>
             </search>
         </field>
@@ -250,7 +249,7 @@
     
 
     <record model="ir.actions.act_window" id="action_my_user_story">
-      <field name="name">My User Stories Exc</field>
+      <field name="name">My User Stories to Execute</field>
       <field name="res_model">user.story</field>
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>