[MERGE] forward port of branch 9.0 up to dcab356

3 files changed, 17 insertions, 15 deletions

diff --git a/addons/barcodes/i18n/uk.po b/addons/barcodes/i18n/uk.po
index da8bb8c621d..364e8b0a1e9 100644
--- a/addons/barcodes/i18n/uk.po
+++ b/addons/barcodes/i18n/uk.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-14 10:27+0000\n"
-"PO-Revision-Date: 2016-04-26 14:41+0000\n"
+"PO-Revision-Date: 2016-05-06 12:24+0000\n"
 "Last-Translator: Bohdan Lisnenko\n"
 "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -137,7 +137,7 @@ msgstr "Дата створення"
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_display_name
 #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin_display_name
 msgid "Display Name"
-msgstr "Показати ім'я"
+msgstr "Назва для відображення"
 
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
diff --git a/addons/barcodes/i18n/zh_CN.po b/addons/barcodes/i18n/zh_CN.po
index 6e4e7cea618..99c8ef31cab 100644
--- a/addons/barcodes/i18n/zh_CN.po
+++ b/addons/barcodes/i18n/zh_CN.po
@@ -6,14 +6,15 @@
 # fausthuang, 2015
 # Gang LIU <liu9ang@hotmail.com>, 2016
 # Jeffery Chenn <jeffery9@gmail.com>, 2015
+# Jeffery Chenn <jeffery9@gmail.com>, 2016
 # zhangpeiqing <zpq001@live.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-14 10:27+0000\n"
-"PO-Revision-Date: 2016-04-27 09:49+0000\n"
-"Last-Translator: Gang LIU <liu9ang@hotmail.com>\n"
+"PO-Revision-Date: 2016-05-07 03:34+0000\n"
+"Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,19 +32,19 @@ msgstr "'*' 不是一个有效的规则的条码类型，你的意思是'.*' ?"
 #: code:addons/barcodes/barcodes.py:221
 #, python-format
 msgid ": a rule can only contain one pair of braces."
-msgstr "一条规则只能包含一对大括号"
+msgstr ": 一条规则只能包含一对大括号"
 
 #. module: barcodes
 #: code:addons/barcodes/barcodes.py:217
 #, python-format
 msgid ": braces can only contain N's followed by D's."
-msgstr "括号只能包含跟随D's的N's"
+msgstr ": 括号只能包含跟随D's的N's"
 
 #. module: barcodes
 #: code:addons/barcodes/barcodes.py:219
 #, python-format
 msgid ": empty braces."
-msgstr "空的括号"
+msgstr ": 空的括号"
 
 #. module: barcodes
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
@@ -104,7 +105,7 @@ msgstr "条码命名规则"
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern
 msgid "Barcode Pattern"
-msgstr "条码类型"
+msgstr "条码模式"
 
 #. module: barcodes
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_rule_form
@@ -155,14 +156,14 @@ msgstr "编码"
 #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:122
 #, python-format
 msgid "Error : Document not editable"
-msgstr "错误：文档不可被编辑"
+msgstr "错误：文档不可编辑"
 
 #. module: barcodes
 #. openerp-web
 #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
 #, python-format
 msgid "Error : No last scanned barcode"
-msgstr "错误 : 没有扫描条码"
+msgstr "错误 : 没有扫描到条码"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_id
@@ -176,7 +177,7 @@ msgstr "ID"
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule___last_update
 #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin___last_update
 msgid "Last Modified on"
-msgstr "最后修改日"
+msgstr "最后修改时间"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_uid
@@ -236,7 +237,7 @@ msgstr "设置数量"
 #. module: barcodes
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
 msgid "Tables"
-msgstr "表单"
+msgstr "表格"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule_pattern
@@ -324,12 +325,12 @@ msgstr "上次扫描的条码值"
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_nomenclature
 msgid "barcode.nomenclature"
-msgstr "条形码.命名法"
+msgstr "barcode.nomenclature"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_rule
 msgid "barcode.rule"
-msgstr "条形码.规则"
+msgstr "barcode.rule"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin
diff --git a/addons/barcodes/static/src/js/inherited_form_widget_button.js b/addons/barcodes/static/src/js/inherited_form_widget_button.js
index bf2ea1bbd35..79cf6deb823 100644
--- a/addons/barcodes/static/src/js/inherited_form_widget_button.js
+++ b/addons/barcodes/static/src/js/inherited_form_widget_button.js
@@ -15,7 +15,8 @@ var ButtonBarcodeHandlerMixin = _.extend({}, BarcodeHandlerMixin, {
             var self = this;
             this.on_barcode_scanned = function(barcode) {
                 var match = barcode.match(/O-BTN\.(.+)/);
-                if (match && match[1] === self.node.attrs.barcode_trigger && self.$el.is(':visible')) {
+                if (match && match[1] === self.node.attrs.barcode_trigger &&
+                    (self.$el.is(':visible') || self.$el.parent('.dropdown-menu'))) {
                     self.on_click();
                 }
             };