qihao.gong@jikimo.com 8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 ...

# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml

2023-07-14 09:02:48 +08:00

..

data

出入库单新增验证及单个外协表面工艺Bug修复

2023-05-17 14:18:23 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

2023-07-14 09:02:48 +08:00

report

合并

2022-11-30 14:42:52 +08:00

security

将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录

2023-07-13 16:05:38 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

2023-07-14 09:02:48 +08:00

__init__.py

更改制造模块名

2022-11-22 09:41:52 +08:00

__manifest__.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

2023-07-14 09:02:48 +08:00

.DS_Store

更改制造模块名

2022-11-22 09:41:52 +08:00