[MERGE] bug fixes form 6.1 branch

bzr revid: xmo@openerp.com-20120305070634-li0eloj7vhsljguu
This commit is contained in:
Xavier Morel
2012-03-05 08:06:34 +01:00
11 changed files with 56 additions and 38 deletions
+2 -2
View File
@@ -467,10 +467,10 @@ replace ``addons`` by the directory in which your own addon lives.
Python
++++++
.. autoclass:: web.common.backendrpc.OpenERPSession
.. autoclass:: web.common.session.OpenERPSession
:members:
.. autoclass:: web.common.backendrpc.OpenERPModel
.. autoclass:: web.common.openerplib.main.Model
:members:
* Addons lifecycle (loading, execution, events, ...)
+3 -3
View File
@@ -391,12 +391,12 @@ Python
These classes should be moved to other sections of the doc as needed,
probably.
.. automodule:: web.common.dispatch
.. automodule:: web.common.http
:members:
:undoc-members:
See also: :class:`~web.common.backendrpc.OpenERPSession`,
:class:`~web.common.backendrpc.OpenERPModel`
See also: :class:`~web.common.session.OpenERPSession`,
:class:`~web.common.openerplib.main.OpenERPModel`
.. automodule:: web.controllers.main
:members: