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 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
This commit is contained in:
qihao.gong@jikimo.com
2023-07-14 09:02:48 +08:00
parent 5e8e380a8e 2161f4c140
commit 8f795096c3
41 changed files with 846 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -91,8 +91,8 @@
<xpath expr="//field[@name='company_id']" position="after">
<field name="users_ids" widget="many2many_tags" string="可操作用户"/>
</xpath>
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
<field name="production_line_id"/>
<field name="equipment_id"/>
</xpath>
<xpath expr="//field[@name='resource_calendar_id']" position="after">