diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-20 12:17:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-20 12:17:04 +0200 |
| commit | f26de445e5579913e27ea6a630bcee6d40eefc7d (patch) | |
| tree | 8b8e06be8a9d5fd3c1e5c31634611127446b9948 /doc | |
| parent | bc6accc5688d3c38a35949751779f808e9c2063f (diff) | |
| parent | 6f55fd65da8c50d36ca97654a920fb075076f125 (diff) | |
[MERGE] forward port branch saas-12.3 up to 6f55fd65da8
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 f4f464f7aa9..5d910d3b061 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -458,12 +458,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"> |