odoo/odoo#161658
Created by fw-bot
Merged
at 8cc12d4f894c251442d7ac2f4eff27ee4a62cefb
Linked pull requests
- label
- odoo-dev:saas-16.3-16.0-imp-l10n_bg_tax_report-rugo-cgs_-fw
- head
- 6ebaf698f71a2ac0701fac74c4a15a558bf7c12d
- target
- saas-16.3
- merged
- 3 weeks ago by Accounting, Ruben Gomes (rugo)
- forward-port of
- odoo/odoo#155223 DETACHED (conflicts: ('f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4', 'Auto-merging addons/l10n_bg/data/tax_report.xml\nAuto-merging addons/l10n_bg/i18n/bg.po\nCONFLICT (content): Merge conflict in addons/l10n_bg/i18n/bg.po\nAuto-merging addons/l10n_bg/i18n/l10n_bg.pot\nCONFLICT (content): Merge conflict in addons/l10n_bg/i18n/l10n_bg.pot\n', '12:37:33.132316 git.c:463 trace: built-in: git cherry-pick f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4\nerror: could not apply f9721b0f0015... [IMP] l10n_bg: tax report\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4']) ('f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4', 'Auto-merging addons/l10n_bg/data/tax_report.xml\nAuto-merging addons/l10n_bg/i18n/bg.po\nCONFLICT (content): Merge conflict in addons/l10n_bg/i18n/bg.po\nAuto-merging addons/l10n_bg/i18n/l10n_bg.pot\nCONFLICT (content): Merge conflict in addons/l10n_bg/i18n/l10n_bg.pot\n', '12:37:33.132316 git.c:463 trace: built-in: git cherry-pick f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4\nerror: could not apply f9721b0f0015... [IMP] l10n_bg: tax report\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['f9721b0f0015ff69d69ed2b8f6a5db9b65a90ca4']))
[FW][IMP] l10n_bg: tax report
- 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: odoo/odoo#155223