summaryrefslogtreecommitdiff
path: root/doc/setup
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-20 16:57:36 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-20 16:57:36 +0200
commit3a2147d95c8005ab7c1dbe4d94315e404ea5e5f9 (patch)
tree98b5b79e5f866a64849f349119e0855f6da5d7ff /doc/setup
parent99215a02c61ca8c470931955225e5db1cd402d43 (diff)
parentbc1a0a32ca80aaadd52e66115fe9c9ad4b26c2e0 (diff)
[MERGE] forward port branch saas-10 up to bc1a0a3
Diffstat (limited to 'doc/setup')
-rw-r--r--doc/setup/deploy.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index 94d9fcbd28a..3209154c41b 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -231,6 +231,12 @@ just about any SSL termination proxy, but requires the following setup:
* your SSL termination proxy should also automatically redirect non-secure
connections to the secure port
+.. warning::
+
+ In case you are using the Point of Sale module in combinaison with a `POSBox`_,
+ you must disable the HTTPS configuration for the route ``/pos/web`` to avoid
+ mix-content errors.
+
Configuration sample
--------------------
@@ -434,3 +440,4 @@ of the supported browsers by Odoo version is the following:
.. _use an SSH tunnel:
http://www.postgresql.org/docs/9.3/static/ssh-tunnels.html
.. _WSGI: http://wsgi.readthedocs.org/
+.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2 \ No newline at end of file