Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #323 into 12.0 

Signed-off-by legalsylvain
pull/321/head
OCA-git-bot 2019-09-30 13:52:36 +00:00
parent d58fb43f9e 608a0b8414
commit 9395da11d3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bi_sql_editor/models/bi_sql_view_field.py
View File

@ -45,7 +45,7 @@ class BiSQLViewField(models.Model):
'numeric': 'float', 'numeric': 'float',
'text': 'char', 'text': 'char',
'character varying': 'char', 'character varying': 'char',
'date': 'datetime', 'date': 'date',
'timestamp without time zone': 'datetime', 'timestamp without time zone': 'datetime',
} }
@ -227,7 +227,10 @@ class BiSQLViewField(models.Model):
self.ensure_one() self.ensure_one()
res = '' res = ''
if self.field_description and self.is_group_by: if self.field_description and self.is_group_by:
res =\ res = \
"""<filter string="%s" context="{'group_by':'%s'}"/>""" % ( """<filter name="%s" string="%s"
self.field_description, self.name) context="{'group_by':'%s'}"/>""" % (
self.field_description.lower().replace(' ', '_'),
self.field_description, self.name
)
return res return res