Merge branch '8.0' into 8.0-issue-196-BR_status_creating_project_from…

…_sub_BR
OCA · Jul 21, 2017 · 2ee6cd4 · 2ee6cd4
2 parents 4d5f6aa + 642a8f9
commit 2ee6cd4
Show file tree

Hide file tree

Showing 44 changed files with 477 additions and 537 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ addon | version | summary
 [business_requirement_deliverable_resource_template](business_requirement_deliverable_resource_template/) | 8.0.1.0.1 | Manage default resource lines in your deliverable sales package from product template
 [business_requirement_deliverable_resource_template_categ](business_requirement_deliverable_resource_template_categ/) | 8.0.1.0.0 | Manage default resource lines categories in your deliverable templates
 [business_requirement_earned_value](business_requirement_earned_value/) | 8.0.1.0.0 | Manage the Earned Value for your customers
+[business_requirement_etherpad](business_requirement_etherpad/) | 8.0.1.0.0 | Manage the Business Requirements Notes via Etherpad
 
 [//]: # (end addons)
 

diff --git a/business_requirement/i18n/sl.po b/business_requirement/i18n/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 08:11+0000\n"
-"PO-Revision-Date: 2017-06-09 08:11+0000\n"
+"POT-Creation-Date: 2017-07-12 00:51+0000\n"
+"PO-Revision-Date: 2017-07-12 00:51+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,6 @@ msgstr "Datum nastanka"
 
 #. module: business_requirement
 #: view:business.requirement:business_requirement.view_business_requirement_search
-#: field:business.requirement,partner_id:0
 msgid "Customer"
 msgstr "Kupec"
 
@@ -340,6 +339,11 @@ msgstr "Število poslovnih zahtev"
 msgid "On Hold"
 msgstr "Zadržano"
 
+#. module: business_requirement
+#: view:business.requirement:business_requirement.view_business_requirement_form
+msgid "Other"
+msgstr ""
+
 #. module: business_requirement
 #: field:business.requirement,parent_id:0
 msgid "Parent"
@@ -377,11 +381,6 @@ msgstr "Projekti"
 msgid "Ready for next stage"
 msgstr "Pripravljeno na naslednjo stopnjo"
 
-#. module: business_requirement
-#: field:business.requirement,ref:0
-msgid "Reference"
-msgstr "Sklic"
-
 #. module: business_requirement
 #: field:business.requirement,requested_id:0
 msgid "Requested by"
@@ -409,6 +408,17 @@ msgstr "Scenarij"
 msgid "Sequence"
 msgstr "Zaporedje"
 
+#. module: business_requirement
+#: view:business.requirement:business_requirement.view_business_requirement_search
+#: field:business.requirement,origin:0
+msgid "Source"
+msgstr ""
+
+#. module: business_requirement
+#: field:business.requirement,partner_id:0
+msgid "Stakeholder"
+msgstr ""
+
 #. module: business_requirement
 #: view:business.requirement:business_requirement.view_business_requirement_form
 msgid "Stakeholder Approval"
@@ -457,3 +467,8 @@ msgstr "Za revizijo"
 #: field:business.requirement,message_unread:0
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
+
+#. module: business_requirement
+#: field:business.requirement,ref:0
+msgid "WBS"
+msgstr ""
diff --git a/business_requirement/models/business.py b/business_requirement/models/business.py
@@ -10,7 +10,7 @@ class BusinessRequirement(models.Model):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _name = "business.requirement"
     _description = "Business Requirement"
-    _order = 'id desc, name desc'
+    _order = 'name desc'
 
     @api.model
     def _get_default_company(self):
@@ -40,7 +40,7 @@ def _get_default_company(self):
         states={'draft': [('readonly', False)]}
     )
     ref = fields.Char(
-        'Reference',
+        'WBS',
         required=False,
         readonly=True,
         copy=False,
@@ -124,7 +124,7 @@ def _get_default_company(self):
     )
     partner_id = fields.Many2one(
         comodel_name='res.partner',
-        string='Customer',
+        string='Stakeholder',
         store=True,
         copy=False,
         readonly=True,
@@ -204,6 +204,7 @@ def _get_default_company(self):
                                     track_visibility='onchange',
                                     required=False,
                                     copy=False, default='normal')
+    origin = fields.Text(string='Source')
 
     @api.multi
     @api.onchange('project_id')
@@ -269,12 +270,29 @@ def name_get(self):
         result = []
         for br in self:
             if br.ref:
-                formatted_name = u'[{}] {}'.format(br.ref, br.description)
+                formatted_name = u'[{}][{}] {}'.format(br.ref, br.name,
+                                                       br.description)
             else:
                 formatted_name = u'[{}] {}'.format(br.name, br.description)
             result.append((br.id, formatted_name))
         return result
 
+    @api.model
+    def name_search(self, name, args=None, operator='ilike', limit=100):
+        """
+        Search BR based on Name or Description
+        """
+        # Make a search with default criteria
+        names = super(BusinessRequirement, self).name_search(
+            name=name, args=args, operator=operator, limit=limit)
+        # Make the other search
+        descriptions = []
+        if name:
+            domain = [('description', '=ilike', name + '%')]
+            descriptions = self.search(domain, limit=limit).name_get()
+        # Merge both results
+        return list(set(names) | set(descriptions))[:limit]
+
     @api.multi
     def action_button_confirm(self):
         self.write({'state': 'confirmed'})

diff --git a/business_requirement/tests/test_br.py b/business_requirement/tests/test_br.py
@@ -82,3 +82,13 @@ def test_action_button_done(self):
         br = self.br.create(br_vals)
         br.action_button_done()
         self.assertEqual(br.state, 'done')
+
+    def test_br_name_search(self):
+        br_vals = {
+            'name': ' test',
+            'description': 'test',
+            'parent_id': False,
+        }
+        self.br.create(br_vals)
+        brs = self.br.name_search(name='test')
+        self.assertEqual(bool(brs), True)
diff --git a/business_requirement/views/business_view.xml b/business_requirement/views/business_view.xml
@@ -46,17 +46,15 @@
                         </h1>
                         <group col="4">
                             <field name="responsible_id" required="1"/>
-                            <field name="requested_id"/>
                             <field name="project_id"/>
-                            <field name="parent_id"/>
                             <field name="partner_id"/>
                             <field name="ref"/>
+                            <field name="origin"/>
                             <field name="category_ids" widget="many2many_tags"/>
-                            <field name="change_request"/>
+
                             <field name="to_be_reviewed"/>
                             <field name="reviewer_ids" widget="many2many_tags"/>
                             <field name="priority" groups="base.group_user" widget="priority"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
                         </group>
 
                         <notebook>
@@ -91,6 +89,16 @@
                                     <field name="approval_date"/>
                                 </group>
                             </page>
+                            <page string="Other">
+                                <group col="12">
+                                    <field name="parent_id"/>
+                                    <field name="requested_id"/>
+                                </group>
+                                <group col="12">
+                                    <field name="change_request"/>
+                                    <field name="company_id" groups="base.group_multi_company"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <footer>
@@ -131,6 +139,7 @@
                     <field name="project_id" string="Project"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="responsible_id" string="Responsible"/>
+                    <field name="origin" string="Source"/>
                     <filter string="To be Reviewed" name="to_be_reviewed" domain="[('to_be_reviewed','!=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Project" context="{'group_by':'project_id'}"/>

diff --git a/business_requirement_deliverable/i18n/sl.po b/business_requirement_deliverable/i18n/sl.po
@@ -3,14 +3,13 @@
 # * business_requirement_deliverable
 # 
 # Translators:
-# Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 08:11+0000\n"
-"PO-Revision-Date: 2017-06-09 08:11+0000\n"
+"POT-Creation-Date: 2017-07-12 00:51+0000\n"
+"PO-Revision-Date: 2017-07-12 00:51+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +45,6 @@ msgstr "Poslovna zahteva"
 #. module: business_requirement_deliverable
 #: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_search
 #: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_tree
-#: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_tree_noedit
 #: field:business.requirement.resource,business_requirement_deliverable_id:0
 #: model:ir.model,name:business_requirement_deliverable.model_business_requirement_deliverable
 msgid "Business Requirement Deliverable"
@@ -61,14 +59,12 @@ msgstr "Ocena poslovne zahteve"
 #: field:business.requirement.deliverable,resource_ids:0
 #: view:business.requirement.resource:business_requirement_deliverable.view_business_requirement_resource_search
 #: view:business.requirement.resource:business_requirement_deliverable.view_business_requirement_resource_tree
-#: view:business.requirement.resource:business_requirement_deliverable.view_business_requirement_resource_tree_noedit
 #: model:ir.model,name:business_requirement_deliverable.model_business_requirement_resource
 msgid "Business Requirement Resource"
 msgstr "Vir poslovne zahteve"
 
 #. module: business_requirement_deliverable
 #: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_form
-#: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_form_noedit
 msgid "Business Requirement Task Type"
 msgstr "Tip opravila poslovne zahteve"
 
@@ -106,7 +102,6 @@ msgstr "Kupec"
 
 #. module: business_requirement_deliverable
 #: field:business.requirement,dl_count:0
-#: field:business.requirement,dl_count_noedit:0
 msgid "DL Count"
 msgstr "Števec dobavnih postavk"
 
@@ -140,7 +135,7 @@ msgid "Deliverable Description"
 msgstr "Opis dobav"
 
 #. module: business_requirement_deliverable
-#: code:addons/business_requirement_deliverable/models/business.py:327
+#: code:addons/business_requirement_deliverable/models/business.py:353
 #: field:business.requirement,deliverable_lines:0
 #, python-format
 msgid "Deliverable Lines"
@@ -308,7 +303,6 @@ msgstr "Količina"
 
 #. module: business_requirement_deliverable
 #: field:business.requirement,rl_count:0
-#: field:business.requirement,rl_count_noedit:0
 msgid "RL Count"
 msgstr "Števec postavk virov"
 
@@ -356,10 +350,9 @@ msgid "Resource Description"
 msgstr "Opis vira"
 
 #. module: business_requirement_deliverable
-#: code:addons/business_requirement_deliverable/models/business.py:351
+#: code:addons/business_requirement_deliverable/models/business.py:377
 #: field:business.requirement,resource_lines:0
 #: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_form
-#: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_form_noedit
 #, python-format
 msgid "Resource Lines"
 msgstr "Postavke virov"
@@ -393,6 +386,10 @@ msgstr "Zaporedje"
 
 #. module: business_requirement_deliverable
 #: view:business.requirement:business_requirement_deliverable.view_business_requirement_search
+#: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_search
+#: field:business.requirement.deliverable,state:0
+#: view:business.requirement.resource:business_requirement_deliverable.view_business_requirement_resource_search
+#: field:business.requirement.resource,state:0
 msgid "State"
 msgstr "Stanje"
 
@@ -409,7 +406,6 @@ msgstr "Skupni prihodki"
 
 #. module: business_requirement_deliverable
 #: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_tree
-#: view:business.requirement.deliverable:business_requirement_deliverable.view_business_requirement_deliverable_tree_noedit
 msgid "Total price"
 msgstr "Skupna cena"
 
@@ -431,13 +427,13 @@ msgid "UoM"
 msgstr "EM"
 
 #. module: business_requirement_deliverable
-#: code:addons/business_requirement_deliverable/models/business.py:97
+#: code:addons/business_requirement_deliverable/models/business.py:112
 #, python-format
 msgid "When resource type is task, the uom category should be time"
 msgstr "Če je tip vira opravilo, bi kategorija EM morala biti čas"
 
 #. module: business_requirement_deliverable
-#: code:addons/business_requirement_deliverable/models/business.py:381
+#: code:addons/business_requirement_deliverable/models/business.py:407
 #, python-format
 msgid ""
 "You are changing customer, on a business requirementwhich already contains "

diff --git a/business_requirement_deliverable/models/business.py b/business_requirement_deliverable/models/business.py
@@ -12,6 +12,19 @@ class BusinessRequirementResource(models.Model):
     _description = "Business Requirement Resource"
 
     sequence = fields.Integer('Sequence')
+    state = fields.Selection(
+        related='business_requirement_id.state',
+        selection=[('draft', 'Draft'),
+                   ('confirmed', 'Confirmed'),
+                   ('approved', 'Approved'),
+                   ('stakeholder_approval', 'Stakeholder Approval'),
+                   ('in_progress', 'In progress'),
+                   ('done', 'Done'),
+                   ('cancel', 'Cancel'),
+                   ('drop', 'Drop'),
+                   ],
+        store=True,
+    )
     name = fields.Char('Name', required=True)
     product_id = fields.Many2one(
         comodel_name='product.product',
@@ -66,6 +79,8 @@ class BusinessRequirementResource(models.Model):
         string='Business Requirement',
         store=True
     )
+    state = fields.Selection(related='business_requirement_id.state',
+                             string='State', store=True, readonly=True)
 
     @api.multi
     @api.onchange('product_id')
@@ -110,6 +125,19 @@ class BusinessRequirementDeliverable(models.Model):
     _description = "Business Requirement Deliverable"
 
     sequence = fields.Integer('Sequence')
+    state = fields.Selection(
+        related='business_requirement_id.state',
+        selection=[('draft', 'Draft'),
+                   ('confirmed', 'Confirmed'),
+                   ('approved', 'Approved'),
+                   ('stakeholder_approval', 'Stakeholder Approval'),
+                   ('in_progress', 'In progress'),
+                   ('done', 'Done'),
+                   ('cancel', 'Cancel'),
+                   ('drop', 'Drop'),
+                   ],
+        store=True,
+    )
     name = fields.Text('Name', required=True)
     product_id = fields.Many2one(
         comodel_name='product.product',
@@ -166,6 +194,8 @@ class BusinessRequirementDeliverable(models.Model):
         string='Business Requirement',
         store=True
     )
+    state = fields.Selection(related='business_requirement_id.state',
+                             string='State', store=True, readonly=True)
 
     @api.multi
     @api.onchange('business_requirement_id')
@@ -295,8 +325,6 @@ class BusinessRequirement(models.Model):
                                     compute='_compute_dl_total_revenue')
     dl_count = fields.Integer('DL Count', compute='_compute_dl_count')
     rl_count = fields.Integer('RL Count', compute='_compute_rl_count')
-    dl_count_noedit = fields.Integer('DL Count', compute='_compute_dl_count')
-    rl_count_noedit = fields.Integer('RL Count', compute='_compute_rl_count')
 
     @api.multi
     def _compute_dl_total_revenue(self):
@@ -308,13 +336,11 @@ def _compute_dl_total_revenue(self):
     def _compute_dl_count(self):
         for r in self:
             r.dl_count = len(r.deliverable_lines.ids)
-            r.dl_count_noedit = len(r.deliverable_lines.ids)
 
     @api.multi
     def _compute_rl_count(self):
         for r in self:
             r.rl_count = len(r.resource_lines.ids)
-            r.rl_count_noedit = len(r.resource_lines.ids)
 
     @api.multi
     def open_deliverable_line(self):