diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 018766eb..ecb7ed73 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -9,6 +9,8 @@ class jikimo_purchase_tier_validation(models.Model):
_name = 'purchase.order'
_inherit = ['purchase.order', 'tier.validation']
_description = "采购订单"
+ _state_from = ["draft", "to approve", "rejected"]
+ _state_to = ["approved"]
_tier_validation_buttons_xpath = "/form/header/button[@id='draft_confirm'][1]"
@@ -21,7 +23,7 @@ class jikimo_purchase_tier_validation(models.Model):
def button_confirm(self):
for record in self:
- if record.state in ['to approve']:
+ if record.need_validation and not record.validation_status == 'validated':
raise ValidationError(_('请先完成审批。'))
res = super(jikimo_purchase_tier_validation, self).button_confirm()
for record in self:
@@ -68,11 +70,6 @@ class jikimo_purchase_tier_validation(models.Model):
return res
- def _rejected_tier(self, tiers=False):
- res = super(jikimo_purchase_tier_validation, self)._rejected_tier(tiers)
- self.state = 'draft'
- return res
-
@api.model
def _get_under_validation_exceptions(self):
res = super(jikimo_purchase_tier_validation, self)._get_under_validation_exceptions()
diff --git a/sf_manufacturing/views/stock_picking_view.xml b/sf_manufacturing/views/stock_picking_view.xml
index 458494b9..3cb877a9 100644
--- a/sf_manufacturing/views/stock_picking_view.xml
+++ b/sf_manufacturing/views/stock_picking_view.xml
@@ -67,6 +67,16 @@
+
+
+
+
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 209fd4fa..6624c7fa 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -42,20 +42,20 @@
-
-
+
+ 1
-
-
+
+ 1
-
-
+
+ 1
+
+
+ 1
+
+
+ 1
@@ -353,5 +353,9 @@
tree,kanban,form,activity
+
+
+ {'quotation_only': True,"search_default_draft":1}
+
\ No newline at end of file