Skip to content

[16.0][ADD] sale_pricelist_display_surcharge#2629

Merged
OCA-git-bot merged 1 commit intoOCA:16.0from
ForgeFlow:16.0-add-sale_surcharge_discount
May 12, 2025
Merged

[16.0][ADD] sale_pricelist_display_surcharge#2629
OCA-git-bot merged 1 commit intoOCA:16.0from
ForgeFlow:16.0-add-sale_surcharge_discount

Conversation

@DavidJForgeFlow
Copy link
Copy Markdown
Contributor

@DavidJForgeFlow DavidJForgeFlow commented Aug 3, 2023

In standard Odoo only display the discount if it benefices the customer.
In the case of wanting to always show the discount (for example a surcharge), this module allows to choose if show or not the customer the discount.

@ForgeFlow

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from 8fc4eed to 34807ab Compare August 3, 2023 08:21
@rafaelbn rafaelbn added this to the 16.0 milestone Aug 7, 2023
@rousseldenis
Copy link
Copy Markdown
Contributor

rousseldenis commented Aug 29, 2023 •
edited
Loading

@DavidJForgeFlow What do you think adding 'pricelist' term to module name? As this is more explicit. So, sale_display_pricelist_surcharge'

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from 34807ab to 35899ef Compare August 30, 2023 07:16
@DavidJForgeFlow DavidJForgeFlow changed the title [16.0][ADD] sale_display_surcharge [16.0][ADD] sale_pricelist_display_surcharge Aug 30, 2023
@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Aug 30, 2023

@DavidJForgeFlow What do you think adding 'pricelist' term to module name? As this is more explicit. So, sale_display_pricelist_surcharge'

Changed!

@rousseldenis
Copy link
Copy Markdown
Contributor

rousseldenis commented Feb 3, 2025

@DavidJForgeFlow Could you attract people for more reviews ?

JordiMForgeFlow
JordiMForgeFlow reviewed Feb 3, 2025
View reviewed changes
sale_pricelist_display_surcharge/readme/DESCRIPTION.rst Outdated
Comment on lines +1 to +3
In standard Odoo only display the discount if it benefices the customer.
In the case of wanting to always show the discount (for example a surcharge),
this module allows to choose if show or not the customer the discount.
Copy link
Copy Markdown
Contributor

@JordiMForgeFlow JordiMForgeFlow Feb 3, 2025

Choose a reason for hiding this comment

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

Suggested change
In standard Odoo only display the discount if it benefices the customer.
In the case of wanting to always show the discount (for example a surcharge),
this module allows to choose if show or not the customer the discount.
In standard Odoo the discount is only displayed if it benefits the customer.
In the case of wanting to always show the discount (for example a surcharge),
this module allows to choose whether to show or not.

Copy link
Copy Markdown
Contributor Author

@DavidJForgeFlow DavidJForgeFlow Feb 3, 2025

Choose a reason for hiding this comment

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

Done!

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from 35899ef to 2fe603f Compare February 3, 2025 14:33
AaronHForgeFlow
AaronHForgeFlow approved these changes Feb 3, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@AaronHForgeFlow AaronHForgeFlow left a comment

Choose a reason for hiding this comment

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

Code LGTM

@JordiMForgeFlow
Copy link
Copy Markdown
Contributor

JordiMForgeFlow commented Feb 3, 2025

@DavidJForgeFlow would it be possible to add some test?

@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Feb 3, 2025

@DavidJForgeFlow would it be possible to add some test?

Makes sense to add tests here, I will note it and add them when I have time!

@rousseldenis
Copy link
Copy Markdown
Contributor

rousseldenis commented Mar 12, 2025

@DavidJForgeFlow

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch 2 times, most recently from 216a534 to 382b209 Compare March 14, 2025 08:26
@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Mar 14, 2025

@JordiMForgeFlow @rousseldenis Tests added!

@JordiMForgeFlow
Copy link
Copy Markdown
Contributor

JordiMForgeFlow commented Mar 14, 2025

@DavidJForgeFlow test seem to be failing, could you check?

@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Mar 14, 2025

@DavidJForgeFlow test seem to be failing, could you check?

Seems an error common in all 16.0 PRs. If monday keeps happening I will investigate further!

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from 382b209 to 2a0293a Compare March 17, 2025 10:30
@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Mar 17, 2025

@JordiMForgeFlow there is a conflict between two modules that cannot be installed at the same time: account_invoice_triple_discount and account_invoice_fixed_discount. The test including them fails, the other one works. Should we exclude them?

@JordiMForgeFlow
Copy link
Copy Markdown
Contributor

JordiMForgeFlow commented Mar 17, 2025

@DavidJForgeFlow we should do the same as it was done in the account-invoicing repo where those base modules are (OCA/account-invoicing@c6144b7).

Running a copier update you can specify the rebel modules (here we should separate sale_fixed_discount and sale_triple_discount). Maybe better if you do it in a separate PR

@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented Mar 17, 2025

There is a PR open trying to fix this error: #2885. As the module sale_triple_discount is also failing by adding this modules as rebel: #3629. Let's wait until @grindtildeath fix this error!

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from 2a0293a to a2db489 Compare May 9, 2025 08:25
@DavidJForgeFlow
Copy link
Copy Markdown
Contributor Author

DavidJForgeFlow commented May 9, 2025

@JordiMForgeFlow @rousseldenis This is now ready to merge!

@OCA-git-bot
Copy link
Copy Markdown
Contributor

OCA-git-bot commented May 9, 2025

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). 🤖

@DavidJForgeFlow DavidJForgeFlow force-pushed the 16.0-add-sale_surcharge_discount branch from a2db489 to 4fb2ed5 Compare May 12, 2025 06:16
@JordiBForgeFlow
Copy link
Copy Markdown
Member

JordiBForgeFlow commented May 12, 2025

/ocabot merge nobump

@OCA-git-bot
Copy link
Copy Markdown
Contributor

OCA-git-bot commented May 12, 2025

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-2629-by-JordiBForgeFlow-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 4f0b0e0 into OCA:16.0 May 12, 2025
13 checks passed
@OCA-git-bot
Copy link
Copy Markdown
Contributor

OCA-git-bot commented May 12, 2025

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

@MiquelRForgeFlow MiquelRForgeFlow deleted the 16.0-add-sale_surcharge_discount branch May 12, 2025 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rousseldenis rousseldenis rousseldenis approved these changes

+2 more reviewers

@JordiMForgeFlow JordiMForgeFlow JordiMForgeFlow left review comments

@AaronHForgeFlow AaronHForgeFlow AaronHForgeFlow approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved merged 🎉 needs review ready to merge

Projects

None yet

Milestone

16.0

Development

Successfully merging this pull request may close these issues.

7 participants

@DavidJForgeFlow @rousseldenis @JordiMForgeFlow @OCA-git-bot @JordiBForgeFlow @AaronHForgeFlow @rafaelbn