Merge pull request #295 from Rakeshadlagatta/master

sortBy priority addded
Merge pull request #296 from Rakeshadlagatta/obsplatform-2.02

sortBy priority addded
.
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
Merge branch 'obsplatform-2.02'
..
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
item units changes
in create client city auto complete bug fixed
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
..
move provision into system
Merge pull request #297 from raghuvissu/obsplatform-2.02

in create client city auto complete bug fixed
Merge pull request #298 from Ranjith15/obsplatform-2.02

item code with unit (pieces)
.
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
Merge branch 'obsplatform-2.02'
globalpay changes
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
'globalpay changes in branch'
globalpay changes