added sorting by product code
Merge remote-tracking branch 'origin/master'