Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jul 19, 2024

PROJECT TASK: https://www.odoo.com/web#id=3919221&cids=3&menu_id=4720&action=333&active_id=3835&model=project.task&view_type=form

This PR breaks down everything there is to know about Event Tracks and how to create them in Odoo Events.
Completely new doc, new screenshots...etc.

This should be published/merged before the Track_Manage_Talks doc

Forward-Port-Of: #9241

@robodoo
Copy link
Collaborator

robodoo commented Jul 19, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 19, 2024

@ksc-odoo cherrypicking of pull request #9241 failed.

stdout:

Auto-merging content/applications/marketing/events.rst
CONFLICT (content): Merge conflict in content/applications/marketing/events.rst

stderr:

04:16:45.906807 git.c:463               trace: built-in: git cherry-pick 260a4198a5f15093ce540e2def4d4925cf30eaa4 --strategy ort
error: could not apply 260a4198a... [ADD] events: added an event tracks doc
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 23, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

6 similar comments
@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 24, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 25, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 26, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 27, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 28, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 29, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@ksc-odoo
Copy link
Contributor

Hey there, @samueljlieber (and/or @Felicious ) any idea how I can resolve the conflicts on this PR? Any insight or guidance would be super helpful. Thanks! 🙏

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 31, 2024

@ksc-odoo this forward port of #9241 is awaiting action (not merged or closed).

@samueljlieber samueljlieber force-pushed the saas-17.2-17.0-events-event-tracks-ksc-N0j3-fw branch from 7f9e0f2 to 0534383 Compare July 31, 2024 14:58
@samueljlieber
Copy link
Contributor

Resolved merge conflict in 0534383

@C3POdoo C3POdoo requested a review from a team July 31, 2024 15:01
@samueljlieber
Copy link
Contributor

Update, there are a number of outstanding saas-17.2 PRs waiting for merge that also edit events.rst.

Here is the merge order:

  1. [FW][ADD] events: event booths doc (17) #10265
  2. [FW][ADD] events: added an event tracks doc #10273 rebase after 10265 merge
  3. [FW][ADD] events: registration desk doc (17) #10439 rebase after 10273 merge
  4. [FW][ADD] events: revenues report #10464 rebase after 10439 merge

@samueljlieber samueljlieber force-pushed the saas-17.2-17.0-events-event-tracks-ksc-N0j3-fw branch from 0534383 to dc87c86 Compare July 31, 2024 19:50
@samueljlieber
Copy link
Contributor

dc87c86 Rebased to resolve conflict

Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo pushed a commit that referenced this pull request Jul 31, 2024
closes #10273

X-original-commit: a535d2f
Signed-off-by: Kevin Scannell (ksc) <ksc@odoo.com>
Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
robodoo pushed a commit that referenced this pull request Aug 1, 2024
closes #10273

X-original-commit: a535d2f
Signed-off-by: Kevin Scannell (ksc) <ksc@odoo.com>
Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants