[Tsheetx-developers] Merged into trunk

[David T. <tom...@us...>]

I've just committed a revision to the trunk merging the changes made in the v2.0 branch back into the 1.5.3 codebase. It has taken a while (off and on for the past year or so), but it gives us one common codebase again. By committing this now, I am looking for help to finish it and release a v2.0.

The efforts to achieve a v2.0 died off nearly two years ago, but there was some good progress made on features like:
- expenses
- approvals (for timesheet and expenses)
- internationalisation
It would have been a shame if these were left to rot. There is another branch (txsheet-2.0-timezone) that has not yet been merged back.

The trunk version (revision 496) is not finished, or tested thoroughly, and there is not installer for it. Given an appropriate database, the code Shows most of the pages without errors.

Cheers