Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New prototype for method _display_full_address() (Py3o reports will need to be updated)

Browse Source
This commit is contained in:
Alexis de Lattre
2016-12-31 17:42:44 +01:00
committed by Raphaël Valyi
parent 58b83c2844
commit 187a531fce
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
base_usability/partner.py
View File

@@ -61,49 +61,57 @@ class ResPartner(models.Model):
# for reports # for reports
@api.multi @api.multi
def _display_full_address( def _display_full_address(
self, details=['address', 'phone', 'fax', 'mobile', 'email'], self, details=[
icon=True, without_company=False): 'company', 'name', 'address', 'phone', 'fax',
'mobile', 'email'],
icon=True):
self.ensure_one() self.ensure_one()
res = self.name_title
if (
not without_company and
self.parent_id and
self.parent_id.is_company):
res = self.parent_id.name + '\n' + res
# To make the icons work with py3o with PDF export, on the py3o server: # To make the icons work with py3o with PDF export, on the py3o server:
# 1) sudo apt-get install fonts-symbola # 1) sudo apt-get install fonts-symbola
# 2) start libreoffice in xvfb (don't use --headless) (To confirm) # 2) start libreoffice in xvfb (don't use --headless) (To confirm)
options = { options = {
'name': {
'value': self.name_title,
},
'company': {
'value': self.parent_id and self.parent_id.is_company and
self.parent_id.name or False,
},
'phone': { 'phone': {
'value': self.phone, 'value': self.phone,
# http://www.fileformat.info/info/unicode/char/1f4de/index.htm # http://www.fileformat.info/info/unicode/char/1f4de/index.htm
'icon': u'\U0001F4DE', 'icon': u'\U0001F4DE',
'label': _('Tel:')}, 'label': _('Tel:'),
},
'fax': { 'fax': {
'value': self.fax, 'value': self.fax,
# http://www.fileformat.info/info/unicode/char/1f5b7/index.htm # http://www.fileformat.info/info/unicode/char/1f5b7/index.htm
'icon': u'\U0001F5B7', 'icon': u'\U0001F5B7',
'label': _('Fax:')}, 'label': _('Fax:'),
},
'mobile': { 'mobile': {
'value': self.mobile, 'value': self.mobile,
# http://www.fileformat.info/info/unicode/char/1f4f1/index.htm # http://www.fileformat.info/info/unicode/char/1f4f1/index.htm
'icon': u'\U0001F4F1', 'icon': u'\U0001F4F1',
'label': _('Mobile:')}, 'label': _('Mobile:'),
},
'email': { 'email': {
'value': self.email, 'value': self.email,
# http://www.fileformat.info/info/unicode/char/2709/index.htm # http://www.fileformat.info/info/unicode/char/2709/index.htm
'icon': u'\u2709', 'icon': u'\u2709',
'label': _('E-mail:')}, 'label': _('E-mail:'),
},
'address': { 'address': {
'value': self._display_address(without_company=True), 'value': self._display_address(without_company=True),
} }
} }
res = []
for detail in details: for detail in details:
if options.get(detail) and options[detail]['value']: if options.get(detail) and options[detail]['value']:
entry = options[detail] entry = options[detail]
prefix = icon and entry.get('icon') or entry.get('label') prefix = icon and entry.get('icon') or entry.get('label')
if prefix: if prefix:
res += u'\n%s %s' % (prefix, entry['value']) res.append(u'%s %s' % (prefix, entry['value']))
else: else:
res += u'\n%s' % entry['value'] res.append(u'%s' % entry['value'])
return res return '\n'.join(res)