Accept Merge Request #1649: (feature/制造功能优化 -> develop)

Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1649?initial=true

jikimo_purchase_tier_validation/models/models.py

@@ -18,18 +18,18 @@ class jikimo_purchase_tier_validation(models.Model):
     # 是否已上传合同文件
     is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
 
-    def button_confirm(self):
+    # def button_confirm(self):
-        self = self.with_context(skip_validation=True)
+    #     self = self.with_context(skip_validation=True)
-        return super().button_confirm()
+    #     return super().button_confirm()
-
+    #
-    def _check_state_conditions(self, vals):
+    # def _check_state_conditions(self, vals):
-        self.ensure_one()
+    #     self.ensure_one()
-        if self._context.get('skip_validation'):
+    #     if self._context.get('skip_validation'):
-            return False
+    #         return False
-        return (
+    #     return (
-                self._check_state_from_condition()
+    #             self._check_state_from_condition()
-                and vals.get(self._state_field) in self._state_to
+    #             and vals.get(self._state_field) in self._state_to
-        )
+    #     )
 
     def request_validation(self):
         for record in self: