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_bg: tax report #161658

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 12, 2024

  • Adds missing section D and E to the tax report.
  • Change line 43 to editable instead of aggregation.

task-3672445


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

Forward-Port-Of: #155223

@robodoo
Copy link
Contributor

robodoo commented Apr 12, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 12, 2024

@rugo-odoo @gawa-odoo cherrypicking of pull request #155223 failed.

stdout:

Auto-merging addons/l10n_bg/data/tax_report.xml
Auto-merging addons/l10n_bg/i18n/bg.po
CONFLICT (content): Merge conflict in addons/l10n_bg/i18n/bg.po
Auto-merging addons/l10n_bg/i18n/l10n_bg.pot
CONFLICT (content): Merge conflict in addons/l10n_bg/i18n/l10n_bg.pot

stderr:

12:37:33.132316 git.c:463               trace: built-in: git cherry-pick f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4
error: could not apply f9721b0f0015... [IMP] l10n_bg: tax report
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 Apr 12, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 12, 2024
@rugo-odoo rugo-odoo force-pushed the saas-16.3-16.0-imp-l10n_bg_tax_report-rugo-cgs_-fw branch from 0ac66fb to ba25a54 Compare April 18, 2024 07:32
- Adds missing section D and E to the tax report.
- Change line 43 to editable instead of aggregation.

task-3672445

X-original-commit: 0215b51
@rugo-odoo rugo-odoo force-pushed the saas-16.3-16.0-imp-l10n_bg_tax_report-rugo-cgs_-fw branch from ba25a54 to 6ebaf69 Compare April 25, 2024 08:14
@rugo-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 26, 2024
- Adds missing section D and E to the tax report.
- Change line 43 to editable instead of aggregation.

task-3672445

closes #161658

X-original-commit: 0215b51
Related: odoo/enterprise#60616
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
Signed-off-by: Ruben Gomes (rugo) <rugo@odoo.com>
@robodoo robodoo closed this Apr 26, 2024
nd-dew pushed a commit to odoo-dev/odoo that referenced this pull request Apr 30, 2024
- Adds missing section D and E to the tax report.
- Change line 43 to editable instead of aggregation.

task-3672445

closes odoo#161658

X-original-commit: 0215b51
Related: odoo/enterprise#60616
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
Signed-off-by: Ruben Gomes (rugo) <rugo@odoo.com>
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

4 participants