qihao.gong@jikimo.com 6fc735063a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug ...

# Conflicts:
#	sf_manufacturing/models/stock.py

2023-11-20 15:41:50 +08:00

..

__init__.py

同步刀具标准库

2023-10-19 10:49:54 +08:00

base.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2023-11-20 15:41:50 +08:00

common.py

根据odoo规则修改py文件中得import顺序

2023-11-20 14:59:06 +08:00

fixture.py

修改设备table的样式 修改关联品牌根据各不同类别展示

2023-10-12 14:10:29 +08:00

functional_fixture.py

去掉警告

2023-08-29 10:22:12 +08:00

tool_base_new.py

修复同步刀具标准库

2023-11-02 17:17:34 +08:00

tool_other_features.py

产品优化

2023-11-16 17:35:04 +08:00