jikimo/jikimo_sf
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 develop

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
This commit is contained in:
gqh
2023-01-04 10:35:38 +08:00
parent 08efe7813d fd0d65867e
commit b53fddeec5
42 changed files with 1746 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/views/model_type_view.xml
View File

@@ -31,7 +31,7 @@
<form string="模型类型">
<group>
<field name="name" required="1"/>
<field name="embryo_tolerance" required="1"/>
<field name="embryo_tolerance" string="胚料容余(mm)"/>
</group>
<group>
<field name='routing_tmpl_ids'>

2
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -107,7 +107,7 @@
</xpath>
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
<field name="machine_tool_id"/>
<field name="machine_tool_id" domain="[('is_binding', '=', False)]"/>
</xpath>
</field>
</record>