[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order
[fix] [minor] merge conflict fixed
Merge pull request #1205 from akhileshdarjee/master

[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order