diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py index b39d70a8..a7d39ac7 100644 --- a/jikimo_sale_multiple_supply_methods/__manifest__.py +++ b/jikimo_sale_multiple_supply_methods/__manifest__.py @@ -6,7 +6,7 @@ 'author': 'fox', 'website': '', 'category': '', - 'depends': ['product', 'sf_dlm', 'sale_stock', 'sf_sale'], + 'depends': ['sf_dlm', 'sale_stock', 'sf_sale'], "data": [ 'security/ir.model.access.csv', 'data/stock_routes.xml', diff --git a/jikimo_sale_multiple_supply_methods/data/product_data.xml b/jikimo_sale_multiple_supply_methods/data/product_data.xml index 2a74b3bb..dc9b70a7 100644 --- a/jikimo_sale_multiple_supply_methods/data/product_data.xml +++ b/jikimo_sale_multiple_supply_methods/data/product_data.xml @@ -1,6 +1,6 @@ - + 人工线下加工模板 @@ -15,7 +15,7 @@ true serial - 成品 + true @@ -30,7 +30,7 @@ - 成品 + @@ -44,7 +44,7 @@ - 成品 + @@ -57,7 +57,7 @@ - 成品 + @@ -79,12 +79,20 @@ - 坯料 + true + + + + + + + + \ No newline at end of file diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py index 98c71f21..3320f943 100644 --- a/sf_manufacturing/__manifest__.py +++ b/sf_manufacturing/__manifest__.py @@ -10,7 +10,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'], + 'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'], 'data': [ 'data/stock_data.xml', 'data/empty_racks_data.xml', diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 40239012..13be15e3 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 c218c2d5..ee52cb3e 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 @@ - + - +