[MERGE] forward port branch 10.0 up to 36ba37a7a1

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>

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-fluid").html($parsedHTML.find('.pos-customer_facing_display').html());
-                        $(".container").attr('class', 'container').addClass($parsedHTML.find('.pos-customer_facing_display').attr('class'));
+                        $(".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"));

addons/l10n_be_intrastat/wizard/xml_decl.py

@@ -222,11 +222,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)
 
@@ -271,7 +273,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
 

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)

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;

odoo/addons/base/res/res_currency.py

@@ -206,7 +206,7 @@ class CurrencyRate(models.Model):
 
     name = fields.Datetime(string='Date', required=True, index=True,
                            default=lambda self: fields.Date.today() + ' 00:00:00')
-    rate = fields.Float(digits=(12, 6), help='The rate of the currency to the currency of rate 1')
+    rate = fields.Float(digits=(12, 6), default=1.0, help='The rate of the currency to the currency of rate 1')
     currency_id = fields.Many2one('res.currency', string='Currency', readonly=True)
     company_id = fields.Many2one('res.company', string='Company',
                                  default=lambda self: self.env.user.company_id)

odoo/addons/base/res/res_partner.py

@@ -425,7 +425,7 @@ class Partner(models.Model):
         as if they were related fields """
         commercial_partner = self.commercial_partner_id
         if commercial_partner != self:
-            sync_vals = commercial_partner._update_fields_values(self._commercial_fields())
+            sync_vals = commercial_partner.with_prefetch()._update_fields_values(self._commercial_fields())
             self.write(sync_vals)
 
     @api.multi