[REV] sale,sale_project : Avoid sending multiple email on upsell

This reverts commit f95356a.

Revert unwanted r+

Original PR:odoo#78457

closes odoo#79275

Signed-off-by: Kevin Baptiste <[email protected]>

Author: Laurent Stukkens (LTU)

addons/sale/models/sale.py

@@ -511,19 +511,13 @@ def create(self, vals):
         return result
 
     def _compute_field_value(self, field):
-        send_mail = True
-        for record in self:
-            if field.name == 'invoice_status' and record._origin.invoice_status == 'upselling':
-                send_mail = False
-
         super()._compute_field_value(field)
-        if field.name != 'invoice_status' or self.env.context.get('mail_activity_automation_skip') or not send_mail:
+        if field.name != 'invoice_status' or self.env.context.get('mail_activity_automation_skip'):
             return
-        
+
         filtered_self = self.filtered(lambda so: so.user_id and so.invoice_status == 'upselling')
         if not filtered_self:
             return
-    
 
         filtered_self.activity_unlink(['sale.mail_act_sale_upsell'])
         for order in filtered_self:

addons/sale_timesheet/tests/__init__.py

@@ -10,4 +10,3 @@
 from . import test_reporting
 from . import test_project_overview
 from . import test_project_billing_multicompany
-

addons/sale_timesheet/tests/common.py

@@ -319,20 +319,3 @@ def setUpClass(cls, chart_template_ref=None):
             'taxes_id': False,
             'property_account_income_id': cls.account_sale.id,
         })
-
-        cls.service_prepaid = cls.env['product.product'].create({
-            'name': "Service delivered, create task in new project",
-            'standard_price': 10,
-            'list_price': 20,
-            'type': 'service',
-            'invoice_policy': 'delivery',
-            'uom_id': uom_hour.id,
-            'uom_po_id': uom_hour.id,
-            'default_code': 'SERV-DELI3',
-            'service_type': 'manual',
-            'service_tracking': 'task_in_project',
-            'project_id': False,  # will create a project
-            'taxes_id': False,
-            'property_account_income_id': cls.account_sale.id,
-            'service_policy': 'ordered_timesheet'
-        })

addons/sale_timesheet/tests/test_sale_service.py

@@ -596,4 +596,4 @@ def test_copy_billable_project_and_task(self):
 
         # copy the task
         task_copy = task.copy()
-        self.assertEqual(task_copy.sale_line_id, task.sale_line_id, "Duplicating task should keep its Sale line")
+        self.assertEqual(task_copy.sale_line_id, task.sale_line_id, "Duplicating task should keep its Sale line")

addons/sale_timesheet/tests/test_sale_timesheet.py

@@ -671,63 +671,3 @@ def test_change_customer_and_SOL_after_invoiced_timesheet(self):
         self.assertEqual(self.partner_b, task_so1_timesheet2.partner_id, "The Task's second Timesheet entry should have its partner changed, as it was not invoiced and the Task's partner/customer changed.")
         self.assertEqual(so1_product_global_project_so_line, task_so1_timesheet1.so_line, "The Task's first Timesheet entry should not have changed as it was already invoiced (its so_line should still be equal to the first Sales Order line).")
         self.assertEqual(so2_product_global_project_so_line, task_so1_timesheet2.so_line, "The Task's second Timesheet entry should have it's so_line changed, as the Sales Order Item of the Task changed, and this entry was not invoiced.")
-
-    def test_timesheet_upsell(self):
-        """ Test timesheet upselling and email """
-
-        self.sale_order_with_user = self.env['sale.order'].with_context(mail_notrack=True, mail_create_nolog=True).create({
-            'partner_id': self.partner_a.id,
-            'partner_invoice_id': self.partner_a.id,
-            'partner_shipping_id': self.partner_a.id,
-            'user_id' : self.user_employee_company_B.id
-        })
-        # create SO and confirm it
-        uom_days = self.env.ref('uom.product_uom_day')
-        sale_order_line = self.env['sale.order.line'].create({
-            'order_id': self.sale_order_with_user.id,
-            'name': self.service_prepaid.name,
-            'product_id': self.service_prepaid.id,
-            'product_uom_qty': 1,
-            'product_uom': uom_days.id,
-            'price_unit': self.service_prepaid.list_price,
-        })
-        self.sale_order_with_user.action_confirm()
-        task = self.env['project.task'].search([('sale_line_id', '=', sale_order_line.id)])
-
-        # let's log some timesheets
-        self.env['account.analytic.line'].create({
-            'name': 'Test Line',
-            'project_id': task.project_id.id,
-            'task_id': task.id,
-            'unit_amount': 8,
-            'employee_id': self.employee_manager.id,
-        })
-        
-        self.sale_order_with_user._create_invoices()
-        id_max = self.env['mail.message'].search([], order='id desc', limit=1)
-        if id_max:
-            id_max = id_max[0].id
-        else:
-            id_max = 0
-        self.env['account.analytic.line'].create({
-            'name': 'Test Line',
-            'project_id': task.project_id.id,
-            'task_id': task.id,
-            'unit_amount': 5,
-            'employee_id': self.employee_user.id,
-        })
-
-        self.assertEqual(self.sale_order_with_user.invoice_status, 'upselling', 'Sale Timesheet: "invoice on delivery" timesheets should not modify the invoice_status of the so')
-        message_sent = self.env['mail.message'].search([('id', '>', id_max), ('subject', 'like', 'Upsell')])
-        self.assertEqual(len(message_sent),1,'Sale Timesheet: An email should always be sent to the saleperson when the state of the sale order change to upselling')
-
-        self.env['account.analytic.line'].create({
-            'name': 'Test Line',
-            'project_id': task.project_id.id,
-            'task_id': task.id,
-            'unit_amount': 5,
-            'employee_id': self.employee_user.id,
-        })
-
-        message_sent = self.env['mail.message'].search([('id', '>', id_max), ('subject', 'like', 'Upsell')])
-        self.assertEqual(len(message_sent),1,'Sale Timesheet: An email should only be sent to the saleperson when the state of the sale order change to upselling')