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

..

commons

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

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

models

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

security

同步刀具标准库

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

static

去掉注释，及修改转换3d模型文件的位置

2023-11-08 17:41:18 +08:00

views

整合所有模块依赖

2023-11-08 17:13:18 +08:00

__init__.py

去掉不要的引用

2023-07-17 17:35:55 +08:00

__manifest__.py

修复刀具产品及同步刀具标准库

2023-11-01 17:45:54 +08:00