jinling.yang 2acdbca2b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协 ...

# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py

2023-04-21 15:40:03 +08:00

..

data

优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’

2023-04-20 19:39:12 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

2023-04-21 15:40:03 +08:00

static/util

产品创建时上传3D模型

2023-03-10 10:53:05 +08:00

views

优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’

2023-04-20 19:39:12 +08:00

__init__.py

212

2022-11-21 20:04:56 +08:00

__manifest__.py

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00