jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf

Browse Source 
# Conflicts:
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
This commit is contained in:
jinling.yang
2023-01-09 20:33:53 +08:00
parent b7723f82d0 3d882f5492
commit c3e5610b17
7 changed files with 210 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_manufacturing/models/__init__.py
View File

@@ -11,4 +11,3 @@ from . import res_user