[MERGE] forward port of branch 9.0 up to 97e87a4

8 files changed, 343 insertions, 35 deletions

diff --git a/addons/barcodes/i18n/ca.po b/addons/barcodes/i18n/ca.po
index 3d61ed7f599..6a3ac69b283 100644
--- a/addons/barcodes/i18n/ca.po
+++ b/addons/barcodes/i18n/ca.po
@@ -8,7 +8,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: 2015-12-05 23:18+0000\n"
+"PO-Revision-Date: 2015-12-21 22:41+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
 msgid "Alias"
-msgstr ""
+msgstr "Àlies"
 
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
diff --git a/addons/barcodes/i18n/es.po b/addons/barcodes/i18n/es.po
index 43d76beb9f8..32665e35a08 100644
--- a/addons/barcodes/i18n/es.po
+++ b/addons/barcodes/i18n/es.po
@@ -3,6 +3,7 @@
 # * barcodes
 # 
 # Translators:
+# Antonio Trueba, 2015
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2015
 # Sergio Hevia <sah@talleresbernesga.com>, 2015
 msgid ""
@@ -10,8 +11,8 @@ 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: 2015-10-07 07:48+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
+"PO-Revision-Date: 2015-12-31 17:13+0000\n"
+"Last-Translator: Antonio Trueba\n"
 "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 #: code:addons/barcodes/barcodes.py:223
 #, python-format
 msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?"
-msgstr ""
+msgstr "'*' no es un patrón Regex válido para código de barras. ¿Quizás quiso usar '.*'?"
 
 #. module: barcodes
 #: code:addons/barcodes/barcodes.py:221
@@ -35,13 +36,13 @@ msgstr ": una regla solo puede contener un par de paréntesis."
 #: code:addons/barcodes/barcodes.py:217
 #, python-format
 msgid ": braces can only contain N's followed by D's."
-msgstr ""
+msgstr ": los paréntesis solo pueden contener Ns seguidas por Ds."
 
 #. module: barcodes
 #: code:addons/barcodes/barcodes.py:219
 #, python-format
 msgid ": empty braces."
-msgstr ""
+msgstr ": paréntesis vacíos."
 
 #. module: barcodes
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
@@ -50,14 +51,14 @@ msgid ""
 "                                When a barcode is scanned it is associated to the <i>first</i> rule with a matching\n"
 "                                pattern. The pattern syntax is that of regular expression, and a barcode is matched\n"
 "                                if the regular expression matches a prefix of the barcode."
-msgstr ""
+msgstr "Las <i>nomenclaturas de códigos de barras</i> definen cómo se reconocen y categorizan\nlos códigos de barras. Cuando se escanea un código de barras se asocia a la <i>primera</i>\nregla con un patrón coincidente. La sintaxis de los patrones es la de una expresión\nregular, y un código de barras se reconoce si la expresión regular coincide con un\nprefijo del código de barras."
 
 #. module: barcodes
 #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
 msgid ""
 "A barcode nomenclature defines how the point of sale identify and interprets"
 " barcodes"
-msgstr ""
+msgstr "Una nomenclatura de código de barras define cómo identifica e interpreta un punto de venta los códigos de barras"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
@@ -72,12 +73,12 @@ msgstr "Siempre"
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule_name
 msgid "An internal identification for this barcode nomenclature rule"
-msgstr ""
+msgstr "Un identificador interno para esta regla de nombra de código de barras"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_name
 msgid "An internal identification of the barcode nomenclature"
-msgstr ""
+msgstr "Un identificador interno para la nomenclatura de código de barras"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id
@@ -192,7 +193,7 @@ msgid ""
 "                                decimals indicated with D's, such as <code>{NNNDD}</code>. In these cases, \n"
 "                                the barcode field on the associated records <i>must</i> show these digits as \n"
 "                                zeroes."
-msgstr ""
+msgstr "Los patrones también pueden definir cómo se codifican valores numéricos, tales como\nel peso o el precio, en el código de barras. Se indican por <code>[NNN}</code>,\ndonde las Ns definen en qué posición se codifican los números. También se permiten\nnúmeros reales si los decimales se indican con Ds, por ejemplo <code>{NNNDD}</code>.\nEn estos casos, el campo de código de barras en los registros asociados <i>debe</i>\nmostrar ceros en esas posiciones."
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name
@@ -241,7 +242,7 @@ msgstr "Hay un error de sintaxis en el patrón de código de barras"
 msgid ""
 "This rule will apply only if the barcode is encoded with the specified "
 "encoding"
-msgstr ""
+msgstr "Esta regla solo aplicará si el código de barras está codificado con la codificación especificada"
 
 #. module: barcodes
 #. openerp-web
@@ -261,7 +262,7 @@ msgid ""
 "UPC Codes can be converted to EAN by prefixing them with a zero. This "
 "setting determines if a UPC/EAN barcode should be automatically converted in"
 " one way or another when trying to match a rule with the other encoding."
-msgstr ""
+msgstr "Los códigos UPC se pueden convertir a EAN prefijándolos con un cero. Este ajuste determina si un código de barras UPC/EAN debe ser convertido automáticamente en uno u otro sentido al buscar una coincidencia con la otra codificación."
 
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
diff --git a/addons/barcodes/i18n/fo.po b/addons/barcodes/i18n/fo.po
new file mode 100644
index 00000000000..25cf2908aaa
--- /dev/null
+++ b/addons/barcodes/i18n/fo.po
@@ -0,0 +1,298 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * barcodes
+# 
+# Translators:
+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: 2015-12-22 23:50+0000\n"
+"Last-Translator: Jarnhold Nattestad <nattestads@gmail.com>\n"
+"Language-Team: Faroese (http://www.transifex.com/odoo/odoo-9/language/fo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: barcodes
+#: code:addons/barcodes/barcodes.py:223
+#, python-format
+msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?"
+msgstr ""
+
+#. module: barcodes
+#: code:addons/barcodes/barcodes.py:221
+#, python-format
+msgid ": a rule can only contain one pair of braces."
+msgstr ""
+
+#. module: barcodes
+#: code:addons/barcodes/barcodes.py:217
+#, python-format
+msgid ": braces can only contain N's followed by D's."
+msgstr ""
+
+#. module: barcodes
+#: code:addons/barcodes/barcodes.py:219
+#, python-format
+msgid ": empty braces."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
+msgid ""
+"<i>Barcodes Nomenclatures</i> define how barcodes are recognized and categorized.\n"
+"                                When a barcode is scanned it is associated to the <i>first</i> rule with a matching\n"
+"                                pattern. The pattern syntax is that of regular expression, and a barcode is matched\n"
+"                                if the regular expression matches a prefix of the barcode."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
+msgid ""
+"A barcode nomenclature defines how the point of sale identify and interprets"
+" barcodes"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
+msgid "Alias"
+msgstr ""
+
+#. module: barcodes
+#: selection:barcode.nomenclature,upc_ean_conv:0
+msgid "Always"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_rule_name
+msgid "An internal identification for this barcode nomenclature rule"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_name
+msgid "An internal identification of the barcode nomenclature"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
+msgid "Barcode Nomenclature"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree
+msgid "Barcode Nomenclatures"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern
+msgid "Barcode Pattern"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_rule_form
+msgid "Barcode Rule"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned
+msgid "Barcode Scanned"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
+msgid "Click to add a Barcode Nomenclature ."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_uid
+msgid "Created by"
+msgstr "Byrjað av"
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_date
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_date
+msgid "Created on"
+msgstr "Byrjað tann"
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_display_name
+#: 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 "Vís navn"
+
+#. module: barcodes
+#: selection:barcode.nomenclature,upc_ean_conv:0
+msgid "EAN-13 to UPC-A"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_encoding
+msgid "Encoding"
+msgstr ""
+
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51
+#, python-format
+msgid "Error : Document not editable"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_id
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_id
+#: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin_id
+msgid "ID"
+msgstr "ID"
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature___last_update
+#: 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 "Seinast rættað tann"
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_uid
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_uid
+msgid "Last Updated by"
+msgstr "Seinast dagført av"
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_date
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_date
+msgid "Last Updated on"
+msgstr "Seinast dagført tann"
+
+#. module: barcodes
+#: selection:barcode.nomenclature,upc_ean_conv:0
+msgid "Never"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_name
+msgid "Nomenclature Name"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
+msgid ""
+"Patterns can also define how numerical values, such as weight or price, can be\n"
+"                                encoded into the barcode. They are indicated by <code>{NNN}</code> where the N's\n"
+"                                define where the number's digits are encoded. Floats are also supported with the \n"
+"                                decimals indicated with D's, such as <code>{NNNDD}</code>. In these cases, \n"
+"                                the barcode field on the associated records <i>must</i> show these digits as \n"
+"                                zeroes."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name
+msgid "Rule Name"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_rule_ids
+msgid "Rules"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
+msgid "Tables"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_rule_pattern
+msgid "The barcode matching pattern"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_rule_ids
+msgid "The list of barcode rules"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_rule_alias
+msgid "The matched pattern will alias to this barcode"
+msgstr ""
+
+#. module: barcodes
+#: code:addons/barcodes/barcodes.py:217 code:addons/barcodes/barcodes.py:219
+#: code:addons/barcodes/barcodes.py:221
+#, python-format
+msgid "There is a syntax error in the barcode pattern "
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_rule_encoding
+msgid ""
+"This rule will apply only if the barcode is encoded with the specified "
+"encoding"
+msgstr ""
+
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51
+#, python-format
+msgid "To modify this document, please first start edition."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_type
+msgid "Type"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_upc_ean_conv
+msgid ""
+"UPC Codes can be converted to EAN by prefixing them with a zero. This "
+"setting determines if a UPC/EAN barcode should be automatically converted in"
+" one way or another when trying to match a rule with the other encoding."
+msgstr ""
+
+#. module: barcodes
+#: selection:barcode.nomenclature,upc_ean_conv:0
+msgid "UPC-A to EAN-13"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_upc_ean_conv
+msgid "UPC/EAN Conversion"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcode_rule_sequence
+msgid ""
+"Used to order rules such that rules with a smaller sequence match first"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model.fields,help:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned
+msgid "Value of the last barcode scanned."
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model,name:barcodes.model_barcode_nomenclature
+msgid "barcode.nomenclature"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model,name:barcodes.model_barcode_rule
+msgid "barcode.rule"
+msgstr ""
+
+#. module: barcodes
+#: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin
+msgid "barcodes.barcode_events_mixin"
+msgstr ""
diff --git a/addons/barcodes/i18n/fr.po b/addons/barcodes/i18n/fr.po
index b3ed71cc0d6..f9256a4c971 100644
--- a/addons/barcodes/i18n/fr.po
+++ b/addons/barcodes/i18n/fr.po
@@ -13,7 +13,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: 2015-12-07 19:48+0000\n"
+"PO-Revision-Date: 2015-12-24 18:20+0000\n"
 "Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -184,7 +184,7 @@ msgstr "Jamais"
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_name
 msgid "Nomenclature Name"
-msgstr "Nom de nomenclature"
+msgstr "Nom de la nomenclature"
 
 #. module: barcodes
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
@@ -195,7 +195,7 @@ msgid ""
 "                                decimals indicated with D's, such as <code>{NNNDD}</code>. In these cases, \n"
 "                                the barcode field on the associated records <i>must</i> show these digits as \n"
 "                                zeroes."
-msgstr "Les modèles peuvent aussi définir comment les valeur numériques telles que le poids ou le prix, peuvent être\n                                encodées dans le code-barres. Ils sont indiqués par le <code>{NNN}</code> où les N's\n                                définissent où les chiffres du numéro sont encodés. Les flotteurs sont également pris en charge avec les\n                                decimales indiquées avec les D's, tel que <code>{NNNDD}</code>. Dans ces cas, \n                                le champs du code-barres sur les enregistrements associés <i>doivent</i> montrer ces chiffres commes \n                                zéros."
+msgstr "Les motifs peuvent aussi définir comment les valeurs numériques telles que le poids ou le prix, peuvent être\n                                encodées dans le code-barres. Ils sont indiqués par le <code>{NNN}</code> où les N's\n                                définissent où les chiffres du numéro sont encodés. Les flotteurs sont également pris en charge avec les\n                                décimales indiquées avec les D's, tel que <code>{NNNDD}</code>. Dans ces cas-là, \n                                le champ du code-barres sur les enregistrements associés <i>doivent</i> montrer ces chiffres commes \n                                zéros."
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name
diff --git a/addons/barcodes/i18n/pt.po b/addons/barcodes/i18n/pt.po
index 44bfa3d3783..77f4334b334 100644
--- a/addons/barcodes/i18n/pt.po
+++ b/addons/barcodes/i18n/pt.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: 2015-12-12 13:13+0000\n"
+"PO-Revision-Date: 2015-12-20 19:33+0000\n"
 "Last-Translator: Vitor Fernandes <vmlf01@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 #: code:addons/barcodes/barcodes.py:223
 #, python-format
 msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?"
-msgstr ""
+msgstr " '*' não é um padrão do código de barras válido. Quis dizer '.*' ?"
 
 #. module: barcodes
 #: code:addons/barcodes/barcodes.py:221
@@ -242,7 +242,7 @@ msgstr "Há um erro de sintaxe no padrão do código de barras"
 msgid ""
 "This rule will apply only if the barcode is encoded with the specified "
 "encoding"
-msgstr ""
+msgstr "Esta regra só será aplicada se o código de barras estiver codificado com a codificação indicada"
 
 #. module: barcodes
 #. openerp-web
diff --git a/addons/barcodes/i18n/vi.po b/addons/barcodes/i18n/vi.po
index b9a58737df2..53b63bc1929 100644
--- a/addons/barcodes/i18n/vi.po
+++ b/addons/barcodes/i18n/vi.po
@@ -8,7 +8,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: 2015-09-07 16:17+0000\n"
+"PO-Revision-Date: 2015-12-29 08:18+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Vietnamese (http://www.transifex.com/odoo/odoo-9/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -126,7 +126,7 @@ msgstr "Được tạo vào"
 #: 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 "Tên hiển thị"
 
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
@@ -157,7 +157,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 "Sửa lần cuối vào"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_uid
diff --git a/addons/barcodes/i18n/zh_CN.po b/addons/barcodes/i18n/zh_CN.po
index 626fa1aad09..777128ade30 100644
--- a/addons/barcodes/i18n/zh_CN.po
+++ b/addons/barcodes/i18n/zh_CN.po
@@ -3,6 +3,7 @@
 # * barcodes
 # 
 # Translators:
+# fausthuang, 2015
 # jeffery chen fan <jeffery9@gmail.com>, 2015
 # zhangpeiqing <zpq001@live.com>, 2015
 msgid ""
@@ -10,8 +11,8 @@ 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: 2015-12-17 03:03+0000\n"
-"Last-Translator: jeffery chen fan <jeffery9@gmail.com>\n"
+"PO-Revision-Date: 2015-12-23 04:46+0000\n"
+"Last-Translator: fausthuang\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"
@@ -23,25 +24,25 @@ msgstr ""
 #: code:addons/barcodes/barcodes.py:223
 #, python-format
 msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?"
-msgstr "'*' 不是一个有效的规则的条码类型，你是否是想输入'.*' ?"
+msgstr "'*' 不是一个有效的规则的条码类型，你的意思是'.*' ?"
 
 #. module: barcodes
 #: 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
@@ -50,7 +51,7 @@ msgid ""
 "                                When a barcode is scanned it is associated to the <i>first</i> rule with a matching\n"
 "                                pattern. The pattern syntax is that of regular expression, and a barcode is matched\n"
 "                                if the regular expression matches a prefix of the barcode."
-msgstr "<i>条码命名规则</i>定义条码的辨识和分类。\n　　　　　　　　　　　　　　　　　　　　当条码被扫码前扫了之后，它就会匹配到相关的<i>第一条<i>规则。模式的语法是正则表达式，如果正则表达式匹配的是条码的前缀，则匹配一个条码"
+msgstr "<i>条码命名规则</i>定义条码的辨识和分类。当条码被扫码前扫了之后，它就会匹配到相关的<i>第一条<i>规则。模式的语法是正则表达式，如果正则表达式匹配的是条码的前缀，则匹配一个条码"
 
 #. module: barcodes
 #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
@@ -192,7 +193,7 @@ msgid ""
 "                                decimals indicated with D's, such as <code>{NNNDD}</code>. In these cases, \n"
 "                                the barcode field on the associated records <i>must</i> show these digits as \n"
 "                                zeroes."
-msgstr "模式也可以定义为怎样给数字取值，例如重量或者价格也可以被编码为条码。\n它们可以由 <code>{NNN}</code>被定义，　在这里Ｎ用来定义数字的编码\n浮点型也能用Ｄ表示，例如<code>{NNNDD}</code>。在这些情景中，\n在相关记录的<i>必填</i>的条码字段显示为０"
+msgstr "模式也可以定义为怎样给数字取值，例如重量或者价格也可以被编码为条码。\n它们可以由 <code>{NNN}</code>被定义，　在这里Ｎ用来定义数字的位数\n小数也能用Ｄ表示，例如<code>{NNNDD}</code>。在这些情景中，\n在相关记录的<i>必填</i>的条码字段显示为０"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name
@@ -234,7 +235,7 @@ msgstr "匹配模式将别名到该条码"
 #: code:addons/barcodes/barcodes.py:221
 #, python-format
 msgid "There is a syntax error in the barcode pattern "
-msgstr "条码模式中有一个语法错误"
+msgstr "条码模式中有一个句式错误"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule_encoding
@@ -261,7 +262,7 @@ msgid ""
 "UPC Codes can be converted to EAN by prefixing them with a zero. This "
 "setting determines if a UPC/EAN barcode should be automatically converted in"
 " one way or another when trying to match a rule with the other encoding."
-msgstr "UPC码可以转换为EAN的前缀与一零。此设置确定UPC / EAN条码应自动转换成一种或另一种方式在与其他编码规则。"
+msgstr "UPC码可以转换为EAN，前缀加个零。此设置确定UPC / EAN条码应以一种或另一种方式自动转换当在与其他编码规则匹配时。"
 
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
@@ -287,12 +288,12 @@ msgstr "上次扫描的条码值"
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_nomenclature
 msgid "barcode.nomenclature"
-msgstr "barcode.nomenclature"
+msgstr "条形码.命名法"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_rule
 msgid "barcode.rule"
-msgstr "barcode.rule"
+msgstr "条形码.规则"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin
diff --git a/addons/barcodes/static/src/js/field_float_scannable.js b/addons/barcodes/static/src/js/field_float_scannable.js
index 1a461f0048c..79022362251 100644
--- a/addons/barcodes/static/src/js/field_float_scannable.js
+++ b/addons/barcodes/static/src/js/field_float_scannable.js
@@ -2,6 +2,7 @@ odoo.define('barcodes.FieldFloatScannable', function(require) {
 "use strict";
 
 var core = require('web.core');
+var formats = require('web.formats');
 var form_widgets = require('web.form_widgets');
 
 // Field in which the user can both type normally and scan barcodes
@@ -14,6 +15,13 @@ var FieldFloatScannable = form_widgets.FieldFloat.extend({
         'keypress': 'simulateKeypress',
     },
 
+    // Widget values are parsed according to the widget type. Since this widget is of type
+    // "FieldFloatScannable" and there is no parsing planned for this type, it defaults
+    // to outputting the value as a string. Hence the need to redefine parse_value
+    parse_value: function(val, def) {
+        return formats.parse_value(val, {type: "float"}, def);
+    },
+
     simulateKeypress: function (e) {
         var character = String.fromCharCode(e.which);
         var current_str = e.target.value;