diff --git a/.env_oneteam b/.env_oneteam index 856b7d7..e90bb99 100644 --- a/.env_oneteam +++ b/.env_oneteam @@ -26,3 +26,12 @@ TRYTONADMINPASS="admin" #Email user admin EMAIL="admin@admin.com" SLEEP_TRYTOND_ADMIN=15 +#SMTP +SMTP="" +SMTP_TYPE="smtps+ssl" +SMTP_USER="" +SMTP_PASSWORD="" +SMTP_DOMAIN="" +SMTP_PORT="" +SMTP_FROM="" +SMTP_EMAIL="" \ No newline at end of file diff --git a/6.2/requirements_OneTeam.txt b/6.2/requirements_OneTeam.txt index 73ede91..18c2c67 100644 --- a/6.2/requirements_OneTeam.txt +++ b/6.2/requirements_OneTeam.txt @@ -32,7 +32,9 @@ idna==2.10 isodate==0.6.0 ldap3==2.8.1 lxml==4.6.3 +matplotlib==3.6.2 mock==4.0.3 +numpy==1.23.5 ofxparse==0.19 passlib==1.7.4 phonenumbers==8.12.57 diff --git a/Dockerfile b/Dockerfile index d9e8948..5f97151 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,14 @@ ARG WORKER ARG EMAIL ARG TRYTONPASSFILE ARG URL_MULTI_MIGRATE +ARG SMTP +ARG SMTP_TYPE +ARG SMTP_USER +ARG SMTP_PASSWORD +ARG SMTP_DOMAIN +ARG SMTP_PORT +ARG SMTP_FROM +ARG SMTP_EMAIL USER root diff --git a/docker-compose.yml b/docker-compose.yml index b16ab0c..84c35ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,6 +25,14 @@ services: DIR_MODULES: ${DIR_MODULES} WORKER: ${WORKER} TRYTONPASSFILE: ${TRYTONPASSFILE} + SMTP: ${SMTP} + SMTP_TYPE: ${SMTP_TYPE} + SMTP_USER: ${SMTP_USER} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_DOMAIN: ${SMTP_DOMAIN} + SMTP_PORT: ${SMTP_PORT} + SMTP_FROM: ${SMTP_FROM} + SMTP_EMAIL: ${SMTP_EMAIL} ports: - "${TRYTON_PORT:-8000}:8000" volumes: diff --git a/trytond-modules_non_official.sh b/trytond-modules_non_official.sh index a2d5a77..4661634 100644 --- a/trytond-modules_non_official.sh +++ b/trytond-modules_non_official.sh @@ -13,7 +13,17 @@ if [ "$WORKER" == "True" ]; then [queue] -worker=True +worker = True +EOF +fi + + +if [ "$SMTP" == "True" ]; then + cat <>/etc/trytond.conf + +[email] +uri = ${SMTP_TYPE}://${SMTP_USER}:${SMTP_PASSWORD}@${SMTP_DOMAIN}:${SMTP_PORT} +from = ${SMTP_FROM} <${SMTP_EMAIL}> EOF fi