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][ADD] l10n_ec: Missing withhold tax and fix migration #158101

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 19, 2024

  • Add 319 profit withhold tax with new percentage amount: 2%
  • Fixed migration for profit withhold tax 3440

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #157871

@robodoo
Copy link
Contributor

robodoo commented Mar 19, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 19, 2024

@stevTresCloud @jco-odoo cherrypicking of pull request #157871 failed.

stdout:

CONFLICT (modify/delete): addons/l10n_ec/data/account_tax_template_withhold_profit_data.xml deleted in HEAD and modified in 7225136eaa66 ([ADD] l10n_ec: Missing withhold tax and fix migration).  Version 7225136eaa66 ([ADD] l10n_ec: Missing withhold tax and fix migration) of addons/l10n_ec/data/account_tax_template_withhold_profit_data.xml left in tree.
CONFLICT (modify/delete): addons/l10n_ec/migrations/3.6/post-migrate_update_taxes.py deleted in HEAD and modified in 7225136eaa66 ([ADD] l10n_ec: Missing withhold tax and fix migration).  Version 7225136eaa66 ([ADD] l10n_ec: Missing withhold tax and fix migration) of addons/l10n_ec/migrations/3.6/post-migrate_update_taxes.py left in tree.

stderr:

16:20:11.010098 git.c:463               trace: built-in: git cherry-pick 7225136eaa663a86985fcf4ac101e273e9430580
error: could not apply 7225136eaa66... [ADD] l10n_ec: Missing withhold tax and fix migration
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 Mar 19, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 19, 2024
@C3POdoo C3POdoo requested review from a team and asno-odoo March 28, 2024 09:08
@jco-odoo jco-odoo force-pushed the saas-16.3-TRESCLOUD_15_02_2024_ADD_NEW_WH_TAX-K1GT-fw branch from 297cfb6 to 3b766cc Compare March 28, 2024 14:16
- Add 319 profit withhold tax with new percentage amount: 2%
- Fixed migration for profit withhold tax 3440

X-original-commit: 84320e7
@jco-odoo jco-odoo force-pushed the saas-16.3-TRESCLOUD_15_02_2024_ADD_NEW_WH_TAX-K1GT-fw branch from 3b766cc to cb0b82b Compare March 28, 2024 14:17
@jco-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 28, 2024
- Add 319 profit withhold tax with new percentage amount: 2%
- Fixed migration for profit withhold tax 3440

closes #158101

X-original-commit: 84320e7
Signed-off-by: Josse Colpaert <jco@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 28, 2024
- Add 319 profit withhold tax with new percentage amount: 2%
- Fixed migration for profit withhold tax 3440

closes #158101

X-original-commit: 84320e7
Signed-off-by: Josse Colpaert <jco@odoo.com>
@robodoo robodoo closed this Mar 28, 2024
@fw-bot fw-bot deleted the saas-16.3-TRESCLOUD_15_02_2024_ADD_NEW_WH_TAX-K1GT-fw branch April 11, 2024 19:46
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