Merge pull request #4268 from saurabh6790/drop-shipping

[fixes] missing delivered by supplier field