forked from frappe/frappe
-
Notifications
You must be signed in to change notification settings - Fork 1
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
Merge from upstream v13 #47
Merged
vjFaLk
merged 343 commits into
ParsimonyGit:parsimony-production-v13
from
Alchez:merge-v13
Feb 14, 2022
Merged
Merge from upstream v13 #47
vjFaLk
merged 343 commits into
ParsimonyGit:parsimony-production-v13
from
Alchez:merge-v13
Feb 14, 2022
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
…-release/pr-15499
(cherry picked from commit b0b19d7)
…fix/pr-15508 fix: renaming a document updates the modified timestamp (backport frappe#15508)
(cherry picked from commit 9258941)
…et doctype (cherry picked from commit d1ca3fa)
…fix/pr-15504 fix: Do not allow rebuilding of tree for doctypes without `lft` & `rgt` (backport frappe#15504)
…trigger (cherry picked from commit 3e009e9)
- To fix order of fields in quick entry form (cherry picked from commit 0868ad0) # Conflicts: # frappe/core/doctype/user/user.json
…e_options fix: Route options not getting set while navigating from one report to another
…5524) Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 289d7e7)
…fix/pr-15492 fix: clear cache for all docs matched with the filters passed as `dn` param in `set_value` (backport frappe#15492)
…by client & server (backport frappe#15517) (frappe#15535) Co-authored-by: Christoph Kappel <christoph.kappel@bytesource.net>
…frappe#15533) (frappe#15536) Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
…5528) Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 39d6364)
…fix/pr-14323 chore: Bump psycopg2-binary Python client (backport frappe#14323)
…5484) (frappe#15545) Co-authored-by: Saif Ur Rehman <saifi0102@gmail.com>
… to GET request on calling server (cherry picked from commit d73428d)
(cherry picked from commit 9844203) # Conflicts: # frappe/frappeclient.py
…fix/pr-15542 fix: FrappeClient post_api request being redirected to GET request (backport frappe#15542)
- Like we do in client-side (cherry picked from commit b5e2f78)
(cherry picked from commit 85360ef) # Conflicts: # frappe/tests/test_utils.py
(cherry picked from commit 42e1c15) # Conflicts: # frappe/core/doctype/system_settings/system_settings.json # frappe/public/js/frappe/desk.js
(cherry picked from commit 9c75336)
json_handler (cherry picked from commit 9205a4e)
(cherry picked from commit 42365c3)
(cherry picked from commit ca0341e)
(cherry picked from commit 2114fc4)
(cherry picked from commit 33b1bb1)
(cherry picked from commit 0ad369a)
(cherry picked from commit 0c5247f)
case inside update queries needs a recursive call param wrapper got lost (cherry picked from commit a87139f)
The module looked suspiciouslly different from its state on develop...more duplication - possibly due to an earlier botched cherry pick Also, ported frappe#14457 from develop (cherry picked from commit 243b022)
(cherry picked from commit 4842ae4)
(cherry picked from commit ad8b3ad)
Had to undo since Query engine is develop only as of rn Added via frappe@243b022 (cherry picked from commit e155b2e)
ref: https://docs.python.org/3/library/stdtypes.html#str.casefold (cherry picked from commit 269ea78)
(cherry picked from commit 7b44440)
Co-Authored-By: Gavin D'souza <gavin18d@gmail.com> (cherry picked from commit c009096)
(cherry picked from commit 2bbd83d)
Partial port of frappe#14102 Co-authored-by: Aradhya <aradhyatripathi51@gmail.com> Co-authored-by: Ankush <ankush@frappe.io> (cherry picked from commit 84cb036)
…-release/pr-15883 refactor: Query Building & Data Handling [v13] (backport frappe#15883)
…13-20 chore: change log for v13.20.0
(cherry picked from commit 10be9ac)
…-release/pr-15936 fix(render): Check if valid file instead of path [v13] (backport frappe#15936)
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.
Changelogs: