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][FIX] l10n_ch: tax report box 200 computation fix #158123

Conversation

fw-bot
Copy link
Contributor

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

With this PR #129717 we fixed multiple problems of the Swiss tax report but the 200 box is still not correct.

Fix the computation of the box 200 of the Swiss tax report. We remove 382 and 383 boxes that are for purchases and shouldn't be included.
We add box 205 and 289 so that the box 200 somehow represent the "gross" taxed amount, and 299 is therefore the "net" amount.

200 = 302 to 343 + 205 + 289

opw-3766215

Forward-Port-Of: #158008

@robodoo
Copy link
Contributor

robodoo commented Mar 19, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 19, 2024

@clbr-odoo @Levizar cherrypicking of pull request #158008 failed.

stdout:

Auto-merging addons/l10n_ch/data/account_tax_report_data.xml
CONFLICT (content): Merge conflict in addons/l10n_ch/data/account_tax_report_data.xml

stderr:

16:33:44.656058 git.c:463               trace: built-in: git cherry-pick 52a587df3c44cea1406e7e5e682ec5460a3f3881
error: could not apply 52a587df3c44... [FIX] l10n_ch: tax report box 200 computation fix
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
With this PR odoo#129717 we fixed
multiple problems of the Swiss tax report but the 200 box is still
not correct.

Fix the computation of the box 200 of the Swiss tax report.
We remove 382 and 383 boxes that are for purchases and shouldn't be
included.
We add box 205 and 289 so that the box 200 somehow represent the "gross"
taxed amount, and 299 is therefore the "net" amount.

200 = 302 to 343 + 205 + 289

opw-3766215

X-original-commit: 8982cd1
@clbr-odoo clbr-odoo force-pushed the 15.0-14.0-l10n_ch_tax_report_fix-clbr-tAhY-fw branch from eba63b3 to e8b9f0e Compare March 19, 2024 15:54
@clbr-odoo
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 19, 2024
robodoo pushed a commit that referenced this pull request Mar 20, 2024
With this PR #129717 we fixed
multiple problems of the Swiss tax report but the 200 box is still
not correct.

Fix the computation of the box 200 of the Swiss tax report.
We remove 382 and 383 boxes that are for purchases and shouldn't be
included.
We add box 205 and 289 so that the box 200 somehow represent the "gross"
taxed amount, and 299 is therefore the "net" amount.

200 = 302 to 343 + 205 + 289

opw-3766215

closes #158123

X-original-commit: 8982cd1
Signed-off-by: Brice Bartoletti (bib) <bib@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
@robodoo robodoo closed this Mar 20, 2024
maan-odoo pushed a commit to odoo-dev/odoo that referenced this pull request Mar 24, 2024
With this PR odoo#129717 we fixed
multiple problems of the Swiss tax report but the 200 box is still
not correct.

Fix the computation of the box 200 of the Swiss tax report.
We remove 382 and 383 boxes that are for purchases and shouldn't be
included.
We add box 205 and 289 so that the box 200 somehow represent the "gross"
taxed amount, and 299 is therefore the "net" amount.

200 = 302 to 343 + 205 + 289

opw-3766215

closes odoo#158123

X-original-commit: 8982cd1
Signed-off-by: Brice Bartoletti (bib) <bib@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
@fw-bot fw-bot deleted the 15.0-14.0-l10n_ch_tax_report_fix-clbr-tAhY-fw branch April 3, 2024 14:47
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
With this PR odoo#129717 we fixed
multiple problems of the Swiss tax report but the 200 box is still
not correct.

Fix the computation of the box 200 of the Swiss tax report.
We remove 382 and 383 boxes that are for purchases and shouldn't be
included.
We add box 205 and 289 so that the box 200 somehow represent the "gross"
taxed amount, and 299 is therefore the "net" amount.

200 = 302 to 343 + 205 + 289

opw-3766215

closes odoo#158123

X-original-commit: 8982cd1
Signed-off-by: Brice Bartoletti (bib) <bib@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants