Pass on origin correctly when executing command from server side

telldus/src/telldus/DeviceManager.py

@@ -320,6 +320,9 @@ def stateUpdated(self, device, ackId=None, origin=None):
 		msg.append(extras)
 		self.live.send(msg)
 
+	"""
+	Send report to Live server that state change failed
+	"""
 	def stateUpdatedFail(self, device, state, stateValue, reason, origin):
 		if not self.live.registered:
 			return
@@ -347,12 +350,15 @@ def __handleCommand(self, msg):
 		action = args['action']
 		value = args['value'] if 'value' in args else None
 		deviceId = args['id']
+		originId = None
+		extras = msg.argument(1).toNative()
+		if extras and 'origin' in extras:
+			originId = extras['origin']
 		device = None
 		for dev in self.devices:
 			if dev.id() == deviceId:
 				device = dev
 				break
-
 		def success(state, stateValue):
 			if 'ACK' in args:
 				device.setState(state, stateValue, ack=args['ACK'])
@@ -373,7 +379,7 @@ def fail(reason):
 				# Abort the DeviceEvent this triggered
 				raise DeviceAbortException()
 
-		device.command(action, value, success=success, failure=fail)
+		device.command(action, value, success=success, failure=fail, origin=originId)
 
 	@TelldusLive.handler('device')
 	def __handleDeviceCommand(self, msg):