summaryrefslogtreecommitdiff
path: root/addons/hw_proxy/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-05-11 15:12:24 +0200
committerChristophe Simonis <chs@odoo.com>2015-05-11 15:12:24 +0200
commit0da722aa6a3a5b2ea8a9f740ea2ccc5ed2260b0a (patch)
tree9005a0ab8df9df374dda2d3cb4c8564bc73a023c /addons/hw_proxy/controllers
parentd756bab4d1d89af414b80523124b463252f31159 (diff)
parentbff6dffbb424a9ab458ae8fc2044f0b52490c36b (diff)
[MERGE] forward port of branch 8.0 up to bff6dff
Diffstat (limited to 'addons/hw_proxy/controllers')
-rw-r--r--addons/hw_proxy/controllers/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py
index 64f6cf0765c..337874cf67a 100644
--- a/addons/hw_proxy/controllers/main.py
+++ b/addons/hw_proxy/controllers/main.py
@@ -192,12 +192,12 @@ class Proxy(http.Controller):
print 'print_receipt' + str(receipt)
@http.route('/hw_proxy/is_scanner_connected', type='json', auth='none', cors='*')
- def print_receipt(self, receipt):
+ def is_scanner_connected(self, receipt):
print 'is_scanner_connected?'
return False
@http.route('/hw_proxy/scanner', type='json', auth='none', cors='*')
- def print_receipt(self, receipt):
+ def scanner(self, receipt):
print 'scanner'
time.sleep(10)
return ''