[MERGE] forward port branch 13.0 up to f4105eb9c70

3 files changed, 12 insertions, 6 deletions

diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py
index 65ae8073326..888ea6fecc0 100644
--- a/addons/web/models/ir_http.py
+++ b/addons/web/models/ir_http.py
@@ -40,7 +40,7 @@ class Http(models.AbstractModel):
         }
 
         menu_json_utf8 = json.dumps(request.env['ir.ui.menu'].load_menus(request.session.debug), default=ustr, sort_keys=True).encode()
-        translations_json_utf8 = json.dumps(translation_cache,  sort_keys=True).encode()
+        translations_json_utf8 = json.dumps(translation_cache, sort_keys=True).encode()
 
         return {
             "uid": request.session.uid,
@@ -71,10 +71,10 @@ class Http(models.AbstractModel):
     @api.model
     def get_frontend_session_info(self):
         return {
-            'is_admin': self.env.user._is_admin(),
-            'is_system': self.env.user._is_system(),
-            'is_website_user': self.env.user._is_public(),
-            'user_id': self.env.user.id,
+            'is_admin': request.session.uid and self.env.user._is_admin() or False,
+            'is_system': request.session.uid and self.env.user._is_system() or False,
+            'is_website_user': request.session.uid and self.env.user._is_public() or False,
+            'user_id': request.session.uid and self.env.user.id or False,
             'is_frontend': True,
         }
 
diff --git a/addons/web/models/ir_qweb.py b/addons/web/models/ir_qweb.py
index 6776dbbff14..4ffab27bd5e 100644
--- a/addons/web/models/ir_qweb.py
+++ b/addons/web/models/ir_qweb.py
@@ -69,8 +69,13 @@ class Image(models.AbstractModel):
         elif options.get('zoom'):
             src_zoom = options['zoom']
 
+        itemprop = None
+        if options.get('itemprop'):
+            itemprop = options['itemprop']
+
         atts = OrderedDict()
         atts["src"] = src
+        atts["itemprop"] = itemprop
         atts["class"] = classes
         atts["style"] = options.get('style')
         atts["alt"] = alt
diff --git a/addons/web/models/models.py b/addons/web/models/models.py
index e85de4f6c45..3ef871cabe0 100644
--- a/addons/web/models/models.py
+++ b/addons/web/models/models.py
@@ -5,6 +5,7 @@ import pytz
 from odoo import _, api, fields, models
 from odoo.osv.expression import AND
 from odoo.tools import lazy
+from odoo.tools.misc import get_lang
 from odoo.exceptions import UserError
 
 
@@ -142,7 +143,7 @@ class Base(models.AbstractModel):
 
             # Again, imitating what _read_group_format_result and _read_group_prepare_data do
             if group_by_value and field_type in ['date', 'datetime']:
-                locale = self._context.get('lang') or 'en_US'
+                locale = get_lang(self.env).code
                 group_by_value = fields.Datetime.to_datetime(group_by_value)
                 group_by_value = pytz.timezone('UTC').localize(group_by_value)
                 tz_info = None