Merge branch 'master-upstream-patch-yusuf' into 'master-parthiv-upstream'

[FIX] Test cases for Mail and HR

See merge request flectra-hq/flectra!201

addons/barcodes/i18n/barcodes.pot

@@ -1,13 +1,13 @@
-# Translation of Odoo Server.
+# Translation of Flectra Server.
 # This file contains the translation of the following modules:
 #	* barcodes
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Flectra Server 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:53+0000\n"
-"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"POT-Creation-Date: 2019-03-26 12:03+0000\n"
+"PO-Revision-Date: 2019-03-26 12:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -53,10 +53,8 @@ msgid "A barcode nomenclature defines how the point of sale identify and interpr
 msgstr ""
 
 #. module: barcodes
-#: code:addons/barcodes/models/barcodes.py:183
 #: selection:barcode.rule,type:0
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
-#, python-format
 msgid "Alias"
 msgstr ""
 
@@ -76,9 +74,7 @@ msgid "An internal identification of the barcode nomenclature"
 msgstr ""
 
 #. module: barcodes
-#: code:addons/barcodes/models/barcodes.py:177
 #: selection:barcode.rule,encoding:0
-#, python-format
 msgid "Any"
 msgstr ""
 
@@ -142,8 +138,8 @@ msgid "Credit Card"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:359
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:372
 #, python-format
 msgid "Discard"
 msgstr ""
@@ -181,26 +177,31 @@ msgid "Encoding"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:301
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:308
 #, python-format
 msgid "Error : Barcode command is undefined"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
+#. flectra-web
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:63
 #, python-format
 msgid "Error : Document not editable"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:332
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:344
 #, python-format
 msgid "Error : No last scanned barcode"
 msgstr ""
 
+#. module: barcodes
+#: model:ir.model,name:barcodes.model_ir_http
+msgid "HTTP routing"
+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
@@ -278,8 +279,8 @@ msgid "Rules"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:352
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:364
 #, python-format
 msgid "Select"
 msgstr ""
@@ -290,8 +291,8 @@ msgid "Sequence"
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:351
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:363
 #, python-format
 msgid "Set quantity"
 msgstr ""
@@ -330,15 +331,15 @@ msgid "This rule will apply only if the barcode is encoded with the specified en
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
+#. flectra-web
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:64
 #, python-format
 msgid "To modify this document, please first start edition."
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:333
+#. flectra-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:345
 #, python-format
 msgid "To set the quantity please scan a barcode first."
 msgstr ""
@@ -369,9 +370,7 @@ msgid "UPC/EAN Conversion"
 msgstr ""
 
 #. module: barcodes
-#: code:addons/barcodes/models/barcodes.py:184
 #: selection:barcode.rule,type:0
-#, python-format
 msgid "Unit Product"
 msgstr ""
 

addons/barcodes/models/barcodes.py

@@ -174,14 +174,14 @@ class BarcodeRule(models.Model):
     barcode_nomenclature_id = fields.Many2one('barcode.nomenclature', string='Barcode Nomenclature')
     sequence = fields.Integer(string='Sequence', help='Used to order rules such that rules with a smaller sequence match first')
     encoding = fields.Selection([
-                ('any', _('Any')),
+                ('any', 'Any'),
                 ('ean13', 'EAN-13'),
                 ('ean8', 'EAN-8'),
                 ('upca', 'UPC-A'),
         ], string='Encoding', required=True, default='any', help='This rule will apply only if the barcode is encoded with the specified encoding')
     type = fields.Selection([
-            ('alias', _('Alias')),
-            ('product', _('Unit Product'))
+            ('alias', 'Alias'),
+            ('product', 'Unit Product')
         ], string='Type', required=True, default='product')
     pattern = fields.Char(string='Barcode Pattern', size=32, help="The barcode matching pattern", required=True, default='.*')
     alias = fields.Char(string='Alias', size=32, default='0', help='The matched pattern will alias to this barcode', required=True)

addons/barcodes/static/src/js/barcode_events.js

@@ -143,6 +143,8 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
             e.key === "ArrowUp" || e.key === "ArrowDown" ||
             e.key === "Escape" || e.key === "Tab" ||
             e.key === "Backspace" || e.key === "Delete" ||
+            e.key === "Home" || e.key === "End" ||
+            e.key === "PageUp" || e.key === "PageDown" ||
             e.key === "Unidentified" || /F\d\d?/.test(e.key)) {
             return true;
         } else {