diff options
| author | Martin Trigaux <mat@odoo.com> | 2019-07-16 16:02:41 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2019-07-16 16:36:40 +0200 |
| commit | beba36416fdf25df74cf8a581c66948a418173b6 (patch) | |
| tree | d24b8a373560afcc78bde4c9c06338800809abfa /doc | |
| parent | 044904b9d50d61c5c7e5432a1b4615dda145704c (diff) | |
| parent | 40421be73c94551ba902856984c0155d062cb449 (diff) | |
[MERGE] Forward port of saas-12.3 to saas-12.4 up to 40421be73c94551b
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/_extensions/odoo_ext/sub-menu_list.html | 2 | ||||
| -rw-r--r-- | doc/cla/corporate/blancomartin.md | 28 | ||||
| -rw-r--r-- | doc/cla/corporate/bumanit.md | 2 | ||||
| -rw-r--r-- | doc/cla/individual/dorcyv.md | 11 | ||||
| -rw-r--r-- | doc/cla/individual/gregory-moka.md | 9 |
5 files changed, 51 insertions, 1 deletions
diff --git a/doc/_extensions/odoo_ext/sub-menu_list.html b/doc/_extensions/odoo_ext/sub-menu_list.html index 7525fe63aea..ba1a2ad9542 100644 --- a/doc/_extensions/odoo_ext/sub-menu_list.html +++ b/doc/_extensions/odoo_ext/sub-menu_list.html @@ -3,6 +3,6 @@ <li><a href="https://www.odoo.com/documentation/user/12.0/index.html">User</a></li> <li><a href="https://www.odoo.com/documentation/12.0/index.html">Developer</a></li> <li><a href="https://www.odoo.com/documentation/12.0/setup/install.html">Installation</a></li> -<li><a href="http://training.odoo.com/courses/odoo-functional">Training center</a></li> +<li><a href="https://odoo.com/slides">eLearning</a></li> <li><a href="https://www.odoo.com/page/odoo-white-paper">White Papers</a></li> <li><a href="https://www.odoo.com/page/legal">Legal</a></li> diff --git a/doc/cla/corporate/blancomartin.md b/doc/cla/corporate/blancomartin.md new file mode 100644 index 00000000000..3ceb099b879 --- /dev/null +++ b/doc/cla/corporate/blancomartin.md @@ -0,0 +1,28 @@ +Chile, 2019-07-12 + +Blanco Martín & Asociados agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Daniel Blanco daniel@blancomartin.cl https://github.com/danisan + +Corporation name: Blanco Martin & Asociados EIRL +Corporation address: Av. Apoquindo 6410 + Of. 212 Las Condes, (RM) +Country: Chile +Point of contact: Daniel Blanco +Title: Director - Representante Legal +Email: daniel@blancomartin.cl +Telephone: +56 2 28400990 + +List of contributors: + +* Fernando de La Barrera fernando@blancomartin.cl https://github.com/bmya-fed +* Alejandro Paciotti alejandro@blancomartin.cl https://github.com/alp-bmya +* Albert Nieriz albert@blancomartin.cl https://github.com/aln-bmya +* Bruno Figares bruno@blancomartin.cl https://github.com/brf-bmya +* Susana Vazquez susana@blancomartin.cl https://github.com/suv-bmya diff --git a/doc/cla/corporate/bumanit.md b/doc/cla/corporate/bumanit.md index b05d68242ad..8471840fb8e 100644 --- a/doc/cla/corporate/bumanit.md +++ b/doc/cla/corporate/bumanit.md @@ -9,7 +9,9 @@ declaration. Signed, Baskhuu Lodoikhuu baskhuujacara@gmail.com https://github.com/jacara +Baskhuu Lodoikhuu baskhuu@bumanit.mn https://github.com/bumanit List of contributors: Baskhuu Lodoikhuu baskhuujacara@gmail.com https://github.com/jacara +Baskhuu Lodoikhuu baskhuu@bumanit.mn https://github.com/bumanit diff --git a/doc/cla/individual/dorcyv.md b/doc/cla/individual/dorcyv.md new file mode 100644 index 00000000000..d29652c3e72 --- /dev/null +++ b/doc/cla/individual/dorcyv.md @@ -0,0 +1,11 @@ +France, 2019-07-04 + +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, + +Valérian Dorcy valerian.dorcy@gmail.com https://github.com/dorcyv diff --git a/doc/cla/individual/gregory-moka.md b/doc/cla/individual/gregory-moka.md new file mode 100644 index 00000000000..42fddcb294c --- /dev/null +++ b/doc/cla/individual/gregory-moka.md @@ -0,0 +1,9 @@ +France, 2019-07-11 + +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, + +Grégory Schreiner gregory@mokatourisme.fr https://github.com/gregory-moka |
