Skip to content
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][FIX] l10n_ar_account_withholding: withholding type requerido #941

Open
wants to merge 1 commit into
base: 17.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket: 81960
Este cambio va de la mano con el de este pr ingadhoc/account-payment#547

Forward-Port-Of: #934

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @zaoral cherrypicking of pull request #934 failed.

stdout:

Auto-merging l10n_ar_account_withholding/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_account_withholding/__manifest__.py

stderr:

19:16:56.085757 git.c:444               trace: built-in: git cherry-pick 5c458df5abf8738e037e2d9c7a004d43948dd1dd
error: could not apply 5c458df5... [FIX] l10n_ar_account_withholding: withholding type requerido
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

@zaoral zaoral force-pushed the 17.0-16.0-h-81960-pam-ICqV-fw branch from 6a503ee to 4d0d31e Compare October 29, 2024 20:15
FW of change made in l10n_ar_account_withholding module
but now applied to a more proper module (account_withholding_automatic
was deprecated, and new l10n_ar_withholding_ux is the one used)

Ticket: 81960

Este cambio va de la mano con el de este pr ingadhoc/account-payment#547

X-original-commit: e4175b1
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