diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-28 15:12:06 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-28 15:12:06 +0200 |
| commit | 5166fbd21b7b2917c6ee377cd4d8427014e30d93 (patch) | |
| tree | 62cefb2b737c9d871d366ff9e528a606c8abae0f /doc | |
| parent | b355377a25502644a54198d1c1d10a3d8f20441b (diff) | |
| parent | 6d51bce057ec5d94b26e045cd87e7850405a88e7 (diff) | |
[MERGE] forward port of branch saas-10 up to 6d51bce
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/acsone.md | 1 | ||||
| -rw-r--r-- | doc/cla/individual/engelant.md | 9 | ||||
| -rw-r--r-- | doc/howtos/themes.rst | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/cla/corporate/acsone.md b/doc/cla/corporate/acsone.md index e1ab2495b1b..8e41f328f83 100644 --- a/doc/cla/corporate/acsone.md +++ b/doc/cla/corporate/acsone.md @@ -17,6 +17,7 @@ Anthony Muschang anthony.muschang@acsone.eu https://github.com/anthony-muschang Cédric Pigeon cedric.pigeon@acsone.eu https://github.com/Cedric-Pigeon Christelle De Coninck christelle.deconinck@acsone.eu https://github.com/chrisdec Jonathan Nemry jonathan.nemry@acsone.eu https://github.com/JonathanNEMRY +Denis Roussel denis.roussel@acsone.eu https://github.com/rousseldenis Laetia Gangloff laetitia.gangloff@acsone.eu https://github.com/laetitia-gangloff Laurent Mignon laurent.mignon@acsone.eu https://github.com/lmignon Olivier Laurent olivier.laurent@acsone.eu https://github.com/Olivier-LAURENT diff --git a/doc/cla/individual/engelant.md b/doc/cla/individual/engelant.md new file mode 100644 index 00000000000..05a5d7b77fa --- /dev/null +++ b/doc/cla/individual/engelant.md @@ -0,0 +1,9 @@ +Germany, 23 June 2016 + +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, + +Anton Engelhardt mumie_die@yahoo.de https://github.com/engelant diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst index 9629251e467..a66068a7b00 100644 --- a/doc/howtos/themes.rst +++ b/doc/howtos/themes.rst @@ -614,7 +614,7 @@ The previous code will create the snippet’s content, but we still need to plac .. code-block:: xml <template id="place_into_bar" inherit_id="website.snippets" name="Place into bar"> - <xpath expr="//div[@id='snippet_structure']" position="inside"> + <xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside"> <t t-snippet="theme_tutorial.snippet_testimonial" t-thumbnail="/theme_tutorial/static/src/img/ui/snippet_thumb.jpg"/> </xpath> |