diff --git a/sf_dlm/models/product_supplierinfo.py b/sf_dlm/models/product_supplierinfo.py index 2784cba0..05191b44 100644 --- a/sf_dlm/models/product_supplierinfo.py +++ b/sf_dlm/models/product_supplierinfo.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -from odoo import models, fields +import logging + +import re +from odoo import models, fields, api class ResProductCategory(models.Model): @@ -28,6 +31,20 @@ class ResMrpBomMo(models.Model): _inherit = 'mrp.bom' subcontractor_id = fields.Many2one('res.partner', string='外包商') + subcontractor_name = fields.Char('', compute='_compute_subcontractor_ids', store=True) + + @api.depends('subcontractor_id') + def _compute_subcontractor_ids(self): + for item in self: + if item.subcontractor_id: + logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids) + subcontractor_id = int(re.sub(r"\D", "", str(item.subcontractor_id.id))) + item.subcontractor_ids = [subcontractor_id] + item.subcontractor_name = item.subcontractor_id.name + logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids) + else: + item.subcontractor_ids = [] + item.subcontractor_name = '' def bom_create_line_has(self, embryo): vals = { diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index 7803b263..c62ae8cd 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -110,6 +110,9 @@ + + + diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv index 79800637..58879f72 100644 --- a/sf_tool_management/security/ir.model.access.csv +++ b/sf_tool_management/security/ir.model.access.csv @@ -1,6 +1,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_sf_tool_user,1,1,1,0 access_sf_functional_cutting_tool_entity_group_plan_dispatch,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_plan_dispatch,1,0,0,0 +access_sf_functional_cutting_tool_entity_group_sf_order_user,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_sf_order_user,1,0,0,0 access_sf_functional_tool_warning,sf.functional.tool.warning,model_sf_functional_tool_warning,sf_base.group_sf_tool_user,1,1,1,0 access_sf_functional_tool_warning_group_plan_dispatch,sf.functional.tool.warning,model_sf_functional_tool_warning,sf_base.group_plan_dispatch,1,0,0,0