Merge pull request #1072 from anybox/fix_address_display
[FIX] #1065 display_name does not display the address
This commit is contained in:
commit
a3f9118c2a
|
@ -664,7 +664,7 @@ class DateTimeConverter(osv.AbstractModel):
|
||||||
|
|
||||||
if options and options.get('hide_seconds'):
|
if options and options.get('hide_seconds'):
|
||||||
pattern = pattern.replace(":ss", "").replace(":s", "")
|
pattern = pattern.replace(":ss", "").replace(":s", "")
|
||||||
|
|
||||||
return babel.dates.format_datetime(value, format=pattern, locale=locale)
|
return babel.dates.format_datetime(value, format=pattern, locale=locale)
|
||||||
|
|
||||||
class TextConverter(osv.AbstractModel):
|
class TextConverter(osv.AbstractModel):
|
||||||
|
@ -779,7 +779,7 @@ class MonetaryConverter(osv.AbstractModel):
|
||||||
|
|
||||||
lang_code = context.get('lang') or 'en_US'
|
lang_code = context.get('lang') or 'en_US'
|
||||||
lang = self.pool['res.lang']
|
lang = self.pool['res.lang']
|
||||||
formatted_amount = lang.format(cr, uid, [lang_code],
|
formatted_amount = lang.format(cr, uid, [lang_code],
|
||||||
fmt, Currency.round(cr, uid, display_currency, from_amount),
|
fmt, Currency.round(cr, uid, display_currency, from_amount),
|
||||||
grouping=True, monetary=True)
|
grouping=True, monetary=True)
|
||||||
|
|
||||||
|
@ -879,7 +879,7 @@ class Contact(orm.AbstractModel):
|
||||||
|
|
||||||
id = getattr(record, field_name).id
|
id = getattr(record, field_name).id
|
||||||
field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
|
field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
|
||||||
value = field_browse.display_name
|
value = field_browse.name_get()[0][1]
|
||||||
|
|
||||||
val = {
|
val = {
|
||||||
'name': value.split("\n")[0],
|
'name': value.split("\n")[0],
|
||||||
|
|
Loading…
Reference in New Issue