# Conflicts: # sf_manufacturing/models/mrp_production.py # sf_manufacturing/views/mrp_production_addional_change.xml