Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* fix: hide `+` button based on `Blanket Order Type` (cherry picked from commit abf9a28) * feat: add field `Over Order Allowance (%)` in `Buying Settings` (cherry picked from commit f5937f4) # Conflicts: # erpnext/buying/doctype/buying_settings/buying_settings.json * refactor: rewrite `blanket_order.py` queries in `QB` (cherry picked from commit f399378) * fix: don't map item row having `0` qty (cherry picked from commit fc1088d) * feat: consider `over_order_allowance` while validating order qty (cherry picked from commit 8bcbc45) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.py * feat: add field `Over Order Allowance (%)` in `Selling Settings` (cherry picked from commit d7da892) # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json * feat: consider `over_order_allowance` while validating sales order qty (cherry picked from commit 53701c3) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.py * test: add test cases for `Over Order Allowance` against `Blanket Order` (cherry picked from commit 66f6500) * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
- Loading branch information
1 parent
00518eb
commit 8ddbac5
Showing
7 changed files
with
228 additions
and
132 deletions.
There are no files selected for viewing
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
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
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
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
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
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
Oops, something went wrong.