Merge commit '5a006ec3' into 17.0-dev

bemade_fsm/__manifest__.py

@@ -20,7 +20,7 @@
 ########################################################################################
 {
     'name': 'Improved Field Service Management',
-    'version': '15.0.1.0.6',
+    'version': '17.0.0.1.0',
     'summary': 'Adds functionality necessary for managing field service operations at Durpro.',
     'description': 'Adds functionality necessary for managing field service operations at Durpro.',
     'category': 'Services/Field Service',
@@ -52,8 +52,13 @@
         'views/menus.xml',
         'views/task_views.xml',
         'views/sale_order_views.xml',
+<<<<<<< HEAD
         'reports/worksheet_custom_report_templates.xml',
         'reports/worksheet_custom_reports.xml',
+=======
+        # 'reports/worksheet_custom_report_templates.xml',
+        # 'reports/worksheet_custom_reports.xml',
+>>>>>>> 5a006ec3
         'wizard/new_task_from_template.xml',
     ],
     'assets': {

bemade_fsm/models/task.py

@@ -250,6 +250,11 @@ class Task(models.Model):
 
             task.write(values)
 
+    def _get_full_hierarchy(self):
+        if self.child_ids:
+            return self | self.child_ids._get_full_hierarchy()
+        return self
+
     def synchronize_name_fsm(self):
         """ Applies naming to the entire task tree for tasks that are part of this
         recordset. Root tasks are named:

bemade_odoo_partner_scrapper/__manifest__.py

@@ -20,7 +20,8 @@
     'data': [
         # No security
         'views/res_partner_views.xml',
-        'data/res_partner_relation_type.xml'
+        # Commented for migration to 17, raises error on update
+        # 'data/res_partner_relation_type.xml'
     ],
     "assets": {
         "web.assets_backend": [

bemade_odoo_partner_scrapper/views/res_partner_views.xml

@@ -11,7 +11,7 @@
                 <field name="is_odoo_user"/>Odoo User
                 <field name="is_odoo_partner"/>Odoo Partner
                 <br/>
-                <div attrs="{'invisible': [('is_odoo_partner', '=', False)]}">
+                <div invisible="not is_odoo_partner">
                     <h3><field name="odoo_partner_type"/> Partner</h3>
                 </div>
             </field>

bemade_payslip_done_as_not_paid/__manifest__.py

@@ -18,7 +18,7 @@
 #
 {
     'name': 'Payslip Done as To Pay',
-    'version': '16.0.1.0.0',
+    'version': '17.0.1.0.0',
     'summary': 'Payslips in "Done" state appear as "To Pay"',
     'category': 'Human Resources/Payroll',
     'author': 'Bemade Inc.',