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

..

commons

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +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

security

1.优化sf的产品页面展示：新增服务产品的工艺参数字段，当产品类别为服务时，该字段出现出现，材料和型号隐藏；加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数

2023-04-03 17:42:31 +08:00

views

合并企业版模块

2023-04-21 11:24:52 +08:00

__init__.py

212

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

__manifest__.py

去掉警告及开发表面工艺相关需求

2023-03-27 21:04:33 +08:00