ingadhoc/miscellaneous#264

Created by fw-bot-adhoc

label

adhoc-dev:18.0-16.0-h-88730-awe-rev-QZ7S-fw

head

ab89911feebe65de571881939a5ffc88c0afe983

target

18.0

merged

hace 2 semanas by Alexis Lopez

forward-port of

ingadhoc/miscellaneous#261 DETACHED (conflicts: ('2e719288774924e2eabf91f70b0101675acfc299', 'CONFLICT (modify/delete): base_ux/models/mail_mail.py deleted in 2e71928 ([REM] base_ux: smtp disconnect exception added into odoo core) and modified in HEAD. Version HEAD of base_ux/models/mail_mail.py left in tree.\nAuto-merging base_ux/__manifest__.py\nCONFLICT (content): Merge conflict in base_ux/__manifest__.py\n', "13:32:01.205388 git.c:444 trace: built-in: git cherry-pick 2e719288774924e2eabf91f70b0101675acfc299\nerror: could not apply 2e71928... [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", ['2e719288774924e2eabf91f70b0101675acfc299']) ('2e719288774924e2eabf91f70b0101675acfc299', 'CONFLICT (modify/delete): base_ux/models/mail_mail.py deleted in 2e71928 ([REM] base_ux: smtp disconnect exception added into odoo core) and modified in HEAD. Version HEAD of base_ux/models/mail_mail.py left in tree.\nAuto-merging base_ux/__manifest__.py\nCONFLICT (content): Merge conflict in base_ux/__manifest__.py\n', "13:32:01.205388 git.c:444 trace: built-in: git cherry-pick 2e719288774924e2eabf91f70b0101675acfc299\nerror: could not apply 2e71928... [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", ['2e719288774924e2eabf91f70b0101675acfc299']))

[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#263
Forward-Port-Of: ingadhoc/miscellaneous#261