diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-14 13:18:22 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-14 13:18:22 +0200 |
| commit | f1a5e8214e64d7d8ba3e2c9e22354bd95a653cf1 (patch) | |
| tree | cbd3c004b1c3af30ee78512f7b859f17a6a7ef0b /doc | |
| parent | 1dee64eda8fdbfa066c882f0f82a44532079167b (diff) | |
| parent | 9150d4c552fe3798d579063c400f0f4f5ae62603 (diff) | |
[MERGE] forward port branch 10.0 up to 9150d4c552f
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/howtos/backend/exercise-dashboard | 4 | ||||
| -rw-r--r-- | doc/howtos/backend/exercise-report | 13 | ||||
| -rw-r--r-- | doc/index.rst | 1 | ||||
| -rw-r--r-- | doc/setup/install.rst | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard index ba5c1320623..affbc7bdc8f 100644 --- a/doc/howtos/backend/exercise-dashboard +++ b/doc/howtos/backend/exercise-dashboard @@ -9,8 +9,8 @@ Index: addons/openacademy/__manifest__.py 'version': '0.1', # any module necessary for this one to work correctly -- 'depends': ['base'], -+ 'depends': ['base', 'board'], +- 'depends': ['base', 'report'], ++ 'depends': ['base', 'report', 'board'], # always loaded 'data': [ diff --git a/doc/howtos/backend/exercise-report b/doc/howtos/backend/exercise-report index 797174e247a..08ac677b5c0 100644 --- a/doc/howtos/backend/exercise-report +++ b/doc/howtos/backend/exercise-report @@ -3,6 +3,19 @@ Index: addons/openacademy/__manifest__.py =================================================================== +--- addons.orig/openacademy/__manifest__.py 2014-08-26 17:26:21.535783052 +0200 ++++ addons/openacademy/__manifest__.py 2014-08-26 17:26:21.531783052 +0200 +@@ -21,7 +21,7 @@ + 'version': '0.1', + + # any module necessary for this one to work correctly +- 'depends': ['base'], ++ 'depends': ['base', 'report'], + + # always loaded + 'data': [ +Index: addons/openacademy/__manifest__.py +=================================================================== --- addons.orig/openacademy/__manifest__.py 2014-08-29 08:39:43.975536806 +0200 +++ addons/openacademy/__manifest__.py 2014-08-29 08:39:52.000000000 +0200 @@ -30,6 +30,7 @@ diff --git a/doc/index.rst b/doc/index.rst index dcdd6ab752b..21231b7ce3f 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -17,7 +17,6 @@ Index api_integration setup reference - business .. ifconfig:: todo_include_todos diff --git a/doc/setup/install.rst b/doc/setup/install.rst index de21d6c53ab..aae7d03b8ba 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -546,7 +546,7 @@ default db to serve on localhost:8069 http://www.enterprisedb.com/products-services-training/pgdownload .. _Quilt: http://en.wikipedia.org/wiki/Quilt_(software) .. _saas: https://www.odoo.com/page/start -.. _the wkhtmltopdf download page: http://wkhtmltopdf.org/downloads.html +.. _the wkhtmltopdf download page: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.1 .. _UAC: http://en.wikipedia.org/wiki/User_Account_Control .. _wkhtmltopdf: http://wkhtmltopdf.org .. _pip: https://pip.pypa.io |