-
Notifications
You must be signed in to change notification settings - Fork 7.3k
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
fix: Shop by category fixes #34688
Merged
deepeshgarg007
merged 2 commits into
frappe:develop
from
deepeshgarg007:shop_by_category
Apr 5, 2023
Merged
fix: Shop by category fixes #34688
deepeshgarg007
merged 2 commits into
frappe:develop
from
deepeshgarg007:shop_by_category
Apr 5, 2023
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #34688 +/- ##
===========================================
+ Coverage 63.80% 63.83% +0.03%
===========================================
Files 810 810
Lines 59533 59672 +139
===========================================
+ Hits 37983 38092 +109
- Misses 21550 21580 +30
|
deepeshgarg007
added
backport version-13-hotfix
backport version-14-hotfix
backport to version 14
labels
Apr 5, 2023
mergify bot
pushed a commit
that referenced
this pull request
Apr 5, 2023
* fix: Shop by category fixes * chore: Update tests (cherry picked from commit 56f5078)
mergify bot
pushed a commit
that referenced
this pull request
Apr 5, 2023
* fix: Shop by category fixes * chore: Update tests (cherry picked from commit 56f5078)
This was referenced Apr 5, 2023
deepeshgarg007
added a commit
that referenced
this pull request
Apr 5, 2023
deepeshgarg007
added a commit
that referenced
this pull request
Apr 5, 2023
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
# [14.21.0](v14.20.3...v14.21.0) (2023-04-11) ### Bug Fixes * `payment entry is already created` on posawesome. (backport [#34712](#34712)) ([#34752](#34752)) ([8ba1e0f](8ba1e0f)) * add german translation of "Partly Paid" ([#34776](#34776)) ([3023dbb](3023dbb)) * Allocate tax loss to tax account head on early payment discount ([#34287](#34287)) ([be2990e](be2990e)) * asset monthly WDV and DD schedule [v14] ([#34644](#34644)) ([88c8c36](88c8c36)) * Bank clearance for case loan (disburstment/repayment) ([#34586](#34586)) ([f1687cf](f1687cf)) * BOM Update Cost, when no actual qty ([8757435](8757435)) * bom update log not working for large batch size ([551190a](551190a)) * Column value mismatch in COA blank template ([#34658](#34658)) ([5e03a4e](5e03a4e)) * consider qty field precision ([2c54e76](2c54e76)) * customer selection not mandatory in purchase invoice to fetch item details ([#34810](#34810)) ([994272b](994272b)) * don't include cancelled JVs in assdeprledger report ([3896d41](3896d41)) * enclose ternary operator in parentheses ([b835760](b835760)) * incorrect arg name in asset value adjustment ([8d9305e](8d9305e)) * incorrect balance qty in the stock ledger report ([3494c9c](3494c9c)) * incorrect stock balance quantity for batch item ([d817c50](d817c50)) * Item tax validity comparison fixes ([#34784](#34784)) ([cc21241](cc21241)) * lost opportunity report issue ([#34626](#34626)) ([3e67994](3e67994)) * Multiple issues in purchase invoice submission ([#34600](#34600)) ([5677f25](5677f25)) * plaid log_error syntax issue (backport [#34642](#34642)) ([#34667](#34667)) ([61858a6](61858a6)) * posting time issue ([bb5eeb6](bb5eeb6)) * provide filter by depreciable assets in fixed asset register ([#34803](#34803)) ([fee4cd5](fee4cd5)) * reposting record not created for backdated stock reco ([9b90323](9b90323)) * serial no with zero quantity issue in stock reco ([f47be46](f47be46)) * Shop by category fixes (backport [#34688](#34688)) ([#34750](#34750)) ([3ad5d67](3ad5d67)) * Subcontracting Receipt incorrect `status` ([99226d3](99226d3)) * Supplier RFQ email link ([#34338](#34338)) ([a00459a](a00459a)) * Total debit and credit while importing via Data Import ([#34659](#34659)) ([5e28d02](5e28d02)) * **ui:** recalculate difference amount on allocation change ([#34694](#34694)) ([6b866e2](6b866e2)) * Unable to create payment request against purchase invoice ([#34762](#34762)) ([a1f7e35](a1f7e35)) * use stock qty to calculate POS reserved stock ([c0f7f7d](c0f7f7d)) * UX for stock entry, bom and work order ([d4a6035](d4a6035)) ### Features * add `Received Qty` field in `Delivery Note Item` ([1c5e36c](1c5e36c)) * Auto allocate advance payments only against orders ([#34727](#34727)) ([05d24e3](05d24e3)) ### Reverts * remove frappe.send_message (v14) ([#34816](#34816)) ([8a331e0](8a331e0))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
## [13.49.12](v13.49.11...v13.49.12) (2023-04-11) ### Bug Fixes * `payment entry is already created` on posawesome. (backport [#34712](#34712)) ([#34753](#34753)) ([b48fca3](b48fca3)) * Allocate tax loss to tax account head on early payment discount ([#34287](#34287)) ([92a26dd](92a26dd)) * asset monthly WDV and DD schedule [v13] ([#34645](#34645)) ([fed43ae](fed43ae)) * BOM Update Cost, when no actual qty ([9725698](9725698)) * bom update log not working for large batch size ([9cf30d7](9cf30d7)) * don't include cancelled JVs in assdeprledger report ([#34737](#34737)) ([3007ac3](3007ac3)) * enclose ternary operator in parentheses ([198830a](198830a)) * filter out old allocation's cf leaves while fetching leave details ([#34723](#34723)) ([50de045](50de045)) * format currency/float as per number format in work history ([#34545](#34545)) ([892c480](892c480)) * incorrect arg name in asset value adjustment ([545807a](545807a)) * incorrect balance qty in the stock ledger report ([dab1f1a](dab1f1a)) * Item tax validity comparison fixes ([#34784](#34784)) ([71bafab](71bafab)) * lost opportunity report issue ([#34626](#34626)) ([ab06cb4](ab06cb4)) * posting time issue ([f22e777](f22e777)) * provide filter by depreciable assets in fixed asset register ([#34803](#34803)) ([8609bf4](8609bf4)) * serial no with zero quantity issue in stock reco ([46638b1](46638b1)) * Shop by category fixes (backport [#34688](#34688)) ([#34751](#34751)) ([af828e4](af828e4)) ### Reverts * Revert "fix: `payment entry is already created` on posawesome. (#34712)" ([034e35e](034e35e)), closes [#34712](#34712) [#34712](#34712) [#34753](#34753) * remove frappe.send_message (v13) ([#34820](#34820)) ([77f1322](77f1322)), closes [#34816](#34816)
elkadymohammed01
pushed a commit
to elkadymohammed01/ERPNEXT
that referenced
this pull request
Apr 14, 2023
# [14.21.0](frappe/erpnext@v14.20.3...v14.21.0) (2023-04-11) ### Bug Fixes * `payment entry is already created` on posawesome. (backport [#34712](frappe/erpnext#34712)) ([#34752](frappe/erpnext#34752)) ([8ba1e0f](frappe/erpnext@8ba1e0f)) * add german translation of "Partly Paid" ([#34776](frappe/erpnext#34776)) ([3023dbb](frappe/erpnext@3023dbb)) * Allocate tax loss to tax account head on early payment discount ([#34287](frappe/erpnext#34287)) ([be2990e](frappe/erpnext@be2990e)) * asset monthly WDV and DD schedule [v14] ([#34644](frappe/erpnext#34644)) ([88c8c36](frappe/erpnext@88c8c36)) * Bank clearance for case loan (disburstment/repayment) ([#34586](frappe/erpnext#34586)) ([f1687cf](frappe/erpnext@f1687cf)) * BOM Update Cost, when no actual qty ([8757435](frappe/erpnext@8757435)) * bom update log not working for large batch size ([551190a](frappe/erpnext@551190a)) * Column value mismatch in COA blank template ([#34658](frappe/erpnext#34658)) ([5e03a4e](frappe/erpnext@5e03a4e)) * consider qty field precision ([2c54e76](frappe/erpnext@2c54e76)) * customer selection not mandatory in purchase invoice to fetch item details ([#34810](frappe/erpnext#34810)) ([994272b](frappe/erpnext@994272b)) * don't include cancelled JVs in assdeprledger report ([3896d41](frappe/erpnext@3896d41)) * enclose ternary operator in parentheses ([b835760](frappe/erpnext@b835760)) * incorrect arg name in asset value adjustment ([8d9305e](frappe/erpnext@8d9305e)) * incorrect balance qty in the stock ledger report ([3494c9c](frappe/erpnext@3494c9c)) * incorrect stock balance quantity for batch item ([d817c50](frappe/erpnext@d817c50)) * Item tax validity comparison fixes ([#34784](frappe/erpnext#34784)) ([cc21241](frappe/erpnext@cc21241)) * lost opportunity report issue ([#34626](frappe/erpnext#34626)) ([3e67994](frappe/erpnext@3e67994)) * Multiple issues in purchase invoice submission ([#34600](frappe/erpnext#34600)) ([5677f25](frappe/erpnext@5677f25)) * plaid log_error syntax issue (backport [#34642](frappe/erpnext#34642)) ([#34667](frappe/erpnext#34667)) ([61858a6](frappe/erpnext@61858a6)) * posting time issue ([bb5eeb6](frappe/erpnext@bb5eeb6)) * provide filter by depreciable assets in fixed asset register ([#34803](frappe/erpnext#34803)) ([fee4cd5](frappe/erpnext@fee4cd5)) * reposting record not created for backdated stock reco ([9b90323](frappe/erpnext@9b90323)) * serial no with zero quantity issue in stock reco ([f47be46](frappe/erpnext@f47be46)) * Shop by category fixes (backport [#34688](frappe/erpnext#34688)) ([#34750](frappe/erpnext#34750)) ([3ad5d67](frappe/erpnext@3ad5d67)) * Subcontracting Receipt incorrect `status` ([99226d3](frappe/erpnext@99226d3)) * Supplier RFQ email link ([#34338](frappe/erpnext#34338)) ([a00459a](frappe/erpnext@a00459a)) * Total debit and credit while importing via Data Import ([#34659](frappe/erpnext#34659)) ([5e28d02](frappe/erpnext@5e28d02)) * **ui:** recalculate difference amount on allocation change ([#34694](frappe/erpnext#34694)) ([6b866e2](frappe/erpnext@6b866e2)) * Unable to create payment request against purchase invoice ([#34762](frappe/erpnext#34762)) ([a1f7e35](frappe/erpnext@a1f7e35)) * use stock qty to calculate POS reserved stock ([c0f7f7d](frappe/erpnext@c0f7f7d)) * UX for stock entry, bom and work order ([d4a6035](frappe/erpnext@d4a6035)) ### Features * add `Received Qty` field in `Delivery Note Item` ([1c5e36c](frappe/erpnext@1c5e36c)) * Auto allocate advance payments only against orders ([#34727](frappe/erpnext#34727)) ([05d24e3](frappe/erpnext@05d24e3)) ### Reverts * remove frappe.send_message (v14) ([#34816](frappe/erpnext#34816)) ([8a331e0](frappe/erpnext@8a331e0))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport version-13-hotfix
backport version-14-hotfix
backport to version 14
needs-tests
This PR needs automated unit-tests.
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.
Shop by category also allowed table multiselect fields but wasn't handled to display in webpages. Made fixes to handle those