ingadhoc/account-financial-tools#581
Created by fw-bot-adhoc
Merged
at 1e4aeb376420f53f69bb6334fe8edcec303217ec
- label
- adhoc-dev:18.0-17.0-t-44682-rov-Aj9u-fw
- head
- b27b9eff6ddaa807ac92f1f8f9dbc824da88a959
- target
- 18.0
- merged
- hace 3 semanas by rov-adhoc
- forward-port of
- ingadhoc/account-financial-tools#575 DETACHED (conflicts: ('bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a', 'Auto-merging account_ux/__manifest__.py\nCONFLICT (content): Merge conflict in account_ux/__manifest__.py\nAuto-merging account_ux/README.rst\n', "21:33:31.882474 git.c:444 trace: built-in: git cherry-pick bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a\nerror: could not apply bb251ad2... [IMP] Improve confirmation message for reload_template button in accounting settings\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", ['bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a']) ('bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a', 'Auto-merging account_ux/__manifest__.py\nCONFLICT (content): Merge conflict in account_ux/__manifest__.py\nAuto-merging account_ux/README.rst\n', "21:33:31.882474 git.c:444 trace: built-in: git cherry-pick bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a\nerror: could not apply bb251ad2... [IMP] Improve confirmation message for reload_template button in accounting settings\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", ['bb251ad2f8c147a14c8a03b7e7e5d0d671a7288a']))
[FW][IMP] Improve confirmation message for reload_template button in accounting settings
Forward-Port-Of: ingadhoc/account-financial-tools#575