Changed the billmatepopup includeway to prevent it is loaded multiple times.

Also updated partpaymentcalculations