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_ec: Update codes Tax 5% - May 2024 #166073

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 17, 2024

Update tax codes:

  • IVA 5% (411, Bienes) -> IVA 5% (435, Bienes) (code_base: 435, code_applied: 445)
  • IVA 5% (510, Crédito IVA) -> IVA 5% (550, Crédito IVA) (code_base: 550, code_applied: 560)

Create Report lines:

  • Ventas locales (excluye activos fijos) gravadas tarifa 5%
  • Adquisiciones y pagos locales (excluye activos fijos) gravados con tarifa 5% (con derecho a crédito tributario)

Forward-Port-Of: #165522

- Update tax codes:
  - IVA 5% (411, Bienes) -> IVA 5% (435, Bienes) (code_base: 435, code_applied: 445)
  - IVA 5% (510, Crédito IVA) -> IVA 5% (550, Crédito IVA) (code_base: 550, code_applied: 560)

- Create Report lines:
  - Ventas locales (excluye activos fijos) gravadas tarifa 5%
  - Adquisiciones y pagos locales (excluye activos fijos) gravados con tarifa 5% (con derecho a crédito tributario)

X-original-commit: 18d2e52
@robodoo
Copy link
Contributor

robodoo commented May 17, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented May 17, 2024

@kenluzuriaga0 @jco-odoo cherrypicking of pull request #165522 failed.

stdout:

Auto-merging addons/l10n_ec/__manifest__.py
CONFLICT (content): Merge conflict in addons/l10n_ec/__manifest__.py
Auto-merging addons/l10n_ec/data/account_tax_report_data.xml
CONFLICT (modify/delete): addons/l10n_ec/data/account_tax_template_vat_data.xml deleted in HEAD and modified in 0bbe5c5b9899 ([IMP] l10n_ec: Update codes Tax 5% - May 2024).  Version 0bbe5c5b9899 ([IMP] l10n_ec: Update codes Tax 5% - May 2024) of addons/l10n_ec/data/account_tax_template_vat_data.xml left in tree.

stderr:

22:10:54.724304 git.c:463               trace: built-in: git cherry-pick 0bbe5c5b98995b88b40cca076c3c57c72d289c5e
error: could not apply 0bbe5c5b9899... [IMP] l10n_ec: Update codes Tax 5% - May 2024
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels May 17, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label May 17, 2024
@aliyatastemirova
Copy link
Contributor

hi @kenluzuriaga0 I see that we have merged this in a different pr in 17.0, should we backport it to saas-16.3?

@kenluzuriaga0
Copy link
Contributor

Hello @aliyatastemirova I did a manual backport here #167589 to resolve conflicts

@aliyatastemirova
Copy link
Contributor

ok, thanks 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants