jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组

Browse Source
This commit is contained in:
jinling.yang
2023-12-06 17:27:29 +08:00
parent 6a2a465569 d8a74c17f0
commit 8d5a4ed4c8
13 changed files with 171 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_quality/__manifest__.py
View File

@@ -15,6 +15,7 @@
# 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string，故需要sf_manufacturing先安装
'depends': ['quality_control', 'sf_manufacturing'],
'data': [
'security/ir.model.access.csv',
'views/view.xml'
],

9
sf_quality/models/custom_quality.py
View File

@@ -10,5 +10,14 @@ class SfQualityPoint(models.Model):
domain="[('type', 'in', "
"('product', 'consu')), '|', ('company_id', '=', False), ('company_id', '=', company_id)]", help=
"Quality Point will apply to every selected Products.")
check_state = fields.Selection([
('enable', '启用'),
('close', '关闭')
], string='审核状态', default='close')
# 审核
def action_check(self):
self.check_state = 'enable'
# picking_type_ids = fields.Many2many(
# 'stock.picking.type', string='执行节点', required=True, check_company=True)

12
sf_quality/security/ir.model.access.csv
View File

@@ -1,6 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_quality_point_group_quality,quality_point_group_quality,quality.model_quality_point,sf_base.group_quality,1,0,0,0
access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,1,1,0
access_quality_point_group_quality,quality_point_group_quality,quality.model_quality_point,sf_base.group_quality,1,1,1,0
access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,1,0,0
access_quality_point_group_plan_dispatch,quality_point_group_plan_dispatch,quality.model_quality_point,sf_base.group_plan_dispatch,1,0,0,0
access_quality_point_group_plan_director,quality_point_group_plan_director,quality.model_quality_point,sf_base.group_plan_director,1,0,0,0
access_quality_point_group_sf_equipment_user,quality_point_group_sf_equipment_user,quality.model_quality_point,sf_base.group_sf_equipment_user,1,0,0,0
@@ -8,7 +8,7 @@ access_quality_point_group_sf_tool_user,quality_point_group_sf_tool_user,quality
access_quality_point_group_sf_order_user,quality_point_group_sf_order_user,quality.model_quality_point,sf_base.group_sf_order_user,1,0,0,0
access_quality_point_group_sf_mrp_manager,quality_point_group_sf_mrp_manager,quality.model_quality_point,sf_base.group_sf_mrp_manager,1,0,0,0
access_quality_check_group_quality,quality_check_group_quality,quality.model_quality_check,sf_base.group_quality,1,0,0,0
access_quality_check_group_quality,quality_check_group_quality,quality.model_quality_check,sf_base.group_quality,1,1,1,0
access_quality_check_group_quality_director,quality_check_group_quality_director,quality.model_quality_check,sf_base.group_quality_director,1,1,1,0
access_quality_check_group_plan_dispatch,quality_check_group_plan_dispatch,quality.model_quality_check,sf_base.group_plan_dispatch,1,0,0,0
access_quality_check_group_plan_director,quality_check_group_plan_director,quality.model_quality_check,sf_base.group_plan_director,1,0,0,0
@@ -19,7 +19,7 @@ access_quality_check_group_sf_mrp_manager,quality_check_group_sf_mrp_manager,qua
access_quality_check_group_equipment_user,quality_check_group_equipment_user,quality.model_quality_check,sf_maintenance.sf_group_equipment_user,1,0,0,0
access_quality_check_group_equipment_manager,quality_check_group_equipment_manager,quality.model_quality_check,sf_maintenance.sf_group_equipment_manager,1,0,0,0
access_quality_alert_group_quality,quality_alert_group_quality,quality.model_quality_alert,sf_base.group_quality,1,0,0,0
access_quality_alert_group_quality,quality_alert_group_quality,quality.model_quality_alert,sf_base.group_quality,1,1,1,0
access_quality_alert_group_quality_director,quality_alert_group_quality_director,quality.model_quality_alert,sf_base.group_quality_director,1,1,1,0
access_quality_alert_group_plan_dispatch,quality_alert_group_plan_dispatch,quality.model_quality_alert,sf_base.group_plan_dispatch,1,0,0,0
access_quality_alert_group_plan_director,quality_alert_group_plan_director,quality.model_quality_alert,sf_base.group_plan_director,1,0,0,0
@@ -30,8 +30,8 @@ access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,qua
access_quality_alert_group_equipment_user,quality_alert_group_equipment_user,quality.model_quality_alert,sf_maintenance.sf_group_equipment_user,1,0,0,0
access_quality_alert_group_equipment_manager,quality_alert_group_equipment_manager,quality.model_quality_alert,sf_maintenance.sf_group_equipment_manager,1,0,0,0
access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,0,0,0
access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,1,0
access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,1,1,0
access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,0,0
access_quality_alert_team_group_plan_dispatch,quality_alert_team_group_plan_dispatch,quality.model_quality_alert_team,sf_base.group_plan_dispatch,1,0,0,0
access_quality_alert_team_group_plan_director,quality_alert_team_group_plan_director,quality.model_quality_alert_team,sf_base.group_plan_director,1,0,0,0
access_quality_alert_team_group_sf_equipment_user,quality_alert_team_group_sf_equipment_user,quality.model_quality_alert_team,sf_base.group_sf_equipment_user,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_quality_point_group_quality quality_point_group_quality quality.model_quality_point sf_base.group_quality 1 0 1 0 1 0
3 access_quality_point_group_quality_director quality_point_group_quality_director quality.model_quality_point sf_base.group_quality_director 1 1 1 0 0
4 access_quality_point_group_plan_dispatch quality_point_group_plan_dispatch quality.model_quality_point sf_base.group_plan_dispatch 1 0 0 0
5 access_quality_point_group_plan_director quality_point_group_plan_director quality.model_quality_point sf_base.group_plan_director 1 0 0 0
6 access_quality_point_group_sf_equipment_user quality_point_group_sf_equipment_user quality.model_quality_point sf_base.group_sf_equipment_user 1 0 0 0
8 access_quality_point_group_sf_order_user quality_point_group_sf_order_user quality.model_quality_point sf_base.group_sf_order_user 1 0 0 0
9 access_quality_point_group_sf_mrp_manager quality_point_group_sf_mrp_manager quality.model_quality_point sf_base.group_sf_mrp_manager 1 0 0 0
10 access_quality_check_group_quality quality_check_group_quality quality.model_quality_check sf_base.group_quality 1 0 1 0 1 0
11 access_quality_check_group_quality_director quality_check_group_quality_director quality.model_quality_check sf_base.group_quality_director 1 1 1 0
12 access_quality_check_group_plan_dispatch quality_check_group_plan_dispatch quality.model_quality_check sf_base.group_plan_dispatch 1 0 0 0
13 access_quality_check_group_plan_director quality_check_group_plan_director quality.model_quality_check sf_base.group_plan_director 1 0 0 0
14 access_quality_check_group_sf_equipment_user quality_check_group_sf_equipment_user quality.model_quality_check sf_base.group_sf_equipment_user 1 0 0 0
19 access_quality_check_group_equipment_manager quality_check_group_equipment_manager quality.model_quality_check sf_maintenance.sf_group_equipment_manager 1 0 0 0
20 access_quality_alert_group_quality quality_alert_group_quality quality.model_quality_alert sf_base.group_quality 1 0 1 0 1 0
21 access_quality_alert_group_quality_director quality_alert_group_quality_director quality.model_quality_alert sf_base.group_quality_director 1 1 1 0
22 access_quality_alert_group_plan_dispatch quality_alert_group_plan_dispatch quality.model_quality_alert sf_base.group_plan_dispatch 1 0 0 0
23 access_quality_alert_group_plan_director quality_alert_group_plan_director quality.model_quality_alert sf_base.group_plan_director 1 0 0 0
24 access_quality_alert_group_sf_equipment_user quality_alert_group_sf_equipment_user quality.model_quality_alert sf_base.group_sf_equipment_user 1 0 0 0
25 access_quality_alert_group_sf_tool_user quality_alert_group_sf_tool_user quality.model_quality_alert sf_base.group_sf_tool_user 1 0 0 0
30 access_quality_alert_team_group_quality quality_alert_team_group_quality quality.model_quality_alert_team sf_base.group_quality 1 0 1 0 1 0
31 access_quality_alert_team_group_quality_director quality_alert_team_group_quality_director quality.model_quality_alert_team sf_base.group_quality_director 1 1 1 0 0
32 access_quality_alert_team_group_plan_dispatch quality_alert_team_group_plan_dispatch quality.model_quality_alert_team sf_base.group_plan_dispatch 1 0 0 0
33 access_quality_alert_team_group_plan_director quality_alert_team_group_plan_director quality.model_quality_alert_team sf_base.group_plan_director 1 0 0 0
34 access_quality_alert_team_group_sf_equipment_user quality_alert_team_group_sf_equipment_user quality.model_quality_alert_team sf_base.group_sf_equipment_user 1 0 0 0
35 access_quality_alert_team_group_sf_tool_user quality_alert_team_group_sf_tool_user quality.model_quality_alert_team sf_base.group_sf_tool_user 1 0 0 0
36 access_quality_alert_team_group_sf_order_user quality_alert_team_group_sf_order_user quality.model_quality_alert_team sf_base.group_sf_order_user 1 0 0 0
37 access_quality_alert_team_group_sf_mrp_manager quality_alert_team_group_sf_mrp_manager quality.model_quality_alert_team sf_base.group_sf_mrp_manager 1 0 0 0

16
sf_quality/views/view.xml
View File

@@ -31,4 +31,20 @@
</p>
</field>
</record>
<record model="ir.ui.view" id="quality_point_view_form_inherit_sf">
<field name="name">quality.point.form.inherit.sf</field>
<field name="model">quality.point</field>
<field name="inherit_id" ref="quality_control.quality_point_view_form_inherit_quality_control"/>
<field name="arch" type="xml">
<xpath expr="//form" position="inside">
<header>
<field name="check_state" invisible="1"/>
<button name="action_check" string="审核" type="object"
attrs="{'invisible': [('check_state','=', 'enable')]}"
class="oe_highlight"/>
</header>
</xpath>
</field>
</record>
</odoo>