diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-30 13:25:36 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-30 13:25:36 +0100 |
| commit | 5ad3d599ceeb265efcc5daee57a7d44cbd8c872c (patch) | |
| tree | ed8449189c8c1a982dea9f416c226281be2cc75a | |
| parent | cd5c8a02f9560b2a8b5c39182adee7ade1bf595c (diff) | |
| parent | 7eec6b3643999cb26216e56c001eb8aae65031ea (diff) | |
[MERGE] forward port branch 11.0 up to 7eec6b36439
| -rw-r--r-- | addons/sale/tests/test_sale_to_invoice.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/addons/sale/tests/test_sale_to_invoice.py b/addons/sale/tests/test_sale_to_invoice.py index 45301e65e2f..d32f5a160ef 100644 --- a/addons/sale/tests/test_sale_to_invoice.py +++ b/addons/sale/tests/test_sale_to_invoice.py @@ -71,4 +71,4 @@ class TestSaleToInvoice(TestCommonSaleNoChart): assert order.invoice_ids, "No any invoice is created for this sales order" # Now I validate pay invoice wihth Test User(invoicing and payment). for invoice in order.invoice_ids: - invoice.with_context(context).invoice_validate() + invoice.with_context(context).action_invoice_open() diff --git a/setup.cfg b/setup.cfg index 3994ef225f2..4cce04e18da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,7 +9,7 @@ requires = nodejs-less pychart pyparsing - python(abi) = 3.6 + python(abi) >= 3.6 python3-babel python3-decorator python3-docutils diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 54b1b5cd56f..e6ee9106f7d 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -10,6 +10,12 @@ ODOO_LOG_DIR=/var/log/odoo ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log ODOO_USER="odoo" +if [ -d /usr/lib/python3.7 ]; then + SITE_PACK_DIR37=/usr/lib/python3.7/site-packages + [[ ! -d ${SITE_PACK_DIR37} ]] && mkdir -p ${SITE_PACK_DIR37} + ln -s /usr/lib/python3.6/site-packages/odoo ${SITE_PACK_DIR37}/odoo +fi + if ! getent passwd | grep -q "^odoo:"; then groupadd $ODOO_GROUP adduser --system --no-create-home $ODOO_USER -g $ODOO_GROUP |