POS feature #2305
Required modifications done
Merge pull request #2383 from neilLasrado/pos

POS feature #2305