diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 7496e7db..b6cea067 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -64,7 +64,7 @@ class MrsMaterialModel(models.Model): @api.constrains('supplier_ids') def _check_gain_way(self): if not self.gain_way: - raise UserError("请输入获取方式") + raise UserError("请选择获取方式") if self.gain_way in ['外协', '采购']: if not self.supplier_ids: raise UserError("请添加供应商") diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index 49a2563d..bf9201b8 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -1,38 +1,39 @@ - - + + sf.production.process.parameter - + + - + sf.production.process.parameter -
+

- +

+ + - - - + - +
@@ -40,7 +41,7 @@ - + search.mrs.production.process.parameter sf.production.process.parameter @@ -74,26 +75,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -283,7 +284,7 @@ sf.materials.model - + @@ -392,12 +393,12 @@ sf.materials.model tree,form - - - - - - + + + + + + 表面工艺类别 diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv index a9e92aaf..8272af30 100644 --- a/sf_manufacturing/security/ir.model.access.csv +++ b/sf_manufacturing/security/ir.model.access.csv @@ -22,6 +22,8 @@ access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maint access_maintenance_equipment_tool_equipment_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_maintenance.sf_group_equipment_user,1,1,1,0 access_mrp_production_group_sf_mrp_user,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0 +access_mrp_production_group_quality,mrp_production_group_quality,model_mrp_production,sf_base.group_quality,1,0,0,0 +access_mrp_production_group_quality_director,mrp_production_group_quality_director,model_mrp_production,sf_base.group_quality_director,1,0,0,0 access_mrp_workorder_group_sf_mrp_user,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0 access_mrp_workcenter_group_sf_mrp_user,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0