fix: pricing rule item code UOM apply & conversions #32566
Merged
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
there were multiple issues with pricing rule's apply_on_field == "item_code" ( UOM : blank, other_than_stock_uom etc ). I have added required checks and proper conversions.
deepeshgarg007
requested review from
nextchamp-saqib,
deepeshgarg007 and
ruthra-kumar
as code owners
maharshivpatel
changed the title
deepeshgarg007
requested changes
Oct 12, 2022
Instead of handling multiple cases / conversion i have simplified the rule application. if pricing rule uom is blank apply on all UOMs and multiple by conversion_factor. if pricing rule uom is specified apply rule only if sales_uom matches the pricing rule uom. also added test for both cases.
maharshivpatel
added
the
squash
remove unused import
maharshivpatel
requested review from
deepeshgarg007
and removed request for
ruthra-kumar and
nextchamp-saqib
pricing rule when called again on_save used get_cached_doc for performance reasons and didn't have uom parameter so looped in child table and specified matching uom.
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #32566 +/- ##
========================================
Coverage 63.71% 63.71%
========================================
Files 816 816
Lines 58300 58310 +10
========================================
+ Hits 37144 37155 +11
+ Misses 21156 21155 -1
|
maharshivpatel
removed
dont-merge
needs-tests
|
@Mergifyio backport version-13-hotfix version-14-hotfix |
✅ Backports have been created
|
This was referenced Oct 18, 2022
deepeshgarg007
added a commit
that referenced
this pull request
Oct 18, 2022
…#32636) * fix: pricing rule for non stock UOM and conversions * fix: pricing rule for non stock UOM and conversions (cherry picked from commit 96b4211) # Conflicts: # erpnext/accounts/doctype/pricing_rule/pricing_rule.py * chore: resolve conflicts Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 18, 2022
## [14.3.1](v14.3.0...v14.3.1) (2022-10-18) ### Bug Fixes * `Brand Defaults` filters ([cb0c4b5](cb0c4b5)) * add project settings to projects workspace (backport [#32568](#32568)) ([#32600](#32600)) ([af4dafd](af4dafd)) * delete old ple's on item value repost ([62cabdf](62cabdf)) * don't try to update youtube data if disabled in settings (backport [#32588](#32588)) ([#32589](#32589)) ([ed85683](ed85683)) * group warehouse filter not working for Batchwise Balance history report ([faedd85](faedd85)) * Ignore linked purchase invoice on cancel ([cc938fb](cc938fb)) * linter ([831f60f](831f60f)) * Party account for multi-order invoices ([eaea846](eaea846)) * pricing rule item code UOM apply & conversions (backport [#32566](#32566)) ([#32637](#32637)) ([ffd82f3](ffd82f3)) * Renamed Dashboard tab label to Connections ([dac5989](dac5989)) * Renamed Notes section to Comments ([9e94dd9](9e94dd9)) * type-cast while saving an item (backport [#32549](#32549)) ([#32578](#32578)) ([829a0ff](829a0ff))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 19, 2022
## [13.40.2](v13.40.1...v13.40.2) (2022-10-19) ### Bug Fixes * `Brand Defaults` filters ([b1c70af](b1c70af)) * don't try to update youtube data if disabled in settings (backport [#32588](#32588)) ([#32590](#32590)) ([7e7122b](7e7122b)) * Ignore linked purchase invoice on cancel ([eec770a](eec770a)) * Party account for multi-order invoices ([0ae2a4f](0ae2a4f)) * pricing rule item code UOM apply & conversions (backport [#32566](#32566)) ([#32636](#32636)) ([b8d97b8](b8d97b8))
|
Thank you for fixing this bug; however, it is still not considering the max qty limitations. |
maharshivpatel
added a commit
to maharshivpatel/erpnext
that referenced
this pull request
Nov 9, 2022
Pricing rule's apply_on_field == "item_group" didn't check for UOM. I have added the required checks. Same as frappe#32566
This was referenced Nov 9, 2022
Closed
frappe-pr-bot
pushed a commit
that referenced
this pull request
Nov 15, 2022
# [13.42.0](v13.41.1...v13.42.0) (2022-11-15) ### Bug Fixes * add Document Date in E-Invoice print format ([a16347f](a16347f)) * ambiguous 'cost_center' on payment reconciliation ([e9e5ded](e9e5ded)) * check type for reference name ([ad648f3](ad648f3)) * don't set WIP Warehouse if is checked in WO ([4a17711](4a17711)) * Label for applicable dimension table ([cbc8b2d](cbc8b2d)) * Pricing rule item group consider UOM ([1ed0b6e](1ed0b6e)), closes [#32566](#32566) * query condition change ([88ce59a](88ce59a)) * repayment schedule regeneration ([a19031c](a19031c)) * set `WIP Warehouse` in Job Card ([f09e427](f09e427)) * set stock UOM in args to ensure item price is fetched ([bd2242b](bd2242b)) * wrong totals in hsn summary report ([79d508f](79d508f)) ### Features * page break in SoA pdf ([e93ac3c](e93ac3c))
developmentforpeople
pushed a commit
to Ayuda-Efectiva/erpnext
that referenced
this pull request
Jan 26, 2023
…32566) (frappe#32636) * fix: pricing rule for non stock UOM and conversions * fix: pricing rule for non stock UOM and conversions (cherry picked from commit 96b4211) # Conflicts: # erpnext/accounts/doctype/pricing_rule/pricing_rule.py * chore: resolve conflicts Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
developmentforpeople
pushed a commit
to Ayuda-Efectiva/erpnext
that referenced
this pull request
Jan 26, 2023
Pricing rule's apply_on_field == "item_group" didn't check for UOM. I have added the required checks. Same as frappe#32566
developmentforpeople
pushed a commit
to Ayuda-Efectiva/erpnext
that referenced
this pull request
Jan 26, 2023
## [13.40.2](frappe/erpnext@v13.40.1...v13.40.2) (2022-10-19) ### Bug Fixes * `Brand Defaults` filters ([b1c70af](frappe@b1c70af)) * don't try to update youtube data if disabled in settings (backport [frappe#32588](frappe#32588)) ([frappe#32590](frappe#32590)) ([7e7122b](frappe@7e7122b)) * Ignore linked purchase invoice on cancel ([eec770a](frappe@eec770a)) * Party account for multi-order invoices ([0ae2a4f](frappe@0ae2a4f)) * pricing rule item code UOM apply & conversions (backport [frappe#32566](frappe#32566)) ([frappe#32636](frappe#32636)) ([b8d97b8](frappe@b8d97b8))
developmentforpeople
pushed a commit
to Ayuda-Efectiva/erpnext
that referenced
this pull request
Jan 26, 2023
# [13.42.0](frappe/erpnext@v13.41.1...v13.42.0) (2022-11-15) ### Bug Fixes * add Document Date in E-Invoice print format ([a16347f](frappe@a16347f)) * ambiguous 'cost_center' on payment reconciliation ([e9e5ded](frappe@e9e5ded)) * check type for reference name ([ad648f3](frappe@ad648f3)) * don't set WIP Warehouse if is checked in WO ([4a17711](frappe@4a17711)) * Label for applicable dimension table ([cbc8b2d](frappe@cbc8b2d)) * Pricing rule item group consider UOM ([1ed0b6e](frappe@1ed0b6e)), closes [frappe#32566](frappe#32566) * query condition change ([88ce59a](frappe@88ce59a)) * repayment schedule regeneration ([a19031c](frappe@a19031c)) * set `WIP Warehouse` in Job Card ([f09e427](frappe@f09e427)) * set stock UOM in args to ensure item price is fetched ([bd2242b](frappe@bd2242b)) * wrong totals in hsn summary report ([79d508f](frappe@79d508f)) ### Features * page break in SoA pdf ([e93ac3c](frappe@e93ac3c))
Closed
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.
There were multiple issues with pricing rule's apply_on_field == "item_code" ( UOM : blank, other_than_stock_uom etc ). I have added the required checks and proper conversions.
Before:
Before.Pricing.Rule.UOM.mov
After:
After.Pricing.Rule.UOM.mov