Skip to content
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
merged 343 commits into from
Feb 14, 2022
Merged

Conversation

surajshetty3416 and others added 30 commits January 3, 2022 07:02
(cherry picked from commit b2d16e7)
(cherry picked from commit a58fe1a)
…fix/pr-15508

fix: renaming a document updates the modified timestamp (backport frappe#15508)
…fix/pr-15504

fix: Do not allow rebuilding of tree for doctypes without `lft` & `rgt` (backport frappe#15504)
- 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
…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>
…fix/pr-14323

chore: Bump psycopg2-binary Python client (backport frappe#14323)
… 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
gavindsouza and others added 29 commits February 8, 2022 12:29
(cherry picked from commit 42365c3)
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)
Had to undo since Query engine is develop only as of rn

Added via frappe@243b022

(cherry picked from commit e155b2e)
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)
…-release/pr-15936

fix(render): Check if valid file instead of path [v13] (backport frappe#15936)
@vjFaLk vjFaLk merged commit 6f5082e into ParsimonyGit:parsimony-production-v13 Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet