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][IMP] l10n_ar_account_withholding: get_partner_alicuot method (account.tax) #1033

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

Conversation

fw-bot-adhoc
Copy link
Contributor

Task: 38394
In new module l10n_ar_account_tax_settlement_mendoza is extended the method get_partner_alicuot (account.tax) and it is needed to add line=None argument to that method

Forward-Port-Of: #942
Forward-Port-Of: #940

…t.tax)

Task: 38394
In new module l10n_ar_account_tax_settlement_mendoza is extended the method get_partner_alicuot (account.tax) and it is needed to add line=None argument to that method

X-original-commit: 76a62df
@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

CONFLICT (modify/delete): l10n_ar_account_withholding/models/account_tax.py deleted in HEAD and modified in dde11092 ([IMP] l10n_ar_account_withholding: get_partner_alicuot method (account.tax)). Version dde11092 ([IMP] l10n_ar_account_withholding: get_partner_alicuot method (account.tax)) of l10n_ar_account_withholding/models/account_tax.py left in tree.

stderr:

16:29:52.211716 git.c:444               trace: built-in: git cherry-pick dde1109290bcab26e69b991e23c238fbd3487c11
error: could not apply dde11092... [IMP] l10n_ar_account_withholding: get_partner_alicuot method (account.tax)
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

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