7163e025d2d940ddb47c3579fcb26759d82d8a95
# Conflicts: # sf_manufacturing/security/ir.model.access.csv
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0
#jikimo_sf
Description