diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
index afe3ad75..2ea9a835 100644
--- a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
+++ b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
@@ -42,21 +42,6 @@
-
- jikimo.sale.order.search.inherit.quotation
- sale.order
- primary
-
-
-
- [('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]
-
-
-
-
-
-
-
jikimo.sale.order.search.inherit.quotation.supply.method
sale.order
@@ -72,8 +57,8 @@
-
-
+
+
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 13be15e3..40239012 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1300,17 +1300,17 @@ class MrpProduction(models.Model):
return production_values_str
# 增加制造订单类型
- # production_type = fields.Selection(
- # [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
- # string='制造类型',
- # compute='_compute_production_type',
- # store=True
- # )
+ production_type = fields.Selection(
+ [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+ string='制造类型',
+ compute='_compute_production_type',
+ store=True
+ )
- # @api.depends('product_id.is_manual_processing')
- # def _compute_production_type(self):
- # for production in self:
- # production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
+ @api.depends('product_id.is_manual_processing')
+ def _compute_production_type(self):
+ for production in self:
+ production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
class sf_detection_result(models.Model):
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index ee52cb3e..c218c2d5 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -35,10 +35,10 @@
-
+
@@ -91,7 +91,7 @@
-
+
-
+