odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] point_of_sale & hw_proxy: connect the pos to the new proxy, and fix scale emulation 

bzr revid: fva@openerp.com-20131219142911-i9mkwqt1e0wz28i7
This commit is contained in:
Frédéric van der Essen 2013-12-19 15:29:11 +01:00
parent 1a7eed01a7
commit 2fec901cb5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hw_proxy/controllers/main.py
View File

@ -14,6 +14,9 @@ _logger = logging.getLogger(__name__)
class ProxyController(http.Controller):
def __init__(self):
self.scale = 'closed'
self.scale_weight = 0.0
pass
@http.route('/hw_proxy/test_connection', type='json', auth='admin')
def test_connection(self):

2
addons/point_of_sale/static/src/js/devices.js
View File

@ -118,7 +118,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
callbacks[i](params);
}
if(this.connected){
return this.connection.rpc('/pos/' + name, params || {});
return this.connection.rpc('/hw_proxy/' + name, params || {});
}else{
return (new $.Deferred()).reject();
}