ingadhoc/sale#810

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-36049-lef-jbpA-fw

head

9b0cefebec810d7338689f1e5406c908ead5ec19

target

17.0

merged

hace 6 meses by matiasperalta1

forward-port of

ingadhoc/sale#809 DETACHED (conflicts: ('aacccc64728535bd6a3e6e424113ac3208a46e7b', 'Auto-merging sale_ux/views/res_config_settings_views.xml\nAuto-merging sale_ux/models/sale_order.py\nAuto-merging sale_ux/i18n/es.po\nAuto-merging sale_ux/__manifest__.py\nCONFLICT (content): Merge conflict in sale_ux/__manifest__.py\nAuto-merging sale_ux/README.rst\nCONFLICT (content): Merge conflict in sale_ux/README.rst\n', "15:08:29.346039 git.c:444 trace: built-in: git cherry-pick aacccc64728535bd6a3e6e424113ac3208a46e7b\nerror: could not apply aacccc64... [IMP] sale_ux: cancel old quotations\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", ['aacccc64728535bd6a3e6e424113ac3208a46e7b']) ('aacccc64728535bd6a3e6e424113ac3208a46e7b', 'Auto-merging sale_ux/views/res_config_settings_views.xml\nAuto-merging sale_ux/models/sale_order.py\nAuto-merging sale_ux/i18n/es.po\nAuto-merging sale_ux/__manifest__.py\nCONFLICT (content): Merge conflict in sale_ux/__manifest__.py\nAuto-merging sale_ux/README.rst\nCONFLICT (content): Merge conflict in sale_ux/README.rst\n', "15:08:29.346039 git.c:444 trace: built-in: git cherry-pick aacccc64728535bd6a3e6e424113ac3208a46e7b\nerror: could not apply aacccc64... [IMP] sale_ux: cancel old quotations\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", ['aacccc64728535bd6a3e6e424113ac3208a46e7b']))

[FW][IMP] sale_ux: cancel old quotations

Forward-Port-Of: ingadhoc/sale#809