diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-25 15:07:47 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-25 15:07:47 +0200 |
| commit | fc0f02305347ed46e8fdc7dd68188d17dc9b09a6 (patch) | |
| tree | 7d35a2584b180226fdaa81c76e33dd4ac2988f5f /doc/reference | |
| parent | 7aa9f2395529e0f91aff6923da577b4087309d63 (diff) | |
| parent | 1089dcf15cb09619776ffeb101b20dedee112830 (diff) | |
[MERGE] forward port branch 9.0 up to 1089dcf
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/javascript.rst | 24 | ||||
| -rw-r--r-- | doc/reference/reports.rst | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst index d7dd2f70b70..342d8484b67 100644 --- a/doc/reference/javascript.rst +++ b/doc/reference/javascript.rst @@ -428,9 +428,9 @@ High-level API: calling into Odoo models ------------------------------------------- Access to Odoo object methods (made available through XML-RPC from the server) -is done via :class:`Model` (exported in ``web.Model``). It maps onto the Odoo server objects via -two primary methods, :func:`~Model.call` and -:func:`~Model.query`. +is done via :class:`Model`. It maps onto the Odoo server objects via two primary +methods, :func:`~Model.call` (exported in ``web.Model``) and :func:`~Model.query` +(exported in ``web.DataModel``, only available in the backend client). :func:`~Model.call` is a direct mapping to the corresponding method of the Odoo server object. Its usage is similar to that of the Odoo Model API, @@ -784,15 +784,15 @@ Here is a description of the current file structure: * the ``framework/`` folder contains all basic low level modules. The modules here are supposed to be generic. Some of them are: - * ``web.ajax`` implements rpc calls - * ``web.core`` is a generic modules. It exports various useful - objects and functions, such as ``qweb``, ``_t`` or the main bus. - * ``web.Widget`` contains the widget class - * ``web.Model`` is an abstraction over ``web.ajax`` to make - calls to the server model methods - * ``web.session`` is the former ``openerp.session`` - * ``web.utils`` for useful code snippets - * ``web.time`` for every time-related generic functions + * ``web.ajax`` implements rpc calls + * ``web.core`` is a generic modules. It exports various useful + objects and functions, such as ``qweb``, ``_t`` or the main bus. + * ``web.Widget`` contains the widget class + * ``web.Model`` is an abstraction over ``web.ajax`` to make + calls to the server model methods + * ``web.session`` is the former ``openerp.session`` + * ``web.utils`` for useful code snippets + * ``web.time`` for every time-related generic functions * the ``views/`` folder contains all view definitions * ``widgets/`` is for standalone widgets diff --git a/doc/reference/reports.rst b/doc/reference/reports.rst index f4b76a12cff..93f5b7a85cb 100644 --- a/doc/reference/reports.rst +++ b/doc/reference/reports.rst @@ -282,7 +282,7 @@ named :samp:`report.{module.report_name}`. If it exists, it will use it to call the QWeb engine; otherwise a generic function will be used. If you wish to customize your reports by including more things in the template (like records of others models, for example), you can define this model, overwrite -the function ``render_html`` and pass objects in the ``docargs`` dictionnary: +the function ``render_html`` and pass objects in the ``docargs`` dictionary: .. code-block:: python |