Continuing with 2.5 fixes

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Continuing with 2.5 fixes

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Merge branch 'v2.5-fixes' of https://github.com/museele/megvel into v2.5-fixes
Fix errors after whitespace change

After the whitespace change, some errors were seen in hr_leaves.h,
a component of smartpay. It has been fixed.

Also working on erp_mailer

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
End of work day April 4th 2014

End of the day. Working on requisition emailing.

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Merge branch 'v2.5-fixes'

Most of the work in v2.5-fixes is about erp_mailer.
I am merging it to master, so that I can create a special
erp_mailer branch.

Signed-off-by: Joseph W Joshua