Skip to content

[FW][IMP] academic_sale_subscription: add start_date in wizard #209

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

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #200

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @lav-adhoc cherrypicking of pull request #200 failed.

stdout:

Auto-merging academic_sale_subscription/wizard/academic_order_wizard_views.xml
Auto-merging academic_sale_subscription/wizard/academic_order_wizard.py
CONFLICT (content): Merge conflict in academic_sale_subscription/wizard/academic_order_wizard.py
Auto-merging academic_sale_subscription/__manifest__.py
CONFLICT (content): Merge conflict in academic_sale_subscription/__manifest__.py

stderr:

19:29:41.424013 git.c:444               trace: built-in: git cherry-pick 6abd3edfe19c0fc7d6df726ab6370e38693eb745
error: could not apply 6abd3ed... [IMP] academic_sale_subscription: add start_date in wizard
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

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

@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-45890-lef4-5jt9-fw branch from 39fd877 to a0b7dd3 Compare February 17, 2025 19:00
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

roboadhoc pushed a commit that referenced this pull request Feb 17, 2025
closes #209

X-original-commit: 832fcf3
Signed-off-by: lav-adhoc <lav@adhoc.com.ar>
Signed-off-by: Franco Leyes <lef@adhoc.com.ar>
@roboadhoc roboadhoc closed this in 06731c4 Feb 17, 2025
@roboadhoc roboadhoc added the 17.1 label Feb 17, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-45890-lef4-5jt9-fw branch February 17, 2025 19:25
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.

3 participants