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

refactor: search queries (backport #33004) #33008

Merged
merged 2 commits into from
Nov 17, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2022

This is an automatic backport of pull request #33004 done by Mergify.
Cherry-pick of 34e4903 has failed:

On branch mergify/bp/version-13-hotfix/pr-33004
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 34e4903ed7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/buying/doctype/request_for_quotation/request_for_quotation.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/material_request/material_request.py
	both modified:   erpnext/stock/doctype/quality_inspection/quality_inspection.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.py
#	erpnext/stock/doctype/quality_inspection/quality_inspection.py
@codecov
Copy link

codecov bot commented Nov 17, 2022

Codecov Report

Merging #33008 (34e4903) into version-13-hotfix (d2b6490) will decrease coverage by 0.00%.
The diff coverage is 60.11%.

❗ Current head 34e4903 differs from pull request most recent head e07c07d. Consider uploading reports for the commit e07c07d to get more accurate results

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-13-hotfix   #33008      +/-   ##
=====================================================
- Coverage              63.84%   63.83%   -0.01%     
=====================================================
  Files                    817      820       +3     
  Lines                  58543    58766     +223     
=====================================================
+ Hits                   37374    37511     +137     
- Misses                 21169    21255      +86     
Impacted Files Coverage Δ
.../accounts/doctype/bank_guarantee/bank_guarantee.py 0.00% <0.00%> (ø)
...of_accounts_importer/chart_of_accounts_importer.py 0.00% <ø> (ø)
...xt/accounts/doctype/payment_entry/payment_entry.py 72.50% <ø> (-0.29%) ⬇️
...ement_of_accounts/process_statement_of_accounts.py 0.00% <ø> (ø)
...ype/repost_payment_ledger/repost_payment_ledger.py 0.00% <0.00%> (ø)
...ayment_ledger_items/repost_payment_ledger_items.py 0.00% <0.00%> (ø)
erpnext/assets/doctype/location/location.py 80.91% <ø> (ø)
erpnext/buying/doctype/supplier/supplier.py 77.27% <0.00%> (ø)
erpnext/controllers/trends.py 0.00% <0.00%> (ø)
...ent/doctype/quality_procedure/quality_procedure.py 81.25% <ø> (ø)
... and 40 more

[skip ci]
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-33004 branch from e07c07d to 9b348ba Compare November 17, 2022 08:54
@ankush ankush merged commit 357ae93 into version-13-hotfix Nov 17, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-33004 branch November 17, 2022 08:55
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.42.1 🎉

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
* refactor: search queries (frappe#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.py
#	erpnext/stock/doctype/quality_inspection/quality_inspection.py

* chore: conflicts

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants