modified sales
modified return entry
conflict resolved
modified sales return
Merge branch 'master' of https://github.com/technomicssolutions/smartbook