summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2014-04-22 11:47:27 +0200
committerChristophe Simonis <chs@openerp.com>2014-04-22 11:47:27 +0200
commit8a1b43be67e5fa46183b4cf694d8133220d8d64e (patch)
treea3455882840b38ab4f0db22877659a4b651c6467 /addons/web/controllers
parent65c1b294b24dfbfa10bb6b13f908fc4986ad3e6c (diff)
parentb250c5f9f50df6d9b50e4fbeb2128c04247c0e44 (diff)
[MERGE] forward port of branch saas-4 up to revid 3981 dle@openerp.com-20140418151400-1g98vljq3cjv0czs
bzr revid: chs@openerp.com-20140422094727-7hi9bv3wm1bi0ov9
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 a6b5fa63918..f2101b27fd3 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1225,7 +1225,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('_'):