Skip to content

[FW][IMP] l10n_ar_account_tax_settlement_mendoza: new module for mendoza AR withholdings #539

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

Tarea: 38394

Forward-Port-Of: #474
Forward-Port-Of: #445

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging l10n_ar_account_tax_settlement/models/account_journal.py
CONFLICT (content): Merge conflict in l10n_ar_account_tax_settlement/models/account_journal.py

stderr:

16:29:54.174500 git.c:444               trace: built-in: git cherry-pick a32e79d034e105b77f720c0d342431962df93779
error: could not apply a32e79d... [IMP] l10n_ar_account_tax_settlement_mendoza: new module for mendoza AR withholdings
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

@pablohmontenegro
Copy link
Contributor

@roboadhoc r+

@pablohmontenegro pablohmontenegro force-pushed the 18.0-16.0-38394-pam-2-E-4O-fw branch from cd23331 to 4b91b89 Compare January 27, 2025 11:12
…AR withholdings

Tarea: 38394
X-original-commit: 112c7a3
@pablohmontenegro pablohmontenegro force-pushed the 18.0-16.0-38394-pam-2-E-4O-fw branch from 4b91b89 to c655021 Compare January 27, 2025 11:13
@pablohmontenegro
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 1d92947 Jan 27, 2025
@roboadhoc roboadhoc added the 17.1 label Jan 27, 2025
@fw-bot-adhoc fw-bot-adhoc deleted the 18.0-16.0-38394-pam-2-E-4O-fw branch February 10, 2025 12:31
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