70b8521b902a8ca68d7658d19f899bd48bd71194
# Conflicts: # sf_manufacturing/models/mrp_production.py # sf_manufacturing/models/mrp_workorder.py
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0
#jikimo_sf
Description
Languages
Python
53%
JavaScript
30%
SCSS
8.1%
HTML
5.1%
CSS
1.9%
Other
1.9%