ingadhoc/miscellaneous#263

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-h-88730-awe-rev-uiha-fw

head

2e719288774924e2eabf91f70b0101675acfc299

target

17.0

merged

hace 2 semanas by Alexis Lopez

forward-port of

ingadhoc/miscellaneous#261 DETACHED (conflicts: ('b29be08314e63be8948c97c80214cff24fd1dc1c', 'Removing base_ux/models/mail_mail.py\nAuto-merging base_ux/__manifest__.py\nCONFLICT (content): Merge conflict in base_ux/__manifest__.py\n', "21:40:42.352310 git.c:444 trace: built-in: git cherry-pick b29be08314e63be8948c97c80214cff24fd1dc1c\nerror: could not apply b29be08... [REM] base_ux: smtp disconnect exception added into odoo core\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['b29be08314e63be8948c97c80214cff24fd1dc1c']) ('b29be08314e63be8948c97c80214cff24fd1dc1c', 'Removing base_ux/models/mail_mail.py\nAuto-merging base_ux/__manifest__.py\nCONFLICT (content): Merge conflict in base_ux/__manifest__.py\n', "21:40:42.352310 git.c:444 trace: built-in: git cherry-pick b29be08314e63be8948c97c80214cff24fd1dc1c\nerror: could not apply b29be08... [REM] base_ux: smtp disconnect exception added into odoo core\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['b29be08314e63be8948c97c80214cff24fd1dc1c']))

[FW][REM] base_ux: smtp disconnect exception added into odoo core

Odoo included it: https://github.com/odoo/odoo/commit/465f907835bee7f38a4508a2ad1df50e9d82a997

Forward-Port-Of: ingadhoc/miscellaneous#261