summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/cla/individual/alexcn.md9
-rw-r--r--doc/cla/individual/ivyshnevska.md9
-rw-r--r--doc/reference/guidelines.rst1
-rw-r--r--doc/setup/install.rst11
4 files changed, 26 insertions, 4 deletions
diff --git a/doc/cla/individual/alexcn.md b/doc/cla/individual/alexcn.md
new file mode 100644
index 00000000000..fb0cf0d8232
--- /dev/null
+++ b/doc/cla/individual/alexcn.md
@@ -0,0 +1,9 @@
+China, 2019-01-08
+
+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,
+
+Alex Zhang zhilight@gmail.com https://github.com/Alexcn \ No newline at end of file
diff --git a/doc/cla/individual/ivyshnevska.md b/doc/cla/individual/ivyshnevska.md
new file mode 100644
index 00000000000..0df4e78944d
--- /dev/null
+++ b/doc/cla/individual/ivyshnevska.md
@@ -0,0 +1,9 @@
+Ukraine, 2019-01-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,
+
+Vyshnevska Iryna i.vyshnevska@mobilunity.com https://github.com/i-vyshnevska/ \ No newline at end of file
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 10bd221a51e..5710bd36ff6 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -281,6 +281,7 @@ Inherited XML
~~~~~~~~~~~~~
The naming pattern of inherited view is
+
#. Extension mode: Use the same xml id than the original view you are extending, and suffix it by :samp:`{_inherit}` . For instance, the view :samp:`project.project_view_form` can be extended by :samp:`project_forecast.project_view_form_inherit`.
#. Primary mode: Keep the original xml id.
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 21a22c7cd0d..7393292eb46 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -121,10 +121,13 @@ PostgreSQL server :
# apt-get install postgresql -y
In order to print PDF reports, you must install wkhtmltopdf_ yourself:
-the version of wkhtmltopdf_ available in debian repositories does not support
-headers and footers so it can not be installed automatically.
-The recommended version is 0.12.1 and is available on `the wkhtmltopdf download page`_,
-in the archive section.
+the version of wkhtmltopdf_ available in Debian repositories does
+not support headers and footers so it is not used as a direct dependency.
+The recommended version is 0.12.5 and is available on
+`the wkhtmltopdf download page`_, in the archive section. Previously
+recommended version 0.12.1 is a good alternative.
+More details on the various versions and their respective quirks can be
+found in our `wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_.
Repository
^^^^^^^^^^