Merge branch 'master' into testing

scripts/general-settings.js

@@ -72,7 +72,15 @@ if (raisedEvent.name=='heating-controller.general-settings') {
 			}
 			if (raisedEvent.parameter.actions=='setApartmentClimateControl') {
 				storeParameter('generalSettings/heatingEnabled',((""+raisedEvent.parameter.value)=="true"));
-				var fShouldBeValue=-1;
+				var fShouldBeValue=StatusWaterHeatingSystem.noWater;
+				if (Property.getNode("generalSettings/capabilities/heatingSupported")!=null)
+					if (Property.getNode("generalSettings/capabilities/coolingSupported")!=null) {
+						if (Property.getProperty("generalSettings/capabilities/heatingSupported")==true)
+							fShouldBeValue=StatusWaterHeatingSystem.hotWater;
+						if (Property.getProperty("generalSettings/capabilities/heatingSupported")==false)
+							if (Property.getProperty("generalSettings/capabilities/coolingSupported")==true)
+								fShouldBeValue=StatusWaterHeatingSystem.coldWater;
+					}
 				if ((""+raisedEvent.parameter.value)!="true") {
 					fShouldBeValue=StatusWaterHeatingSystem.noWater;
 				}