summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2015-10-14 17:00:33 +0200
committerCedric Snauwaert <csn@openerp.com>2015-10-14 17:06:02 +0200
commit1487cf4e16384b2c217df01de4af2e5caabb3e37 (patch)
tree74a4f38ef0aba4f9f482377419f96968a75c4d4c
parent101bb927a070aaab1dba0c1e3d8500d43f97fe7f (diff)
[FIX] stock: fix problem in barcode interface when trying to scan a location with a scanner
this fix a problem when trying to scan a location inside the opened modal to change location from a product
-rw-r--r--addons/stock/static/src/js/widgets.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js
index 3126911a677..b66abbd310b 100644
--- a/addons/stock/static/src/js/widgets.js
+++ b/addons/stock/static/src/js/widgets.js
@@ -152,7 +152,7 @@ function openerp_picking_widgets(instance){
});
this.$('.oe_searchbox').blur(function(){
self.getParent().barcode_scanner.connect(function(ean){
- self.get_Parent().scan(ean);
+ self.getParent().scan(ean);
});
})
this.$('#js_select').change(function(){
@@ -844,8 +844,8 @@ function openerp_picking_widgets(instance){
if (result.filter_loc !== false){
//check if we have receive a location as answer
if (result.filter_loc !== undefined){
- var modal_loc_hidden = self.$('#js_LocationChooseModal').attr('aria-hidden');
- if (modal_loc_hidden === "false"){
+ var modal_loc_hidden = self.$('#js_LocationChooseModal:visible');
+ if (modal_loc_hidden.length > 0){
var line = self.$('#js_LocationChooseModal .js_loc_option[data-loc-id='+result.filter_loc_id+']').attr('selected','selected');
}
else{