..
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
Merge pull request #76 from Rakeshadlagatta/obsplatform-2.02

SortBy chanhes here
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
remove ids&duplicate order
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
item code with units
item code with units
..
Merge branch 'obsplatform-2.02' of https://github.com/Ranjith15/Project-One into obsplatform-2.02
..
onlinePaymentSystem
Merge remote-tracking branch 'upstream/master'
'Online Payment'
OnlinePayment
Merge pull request #77 from Ranjith15/obsplatform-2.02

item code with unit (pieces)
.
.
.
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
Merge pull request #78 from kiranhugo/obsplatform-2.02

Removed Device agrement type at server side