Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Feb 4, 2025

In this PR,

  • Set the default department for the Plans smart button.
  • If there is no plan, it will open the form view.

Task-4356557

Forward-Port-Of: #190938

@robodoo
Copy link
Contributor

robodoo commented Feb 4, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Feb 4, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 4, 2025

@yava-odoo @tivisse cherrypicking of pull request #190938 failed.

stdout:

Auto-merging addons/hr/models/hr_department.py
Auto-merging addons/hr/views/mail_activity_plan_views.xml
CONFLICT (content): Merge conflict in addons/hr/views/mail_activity_plan_views.xml
Auto-merging addons/mail/views/mail_activity_plan_views.xml
CONFLICT (content): Merge conflict in addons/mail/views/mail_activity_plan_views.xml

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

@C3POdoo C3POdoo added the RD research & development, internal work label Feb 4, 2025
In this commit,
- Set the default department for the Plans smart button.
- If there is no plan, it will open the form view.

Task-4356557

X-original-commit: fffc7c0
@tivisse tivisse force-pushed the saas-17.2-17.0-hr-department-activity-plans-yava-405531-fw branch from 83d8fae to 815c027 Compare February 4, 2025 09:14
@tivisse
Copy link
Contributor

tivisse commented Feb 4, 2025

@robodoo r+

@C3POdoo C3POdoo requested review from a team February 4, 2025 09:18
robodoo pushed a commit that referenced this pull request Feb 4, 2025
In this commit,
- Set the default department for the Plans smart button.
- If there is no plan, it will open the form view.

Task-4356557

closes #196357

X-original-commit: fffc7c0
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
@robodoo robodoo closed this Feb 4, 2025
@fw-bot fw-bot deleted the saas-17.2-17.0-hr-department-activity-plans-yava-405531-fw branch February 18, 2025 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants