From 794459ade6a02c3d082ca17a660ace2ebb87f322 Mon Sep 17 00:00:00 2001 From: rgeleta Date: Thu, 21 Jul 2016 01:19:07 -0700 Subject: [FIX] doc: correct spelling mistake in reference Closes #12865 --- doc/reference/reports.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/reference') 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 -- cgit v1.2.3 From b85ef7ff1bec20bcd5e86a54e65fe9045422fe26 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 25 Jul 2016 13:55:50 +0200 Subject: [FIX] doc: indendation Otherwise the text is considered as a quote --- doc/reference/javascript.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'doc/reference') diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst index d7dd2f70b70..6c43e7e044c 100644 --- a/doc/reference/javascript.rst +++ b/doc/reference/javascript.rst @@ -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 -- cgit v1.2.3 From 880df4e8b67b408c390d9a24b0dfcfcd1494632b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 25 Jul 2016 14:10:15 +0200 Subject: [IMP] doc: clarify web client terminology To avoid confusion such as in #12884 --- doc/reference/javascript.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/reference') diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst index 6c43e7e044c..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, -- cgit v1.2.3