diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85776ce1..08209ecc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- None.
+## [v1.6.1] - 2022-01-18
+### Added
+- added docker image immigration to readme.
+- added QRCode in String to Space/Meter/Store/Tenant/Equipment/CombinedEquipment in API
+
+### Changed
+- added alternative parameter meteruuid to meter reports
+- updated docker installation in README
+- improved virtual meter editor in admin ui.
+- upgraded echarts version to 5.2.2 in web ui.
+
+### Fixed
+- None.
+
+### Removed
+- None.
+
+
## [v1.6.0] - 2021-12-31
### Added
- added energy output and input to combined equipment efficiency report
@@ -628,7 +646,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- None.
-[Unreleased]: https://github.com/MyEMS/myems/compare/v1.6.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.6.1...HEAD
+[v1.6.1]: https://github.com/MyEMS/myems/compare/v1.6.0...v1.6.1
[v1.6.0]: https://github.com/MyEMS/myems/compare/v1.5.1...v1.6.0
[v1.5.1]: https://github.com/MyEMS/myems/compare/v1.5.0...v1.5.1
[v1.5.0]: https://github.com/MyEMS/myems/compare/v1.4.0...v1.5.0
diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html
index 79c54383..912cfb91 100644
--- a/admin/views/common/footer-login.html
+++ b/admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html
index 1002d381..079696f4 100644
--- a/admin/views/common/footer.html
+++ b/admin/views/common/footer.html
@@ -3,6 +3,6 @@
https://myems.io
- {{'MY_EMS_NAME' | translate}} v1.6.0
+ {{'MY_EMS_NAME' | translate}} v1.6.1
diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
index ceb14e48..b6d4d1c2 100644
--- a/database/install/myems_system_db.sql
+++ b/database/install/myems_system_db.sql
@@ -1246,6 +1246,6 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_versions`
(`id`, `version`, `release_date`)
VALUES
-(1, '1.6.0', '2021-12-31');
+(1, '1.6.1', '2022-01-18');
COMMIT;
diff --git a/database/upgrade/upgrade1.6.1.sql b/database/upgrade/upgrade1.6.1.sql
new file mode 100644
index 00000000..13c700d0
--- /dev/null
+++ b/database/upgrade/upgrade1.6.1.sql
@@ -0,0 +1,6 @@
+START TRANSACTION;
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.6.1', release_date='2022-01-18' WHERE id=1;
+
+COMMIT;
\ No newline at end of file
diff --git a/myems-api/core/version.py b/myems-api/core/version.py
index e9697a5f..b29ebb1a 100644
--- a/myems-api/core/version.py
+++ b/myems-api/core/version.py
@@ -15,7 +15,7 @@ class VersionItem:
@staticmethod
def on_get(req, resp):
- result = {"version": 'MyEMS v1.6.0',
+ result = {"version": 'MyEMS v1.6.1',
"release-date": '2021-12-31',
"website": "https://myems.io"}
resp.text = json.dumps(result)
diff --git a/web/package-lock.json b/web/package-lock.json
index 48cae048..69108b09 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "myems",
- "version": "1.6.0",
+ "version": "1.6.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "myems",
- "version": "1.6.0",
+ "version": "1.6.1",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
diff --git a/web/package.json b/web/package.json
index a9793c52..d85d84c2 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "myems",
- "version": "1.6.0",
+ "version": "1.6.1",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/web/src/config.js b/web/src/config.js
index 42af5301..79a0c923 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.6.0';
+export const version = '1.6.1';
export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
export const topNavbarBreakpoint = 'lg';
//export const APIBaseURL = 'http://127.0.0.1:8000';