Merge pull request #22 from brian10048/12.0-imp-fieldservice_sale

[IMP] Fieldservice : raising a Validation Error if the sale order FSM location is empty and any sale order lines are set to any of the field service tracking options

fieldservice_sale/models/sale_order.py

@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
 
 
 class SaleOrder(models.Model):
@@ -122,14 +123,17 @@ def _field_find_fsm_order(self):
     def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
         result = super(SaleOrder, self)._action_confirm()
-        self.order_line._field_service_generation()
+        if any(sol.product_id.field_service_tracking != 'no'
+               for sol in self):
+            if not self.fsm_location_id:
+                raise ValidationError(_("FSM Location must be set"))
+            self.order_line._field_service_generation()
         return result
 
     @api.multi
     def action_invoice_create(self, grouped=False, final=False):
         invoice_ids = super().action_invoice_create(grouped, final)
-        result = []
-        result.append(invoice_ids)
+        result = invoice_ids or []
 
         for invoice_id in invoice_ids:
             invoice = self.env['account.invoice'].browse(invoice_id)

fieldservice_sale/models/sale_order_line.py

@@ -59,7 +59,7 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
-            'location_directions': self.fsm_location_id.direction,
+            'location_directions': self.order_id.fsm_location_id.direction,
             'request_early': self.order_id.expected_date,
             'scheduled_date_start': self.order_id.expected_date,
             'description': self.name,