Change default fusion number
Merge branch 'master' into module
FX-27: fix bug
Update logic again
Revert FX-18 to fix Timezone issue
Fix bug Time in Invoice
FX-33: fix
Merge remote-tracking branch 'origin/master' into module