diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-21 10:10:11 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-21 10:10:11 +0200 |
| commit | 3faea8fbf810224ad4e03cfa1dc36f186800c501 (patch) | |
| tree | 5e05c40d62dacc5951c70b3686f30a7bbb86f399 /doc | |
| parent | cc2d78beeaf61fa0b8c9543196d1b4fce5cd5da6 (diff) | |
| parent | f26de445e5579913e27ea6a630bcee6d40eefc7d (diff) | |
[MERGE] forward port branch saas-12.4 up to f26de445e55
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/individual/igoris.md | 11 | ||||
| -rw-r--r-- | doc/cla/individual/reinaldoramosarxi.md | 11 | ||||
| -rw-r--r-- | doc/reference/qweb.rst | 8 |
3 files changed, 28 insertions, 2 deletions
diff --git a/doc/cla/individual/igoris.md b/doc/cla/individual/igoris.md new file mode 100644 index 00000000000..c4db9c166d6 --- /dev/null +++ b/doc/cla/individual/igoris.md @@ -0,0 +1,11 @@ +Ukraine, 2019-08-12 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Igor Ishchenko igor@cruxlab.com https://github.com/igoris diff --git a/doc/cla/individual/reinaldoramosarxi.md b/doc/cla/individual/reinaldoramosarxi.md new file mode 100644 index 00000000000..b130c0778a0 --- /dev/null +++ b/doc/cla/individual/reinaldoramosarxi.md @@ -0,0 +1,11 @@ +Portugal, 2019-08-09 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Reinaldo Ramos 42942314+reinaldoramosarxi@users.noreply.github.com https://github.com/reinaldoramosarxi diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index 8e984f68a73..541788d508c 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -459,12 +459,16 @@ template inheritance '''''''''''''''''''' Template inheritance is used to alter existing templates in-place, e.g. to -add information to templates created by an other modules. +add information to templates created by other modules. Template inheritance is performed via the ``t-extend`` directive which takes the name of the template to alter as parameter. -The alteration is then performed with any number of ``t-jquery`` +When ``t-extend`` is combined with ``t-name`` a new template with the given name +is created. In this case the extended template is not altered, instead the +directives define how to create the new template. + +In both cases the alteration is then performed with any number of ``t-jquery`` sub-directives:: <t t-extend="base.template"> |