[MERGE] forward port branch saas-15 up to c6353942ffd

5 files changed, 8 insertions, 6 deletions

diff --git a/addons/hw_screen/controllers/main.py b/addons/hw_screen/controllers/main.py
index b8e59fbfdd6..b4388e8de3c 100644
--- a/addons/hw_screen/controllers/main.py
+++ b/addons/hw_screen/controllers/main.py
@@ -150,7 +150,7 @@ class HardwareScreen(web.Home):
                 </head>
                 <body class="original_body">
                     <div hidden class="shadow"></div>
-                    <div class="container">
+                    <div class="container-fluid">
                     <div class="row">
                         <div class="col-md-4 col-md-offset-4">
                             <h1>Odoo Point of Sale</h1>
diff --git a/addons/hw_screen/static/src/js/worker.js b/addons/hw_screen/static/src/js/worker.js
index 55e389e78ab..b67d611c4ca 100644
--- a/addons/hw_screen/static/src/js/worker.js
+++ b/addons/hw_screen/static/src/js/worker.js
@@ -32,8 +32,8 @@
                             $("head").append($parsedHTML.find(".resources").html());
                         } 
     
-                        $(".container").html($parsedHTML.find('.pos-customer_facing_display').html());
-                        $(".container").attr('class', 'container').addClass($parsedHTML.find('.pos-customer_facing_display').attr('class'));
+                        $(".container-fluid").html($parsedHTML.find('.pos-customer_facing_display').html());
+                        $(".container-fluid").attr('class', 'container-fluid').addClass($parsedHTML.find('.pos-customer_facing_display').attr('class'));
     
                         var d = $('.pos_orderlines_list');
                         d.scrollTop(d.prop("scrollHeight"));
diff --git a/addons/l10n_be_intrastat/wizard/xml_decl.py b/addons/l10n_be_intrastat/wizard/xml_decl.py
index dfea17c3e70..d27f677d431 100644
--- a/addons/l10n_be_intrastat/wizard/xml_decl.py
+++ b/addons/l10n_be_intrastat/wizard/xml_decl.py
@@ -223,11 +223,13 @@ class XmlDeclaration(models.TransientModel):
         if dispatchmode:
             mode1 = 'out_invoice'
             mode2 = 'in_refund'
+            extrf = "29"
             declcode = self._get_expedition_code(extendedmode)
             declform = self._get_expedition_form(extendedmode)
         else:
             mode1 = 'in_invoice'
             mode2 = 'out_refund'
+            extrf = "19"
             declcode = self._get_reception_code(extendedmode)
             declform = self._get_reception_form(extendedmode)
 
@@ -272,7 +274,7 @@ class XmlDeclaration(models.TransientModel):
         invoicelines = self.env['account.invoice.line'].browse(invoicelines_ids)
 
         for inv_line in invoicelines:
-            linekey = self._get_intrastat_linekey(declcode, inv_line, dispatchmode, extendedmode)
+            linekey = self._get_intrastat_linekey(extrf, inv_line, dispatchmode, extendedmode)
             if linekey is None:
                 continue
 
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 6eb23c18729..9b168e4ccdc 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -93,7 +93,7 @@ class PortalWizardUser(models.TransientModel):
                 partners_error_empty |= wizard_user.partner_id
             elif email in emails:
                 partners_error_emails |= wizard_user.partner_id
-            user = self.env['res.users'].sudo().with_context(active_test=False).search([('login', '=', email)])
+            user = self.env['res.users'].sudo().with_context(active_test=False).search([('login', '=ilike', email)])
             if user:
                 partners_error_user |= wizard_user.partner_id
             emails.append(email)
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 94a0afaa32a..5e504f57222 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -173,7 +173,7 @@ var QWeb2 = {
                         new_dict[as_first] = index === 0;
                         new_dict[as_last] = index + 1 === size;
                         new_dict[as_parity] = (index % 2 == 1 ? 'odd' : 'even');
-                        if (cur.constructor === Object) {
+                        if (cur && cur.constructor === Object) {
                             this.extend(new_dict, cur);
                         }
                         new_dict[as] = cur;