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_tax_settlement: retenciones y percepciones IVA txt #163

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

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket: 54274

Forward-Port-Of: #153

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @ica-adhoc cherrypicking of pull request #153 failed.

stdout:

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

stderr:

19:45:01.407679 git.c:439               trace: built-in: git cherry-pick 35b9dba400679954f6a62f9ef41f109638dfe240
error: could not apply 35b9dba... [IMP]l10n_ar_account_tax_settlement: retenciones y percepciones IVA txt
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.

@pablohmontenegro pablohmontenegro force-pushed the 15.0-13.0-h-54274-pam-Ojey-fw branch from e713716 to 113643e Compare May 22, 2023 12:02
pablohmontenegro added a commit to adhoc-dev/odoo-argentina-ee that referenced this pull request May 22, 2023
pablohmontenegro added a commit to adhoc-dev/odoo-argentina-ee that referenced this pull request May 22, 2023
pablohmontenegro added a commit to adhoc-dev/odoo-argentina-ee that referenced this pull request Jul 28, 2023
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