model for Sales return
conflict resolved
Vendor accounts template
conflict resolved