summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-04-23 14:37:35 +0200
committerFabien Meghazi <fme@openerp.com>2014-04-23 14:37:35 +0200
commitd4b534e7be3586fe17bbb237dd0fd7cdcdb7652c (patch)
tree83ca6d215b4622dc23b6856f4429725c20f0a2ed /addons/web/controllers
parentbc1878e3e2d6bb8d76be6f02dfda0d844b5062c8 (diff)
parent8ee8b7bde68a550e2950df75754ad387c8ae13b1 (diff)
[MERGE] upstream
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 51fd81a0881..d56eecec53e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1089,7 +1089,7 @@ class DataSet(http.Controller):
records = getattr(request.session.model(model), method)(*args, **kwargs)
for record in records:
record['display_name'] = \
- names.get(record['id']) or "%s#%d" % (model, (record['id']))
+ names.get(record['id']) or "{0}#{1}".format(model, (record['id']))
return records
if method.startswith('_'):