fixed conflict context key, incorrect  filter condition
Merge branch 'master' of https://github.com/shine-it/purchase_supplied_goods