Merge PR #323 into 12.0

Signed-off-by legalsylvain
pull/321/head
OCA-git-bot 2019-09-30 13:52:36 +00:00
commit 9395da11d3
1 changed files with 7 additions and 4 deletions

View File

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