fix discontinue/adding problems in decision module
finalize report problem caused by discontinue and adding new product
Merge branch 'haosun' of https://github.com/ludwiksh/Marksimos into 0915-2
Merge branch '0915-2'