Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 18, 2025

We do not create create caba moves anymore for PoS session closing moves.
(See commits 2f62d5c and 66e3696)

But now there are 2 issues when using (only) caba taxes in a PoS session.
(1) The closing move does not appear on the tax report.
(2) The closing move line do not get the right tax tags (they do not have any).

Issue (1) is solved by making pos closing moves always_tax_exigible.
(In case they did not creat cash basis entries; for backwards compatibility).

Issue (2) is solved by telling the tax computation for the lines to include caba taxes
(instead of just changing the account to be the "final" account and not
the caba transition account).

opw-4355124

Forward-Port-Of: #201812

@robodoo
Copy link
Contributor

robodoo commented Mar 18, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 18, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 18, 2025

@svfu-odoo @oco-odoo cherrypicking of pull request #201812 failed.

stdout:

Auto-merging addons/point_of_sale/models/account_move.py
Auto-merging addons/point_of_sale/models/pos_session.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_session.py

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

@svfu-odoo svfu-odoo force-pushed the saas-17.4-16.0-fix_caba_pos_tax_report-svfu-423747-fw branch from 575f3e7 to a5e77f0 Compare March 18, 2025 13:39
@C3POdoo C3POdoo requested review from a team and vlst-odoo and removed request for a team March 18, 2025 13:47
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 18, 2025
We do not create create caba moves anymore for PoS session closing moves.
(See commits 2f62d5c and 66e3696)

But now there are 2 issues when using (only) caba taxes in a PoS session.
  (1) The closing move does not appear on the tax report.
  (2) The closing move line do not get the right tax tags (they do not have any).

Issue (1) is solved by making pos closing moves `always_tax_exigible`.
(In case they did not creat cash basis entries; for backwards compatibility).

Issue (2) is solved by telling the tax computation for the lines to include caba taxes
(instead of just changing the account to be the "final" account and not
the caba transition account).

opw-4355124

X-original-commit: 8f388be
@svfu-odoo svfu-odoo force-pushed the saas-17.4-16.0-fix_caba_pos_tax_report-svfu-423747-fw branch from a5e77f0 to 88d76dd Compare March 18, 2025 15:54
Copy link
Contributor

@smetl smetl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo pushed a commit that referenced this pull request Mar 19, 2025
We do not create create caba moves anymore for PoS session closing moves.
(See commits 2f62d5c and 66e3696)

But now there are 2 issues when using (only) caba taxes in a PoS session.
  (1) The closing move does not appear on the tax report.
  (2) The closing move line do not get the right tax tags (they do not have any).

Issue (1) is solved by making pos closing moves `always_tax_exigible`.
(In case they did not creat cash basis entries; for backwards compatibility).

Issue (2) is solved by telling the tax computation for the lines to include caba taxes
(instead of just changing the account to be the "final" account and not
the caba transition account).

opw-4355124

closes #202308

X-original-commit: 8f388be
Related: odoo/enterprise#81685
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
Signed-off-by: Laurent Smet (las) <las@odoo.com>
@robodoo robodoo closed this Mar 19, 2025
@fw-bot fw-bot deleted the saas-17.4-16.0-fix_caba_pos_tax_report-svfu-423747-fw branch March 26, 2025 11:23
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.

5 participants