Merge branch 'develop' into feature/commercially_launched

sf_manufacturing/models/sale_order.py

@@ -1,6 +1,6 @@
 import logging
 import json
-from odoo import models, fields, api
+from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
@@ -24,6 +24,8 @@ class SaleOrder(models.Model):
         self.state = 'supply method'
 
     def action_confirm(self):
+        if self._get_forbidden_state_confirm() & set(self.mapped('state')):
+            raise UserError(_('订单状态已发生变化，请刷新当前页面'))
         # 判断是否所有产品都选择了供货方式
         filter_line = self.order_line.filtered(lambda line: not line.supply_method)
         if filter_line: