diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index ecd391dedb5..6438004cf13 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -942,18 +942,6 @@ class Project(models.Model):
'show': True,
'sequence': 60,
})
- buttons.append({
- 'icon': 'users',
- 'text': _lt('Collaborators'),
- 'number': self.collaborator_count,
- 'action_type': 'action',
- 'action': 'project.project_collaborator_action',
- 'additional_context': json.dumps({
- 'active_id': self.id,
- }),
- 'show': self.privacy_visibility == "portal",
- 'sequence': 66,
- })
return buttons
# ---------------------------------------------------
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index 550cadbff86..18313b2b806 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -182,7 +182,7 @@
-
+
|
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index ea15b2119c9..d7323e577a6 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -701,6 +701,8 @@
+
+
@@ -1518,7 +1520,10 @@
+
+
+
diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index bc48639d696..77bfa533f3d 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -83,6 +83,17 @@
+
+ project.task.form.inherit.sale.project
+ project.task
+
+
+
+
+
+
+
+
project.task.search.inherit
project.task
diff --git a/addons/sale_timesheet/models/project_update.py b/addons/sale_timesheet/models/project_update.py
index f54b99b4505..7e9469fe77e 100644
--- a/addons/sale_timesheet/models/project_update.py
+++ b/addons/sale_timesheet/models/project_update.py
@@ -32,10 +32,8 @@ class ProjectUpdate(models.Model):
return {}
services = []
- total_sold, total_effective, total_remaining = 0, 0, 0
sols = self.env['sale.order.line'].search(
project._get_sale_items_domain([
- ('is_service', '=', True),
('is_downpayment', '=', False),
]),
)
@@ -60,16 +58,9 @@ class ProjectUpdate(models.Model):
'is_hour': unit == product_uom_hour,
'sol': sol,
})
- if sol.product_uom.category_id == company_uom.category_id:
- total_sold += product_uom_qty
- total_effective += qty_delivered
- total_remaining = total_sold - total_effective
return {
'data': services,
- 'total_sold': total_sold,
- 'total_effective': total_effective,
- 'total_remaining': total_remaining,
'company_unit_name': company_uom.name,
'is_hour': company_uom == product_uom_hour,
}
diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index 95775b37bf6..9ee74ff37e5 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -268,8 +268,8 @@ tour.register('sale_timesheet_tour', {
content: "Give a name to Project Update",
run: 'text New update',
}, {
- trigger: ".o_field_widget[name=description] h3:contains('Sold')",
- content: "Sold title must be in description in description",
+ trigger: ".o_field_widget[name=description] h3:contains('Sales')",
+ content: "Sales title must be in description in description",
run: function () {},
}, {
trigger: ".o_field_widget[name=description] td:contains('Prepaid Hours')",
diff --git a/addons/sale_timesheet/views/project_update_templates.xml b/addons/sale_timesheet/views/project_update_templates.xml
index e6e2f7f1754..6ddc6908be9 100644
--- a/addons/sale_timesheet/views/project_update_templates.xml
+++ b/addons/sale_timesheet/views/project_update_templates.xml
@@ -5,13 +5,13 @@
-
Sold
+
Sales
-| Service |
+Sales Order Items |
Sold |
-Effective |
+Delivered |
Remaining |
@@ -21,12 +21,6 @@
| |
|
-
-Total |
- |
- |
- |
-