Merge pull request #17 from webERP-team/master

Merge from webERP-team/webERP
timschofield · Dec 30, 2018 · 5450b3d · 5450b3d
2 parents 1d876c8 + 26ab68b
commit 5450b3d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -15,7 +15,8 @@ For changelogs earlier than v4.14.1, please refer to [CHANGELOG_ARCHIVE.md].
 
 | Description | Type | Author | Date | Details | Ref |
 |:-----------:|:----:|:------:|:----:|:-------:|:---:|
-| Fix show/hide field help text | Fixed | Rafael Chacón | 2018-12-28 | [View](https://github.com/webERP-team/webERP/commit/950b4891efe32e05791961e98f8b0e7a92f3ba4e) |   |
+| Fix variable used in function fShowPageHelp | Fixed | Rafael Chacón | 2018-12-30 | [View](https://github.com/webERP-team/webERP/commit/b48c70708c5ae96c46f5162076ab03e9170ca791) |   |
+| Fix SQL in Timesheets per Tim | Fixed | Phil Daintree | 2018-12-29 | [View](https://github.com/webERP-team/webERP/commit/b0d816d88fa55c2e56e7d7a6f46987e44472a30b) |   |
 | Improve the readability of a script | Changed | Rafael Chacón | 2018-12-27 | [View](https://github.com/webERP-team/webERP/commit/9dd0c6ca06fbbb3bd879395ec7721e79d7b5af54) |   |
 | Improve the readability of a script | Changed | Rafael Chacón | 2018-12-26 | [View](https://github.com/webERP-team/webERP/commit/9afe079de81088e1aa9b30f2bd6eed2886068a34) |   |
 | Sort the bank accounts | Changed | Rafael Chacón | 2018-12-18 | [View](https://github.com/webERP-team/webERP/commit/79d88db4ea04099473edfc7f1ddd84deb4ad500f) |   |