[IMP] product_pricelist_supplierinfo: improve sale margin string in view and exclude supplier info discount in price #1836
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @luisg123v, |
|
Hi @luisg123v, This implements the following comments: |
luisg123v
suggested changes
Jan 7, 2025
| @@ -9,7 +9,7 @@ | |||
| <field name="price" position="after"> | |||
| <field | |||
| name="sale_margin" | |||
| string="Sale margin" | |||
| string="Sale Margin (%)" | |||
There was a problem hiding this comment.
Why not at model level?
The native field does it that way.
There was a problem hiding this comment.
Changes implemented at the model level.
| @@ -311,3 +311,19 @@ def test_line_uom_and_supplierinfo_uom(self): | |||
| # And the price with the pricelist and the uom of Units (Instead of Dozen) | |||
| # will be 100, plus the 20% the total will be 120 per Unit | |||
| self.assertEqual(product_pricelist_price_unit, 120) | |||
|
|
|||
| def test_pricelist_exclude_supplier_info_discount(self): | |||
| """Test the scenario where the product supplier info includes a discount,to | |||
| @@ -20,6 +20,9 @@ class ProductPricelistItem(models.Model): | |||
| string="Supplier filter", | |||
| help="Only match prices from the selected supplier", | |||
| ) | |||
| no_supplierinfo_discount = fields.Boolean( | |||
There was a problem hiding this comment.
The commit title has been shortened.
| @@ -20,6 +20,9 @@ class ProductPricelistItem(models.Model): | |||
| string="Supplier filter", | |||
| help="Only match prices from the selected supplier", | |||
| ) | |||
| no_supplierinfo_discount = fields.Boolean( | |||
| string="Ignore Supplier Info Discount", | |||
Update the sale margin string on the field to match the format of the discount field [1], which is located beside it in the list view. [1]: https://github.com/odoo/odoo/blob/e947c589/addons/product/models/product_supplierinfo.py#L65
…in price Introduce a new field to optionally exclude the discount set in the product supplier info when calculating the product's price. Additionally, add a test to validate the new functionality.
CLaurelB
force-pushed
the
17.0-include_optional_price_discounted-CLaurelB
branch
from
928c03f to
e5292b4
Compare
CLaurelB
changed the title
|
/ocabot merge major |
|
On my way to merge this fine PR! |
|
Congratulations, your PR was merged at 19db99a. 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the sale margin string on the field to match the format of the discount field 1, which is located beside it in the list view.
Also, introduce a new field to optionally exclude the discount set in the product supplier info when calculating the product's price. A test has been added to validate this new functionality.