odoo/documentation#8881
Created by fw-bot
Merged
at 3cb351b6b92335117756a6b4ddb056f1037c5ea6
- label
- odoo-dev:17.0-15.0-sales-subscriptions-follow-up-alerts-add-iap-tiku-hfjD-fw
- head
- 3c07eb0c6240a80b6fe6b458721c969be8c32e1b
- target
- 17.0
- merged
- 1 month ago by Samuel Lieber (sali)
- forward-port of
- odoo/documentation#8822 DETACHED (conflicts: ('bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5', 'Auto-merging content/applications/sales/subscriptions/automatic_alerts.rst\nCONFLICT (content): Merge conflict in content/applications/sales/subscriptions/automatic_alerts.rst\n', '21:39:25.408064 git.c:463 trace: built-in: git cherry-pick bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5\nerror: could not apply bd97c88df... [IMP] sales: subscription follow-up alerts add block\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5']) ('bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5', 'Auto-merging content/applications/sales/subscriptions/automatic_alerts.rst\nCONFLICT (content): Merge conflict in content/applications/sales/subscriptions/automatic_alerts.rst\n', '21:39:25.408064 git.c:463 trace: built-in: git cherry-pick bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5\nerror: could not apply bd97c88df... [IMP] sales: subscription follow-up alerts add block\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5']))
[FW][IMP] sales: subscriptions follow up alerts add iap
Task:
https://www.odoo.com/web?debug=1#id=2057350&cids=3&menu_id=4720&action=333&active_id=3835&model=project.task&view_type=form
Forward-Port-Of: odoo/documentation#8878
Forward-Port-Of: odoo/documentation#8822