Fixed bug in weekly report, added PRPSAL row
Moved code into model