[MERGE] from trunk

bzr revid: rco@openerp.com-20130213140504-6gntxjydwdhmi0ik
This commit is contained in:
Raphael Collet 2013-02-13 15:05:04 +01:00
commit 5450500002
2 changed files with 4 additions and 0 deletions

View File

@ -6,6 +6,8 @@ Changelog
`trunk`
-------
- Added :ref:`orm-workflows` to the ORM.
- Added :ref:`routing-decorators` to the RPC and WSGI stack.
- Removed support for `__terp__.py` descriptor files.
- Removed support for `<terp>` root element in XML files.
- Removed support for the non-openerp namespace (e.g. importing `tools` instead

View File

@ -19,6 +19,8 @@ Starting with OpenERP 7.1, exposing a new arbitrary WSGI handler is done with
the :py:func:`openerp.http.handler` decorator while adding an RPC endpoint is
done with the :py:func:`openerp.http.rpc` decorator.
.. _routing-decorators:
Routing decorators
------------------