diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2011-08-16 11:05:52 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2011-08-16 11:05:52 +0530 |
| commit | 08cf0f2fb08a5d3af57a0aa77e73b5fb9da028e7 (patch) | |
| tree | d2758d340d58bd655dc6362d7cab82d68399805a /addons/base/controllers/main.py | |
| parent | 28ffaba5ab94e5d28cd2c81c0518a998257074de (diff) | |
| parent | a4f9eb398b39978be8c35a8eb2e1eb561ef26ecf (diff) | |
[MERGE] Merge trunk in mobile-client.
bzr revid: bth@tinyerp.com-20110816053552-e36jsh9h7hvyzhes
Diffstat (limited to 'addons/base/controllers/main.py')
| -rw-r--r-- | addons/base/controllers/main.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 4f6b3ea4f70..36db03d6bba 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -772,8 +772,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 """ @@ -789,8 +789,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 """ |