summaryrefslogtreecommitdiff
path: root/addons/pos_restaurant/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-26 12:57:31 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-26 12:57:31 +0200
commitc9a01ab30a09e9ac8dffbcaf54fa8391870e4d2a (patch)
tree39c6b60623b8bb05cb1e2de57fc88f57569cf0ac /addons/pos_restaurant/static/src
parente4663523b9352d19f59808224fd4a779a722869b (diff)
parent58c92d93747db9f51dd801ea6e6cfa43648ccd14 (diff)
[MERGE] forward port branch 10.0 up to 58c92d93747
Diffstat (limited to 'addons/pos_restaurant/static/src')
-rw-r--r--addons/pos_restaurant/static/src/js/multiprint.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 65956ffa66d..5270f103c48 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -29,8 +29,10 @@ var Printer = core.Class.extend(mixins.PropertiesMixin,{
self.connection.rpc('/hw_proxy/print_xml_receipt',{receipt: r},{timeout: 5000})
.then(function(){
send_printing_job();
- },function(){
+ },function(error, event){
self.receipt_queue.unshift(r);
+ console.log('There was an error while trying to print the order:');
+ console.log(error);
});
}
}
@@ -54,7 +56,7 @@ models.load_models({
for(var i = 0; i < printers.length; i++){
if(active_printers[printers[i].id]){
- var url = printers[i].proxy_ip;
+ var url = printers[i].proxy_ip || '';
if(url.indexOf('//') < 0){
url = 'http://'+url;
}