summaryrefslogtreecommitdiff
path: root/addons/base/controllers/main.py
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-08-12 16:39:47 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-08-12 16:39:47 +0200
commitfb29f3a97e2d88d0c62b3ac5e82aed00fb79561f (patch)
tree718a892c2e40435fadcaa11bb3ad675d1f63cc0d /addons/base/controllers/main.py
parent64571fa4ab444b899629d57ccfe54e875ddaaf59 (diff)
parenta4f9eb398b39978be8c35a8eb2e1eb561ef26ecf (diff)
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20110812143947-7l5d1acum5298j0s
Diffstat (limited to 'addons/base/controllers/main.py')
-rw-r--r--addons/base/controllers/main.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 99b8ff49ef4..0379628fa1e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -793,8 +793,8 @@ class View(openerpweb.Controller):
""" Parses an arbitrary string containing a domain, transforms it
to either a literal domain or a :class:`openerpweb.nonliterals.Domain`
- :param domain: the domain to parse, if the domain is not a string it is assumed to
- be a literal domain and is returned as-is
+ :param domain: the domain to parse, if the domain is not a string it
+ is assumed to be a literal domain and is returned as-is
:param session: Current OpenERP session
:type session: openerpweb.openerpweb.OpenERPSession
"""
@@ -810,8 +810,8 @@ class View(openerpweb.Controller):
""" Parses an arbitrary string containing a context, transforms it
to either a literal context or a :class:`openerpweb.nonliterals.Context`
- :param context: the context to parse, if the context is not a string it is assumed to
- be a literal domain and is returned as-is
+ :param context: the context to parse, if the context is not a string it
+ is assumed to be a literal domain and is returned as-is
:param session: Current OpenERP session
:type session: openerpweb.openerpweb.OpenERPSession
"""