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

IMP: use group product.group_discount_per_so_line instead of base.gro… #1012

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

damdam-s
Copy link
Member

…up_no_one

@pedrobaeza pedrobaeza added this to the 14.0 milestone Oct 23, 2023
@pedrobaeza
Copy link
Member

There's not too much sense to add also optional of the field. Just don't add the user to the group instead.

@damdam-s
Copy link
Member Author

@pedrobaeza I understand you point of view. However, some users in the group may not want to see the discount (for view simplification) and that's why I added the optional.
Another reason is to match the optional of the discount_fixed field from #1009 but maybe I should add the optional part in the later PR.
Opinion?

@pedrobaeza
Copy link
Member

OK, my only fear here is that someone hides the column, forget it, and then see that the subtotal is "incorrect" not seeing the discount, but it's not a big deal. Please rebase your branch to avoid merge commits though.

@damdam-s damdam-s force-pushed the 14.0-discount_group_on_contract_lines branch from faa0d13 to 86b3b46 Compare October 23, 2023 10:16
@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@pedrobaeza
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 14.0-ocabot-merge-pr-1012-by-pedrobaeza-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 29, 2023
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-1012-by-pedrobaeza-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@pedrobaeza
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 14.0-ocabot-merge-pr-1012-by-pedrobaeza-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 30, 2023
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 14.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 14.0-ocabot-merge-pr-1012-by-pedrobaeza-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 9c423a5 into OCA:14.0 Oct 30, 2023
6 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at d7be9f9. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants