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

fix: specify allowed doctype in queries (backport #31761) #31765

Merged
merged 3 commits into from
Aug 3, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2022

This is a semi-automatic backport of pull request #31761 done by Mergify.

(cherry picked from commit 9baa222)

# Conflicts:
#	erpnext/controllers/queries.py
@sagarvora sagarvora added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Aug 3, 2022
@sagarvora sagarvora removed their assignment Aug 3, 2022
@sagarvora sagarvora merged commit 0dbfb15 into version-13-hotfix Aug 3, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31761 branch August 3, 2022 06:34
frappe-pr-bot pushed a commit that referenced this pull request Aug 9, 2022
## [13.36.3](v13.36.2...v13.36.3) (2022-08-09)

### Bug Fixes

* (india) HSN wise report ([08c69c7](08c69c7))
* add asset repair to accounting dimension list ([809d5ca](809d5ca))
* consider precision while validating advance amount against sanctioned amount ([63cd434](63cd434))
* **ecommerce:** remove query to non-existing field (backport [#31771](#31771)) ([#31774](#31774)) ([0e46b33](0e46b33))
* f-string and where clause ([42b3959](42b3959))
* getting error to show sales invoice group or print rep… (backport [#31756](#31756)) ([#31768](#31768)) ([473a43b](473a43b))
* incorrect incoming rate set for inter transfer purchase receipt ([4e8b39a](4e8b39a))
* incorrect tax calculation in case of reduced payment days ([80981d0](80981d0))
* intercompany SO throws exception ([a17acfd](a17acfd))
* minor changed link ([e9e53a7](e9e53a7))
* Payment Entry button is visible even when claim is fully paid ([d820757](d820757))
* pending principal- amount ([16c94d2](16c94d2))
* **pos:** validate product bundles while submitting pos invoice (backport [#31615](#31615)) ([#31657](#31657)) ([b145fe3](b145fe3))
* specify allowed doctype in queries ([#31765](#31765)) ([0dbfb15](0dbfb15))
* statistical component showing up in salary slip ([#31746](#31746)) ([26aef4f](26aef4f))
* sum stock_value and group by warehouse ([18d93f8](18d93f8))
* taxable_value and gst_account_heads ([6c574fb](6c574fb))
* update To Date in Employee Work History ([#31811](#31811)) ([0057c10](0057c10))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.36.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
Co-authored-by: Sagar Vora <sagar@resilient.tech>
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
## [13.36.3](frappe/erpnext@v13.36.2...v13.36.3) (2022-08-09)

### Bug Fixes

* (india) HSN wise report ([08c69c7](frappe@08c69c7))
* add asset repair to accounting dimension list ([809d5ca](frappe@809d5ca))
* consider precision while validating advance amount against sanctioned amount ([63cd434](frappe@63cd434))
* **ecommerce:** remove query to non-existing field (backport [frappe#31771](frappe#31771)) ([frappe#31774](frappe#31774)) ([0e46b33](frappe@0e46b33))
* f-string and where clause ([42b3959](frappe@42b3959))
* getting error to show sales invoice group or print rep… (backport [frappe#31756](frappe#31756)) ([frappe#31768](frappe#31768)) ([473a43b](frappe@473a43b))
* incorrect incoming rate set for inter transfer purchase receipt ([4e8b39a](frappe@4e8b39a))
* incorrect tax calculation in case of reduced payment days ([80981d0](frappe@80981d0))
* intercompany SO throws exception ([a17acfd](frappe@a17acfd))
* minor changed link ([e9e53a7](frappe@e9e53a7))
* Payment Entry button is visible even when claim is fully paid ([d820757](frappe@d820757))
* pending principal- amount ([16c94d2](frappe@16c94d2))
* **pos:** validate product bundles while submitting pos invoice (backport [frappe#31615](frappe#31615)) ([frappe#31657](frappe#31657)) ([b145fe3](frappe@b145fe3))
* specify allowed doctype in queries ([frappe#31765](frappe#31765)) ([0dbfb15](frappe@0dbfb15))
* statistical component showing up in salary slip ([frappe#31746](frappe#31746)) ([26aef4f](frappe@26aef4f))
* sum stock_value and group by warehouse ([18d93f8](frappe@18d93f8))
* taxable_value and gst_account_heads ([6c574fb](frappe@6c574fb))
* update To Date in Employee Work History ([frappe#31811](frappe#31811)) ([0057c10](frappe@0057c10))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants