Skip to content

Commit

Permalink
[13.0] [FIX] report_aeroo: Use str instead string_types
Browse files Browse the repository at this point in the history
  • Loading branch information
nicomacr committed Feb 22, 2021
1 parent d41c298 commit e8fc454
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions report_aeroo/report_parser.py
Expand Up @@ -32,11 +32,11 @@
from odoo.tools.misc import posix_to_ldml
from odoo.exceptions import MissingError
# for format_datetime
from odoo.tools.misc import pycompat, DATE_LENGTH
from odoo.tools.misc import DATE_LENGTH
import babel.dates


def format_datetime(env, value, lang_code=False, date_format=False):
def format_datetime(env, value, lang_code=False, date_format=False, tz='America/Argentina/Buenos_Aires'):
'''
This is an adaptation of odoo format_date method but to format datetimes
TODO we should move it to another plase or make it simpler
Expand All @@ -52,7 +52,7 @@ def format_datetime(env, value, lang_code=False, date_format=False):
'''
if not value:
return ''
if isinstance(value, pycompat.string_types):
if isinstance(value, str):
if len(value) < DATE_LENGTH:
return ''
if len(value) > DATE_LENGTH:
Expand All @@ -67,7 +67,7 @@ def format_datetime(env, value, lang_code=False, date_format=False):
if not date_format:
date_format = posix_to_ldml('%s %s' % (lang.date_format, lang.time_format), locale=locale)

return babel.dates.format_datetime(value, format=date_format, locale=locale)
return babel.dates.format_datetime(value, format=date_format, locale=locale, tzinfo=tz)


_logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -354,7 +354,7 @@ def _format_lang(
if date:
return odoo_fd(self.env, value, lang_code=lang_code, date_format=date_format)
elif date_time:
return format_datetime(self.env, value, lang_code=lang_code, date_format=date_format)
return format_datetime(self.env, value, lang_code=lang_code, date_format=date_format, tz=self.env.user.tz)
return odoo_fl(
self.env, value, digits, grouping, monetary, dp, currency_obj)

Expand Down

0 comments on commit e8fc454

Please sign in to comment.