-
Notifications
You must be signed in to change notification settings - Fork 9.1k
[FW][REF] Subscriptions: rewrite overview, integrate products page #12843
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[FW][REF] Subscriptions: rewrite overview, integrate products page #12843
Conversation
@StraubCreative @samueljlieber cherrypicking of pull request #12823 failed. stdout:
Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?). In the former case, you may want to edit this PR message as well. More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
2ad225a
to
2ab61de
Compare
2ab61de: resolve merge conflicts. Version-specific changes incoming: updated 17.0 screenshots, Recurrence Periods --> Recurring Plans verbiage + form/field coverage, etc. |
2ab61de
to
c1ae5f1
Compare
Applied on c1ae5f1. Includes new screenshots, language updates around buttons, fields, etc., additional form coverage as it relates to new features and layout in 17.0 (2+ new sub-sections at ~79 lines), etc. |
c1ae5f1
to
7900da9
Compare
7900da9: updated 17.0 redirects file to accommodate |
@samueljlieber can you TR this for me, please. There were a number of substantial changes made since the 16.0 version on #12823, and I could also use a SC on the cherry-pick (if it all went through okay). Also, for the version-specific edits made here, +2 points? Making the edits on the FW just bypassed a new PR is all (more efficient imo) however the same work was done. Lmk what you think 🙏 TIA! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @StraubCreative, nice job on the version-specific edits and resolving the conflicts! I found just a couple quick fixes in my review, please address these before merging this FWP!
Thank you!
closes #12823 Signed-off-by: Samuel Lieber (sali) <[email protected]>
7900da9
to
f4858da
Compare
closes #12823 closes #12843 Signed-off-by: Samuel Lieber (sali) <[email protected]> Signed-off-by: Zachary Straub (zst) <[email protected]>
Task: 4710396
Forward-Port-Of: #12823