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(minor): corrected wrong filter condition (backport #41755) #41762

Merged
merged 3 commits into from
Jun 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Removed wrongly added 'not' in the filter condition to ensure proper filtering based on the presence of the date field.

no-docs


This is an automatic backport of pull request #41755 done by Mergify.

(cherry picked from commit 60eb03a)

# Conflicts:
#	erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner June 4, 2024 06:15
@mergify mergify bot added the conflicts label Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 60eb03a has failed:

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

You are currently cherry-picking commit 60eb03a6c6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 4, 2024
@nabinhait nabinhait merged commit a67fa68 into version-15-hotfix Jun 4, 2024
11 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-15-hotfix/pr-41755 branch June 4, 2024 16:23
frappe-pr-bot pushed a commit that referenced this pull request Jun 5, 2024
# [15.27.0](v15.26.1...v15.27.0) (2024-06-05)

### Bug Fixes

* Auditor permissions (backport [#41659](#41659)) ([#41661](#41661)) ([27f3981](27f3981))
* bank account no fieldname mismatch (backport [#41778](#41778)) ([#41783](#41783)) ([b94a6f2](b94a6f2))
* batch selection issue (backport [#41692](#41692)) ([#41693](#41693)) ([24775db](24775db))
* **Company:** Allow Equity type account in unrealised exchange gain/loss account (backport [#41740](#41740)) ([#41747](#41747)) ([460ee5d](460ee5d))
* condition filter for transaction pricing rule ([e493b11](e493b11))
* convert percentage from str to float (backport [#41766](#41766)) ([#41776](#41776)) ([cd0852f](cd0852f))
* Copy depreciation schedule on asset split only if it exists (backport [#41775](#41775)) ([#41784](#41784)) ([03bf480](03bf480))
* filtered out data having none values in date field (backport [#41457](#41457)) ([#41765](#41765)) ([97b1b7f](97b1b7f))
* Filters in account balance report ([0b9d89b](0b9d89b))
* French chart of account the 4191 code must be of type Income Account ([797b718](797b718))
* get assets received but not billed account only if any asset item is received (backport [#41734](#41734)) ([#41735](#41735)) ([638c944](638c944))
* Ignore disabling default currency field while creating new company (backport [#41699](#41699)) ([#41761](#41761)) ([dc922ab](dc922ab))
* incorrect accumulated depr amount in asset depr ledger (backport [#41654](#41654)) ([#41763](#41763)) ([a93cd02](a93cd02))
* incorrect batch selection while sales return (backport [#41768](#41768)) ([#41772](#41772)) ([95c0dc9](95c0dc9))
* key error for stock ledger report (backport [#41700](#41700)) ([#41703](#41703)) ([b22d714](b22d714))
* link opportunity in prospect after creating opportunity from prospect (backport [#41769](#41769)) ([#41777](#41777)) ([d30aee5](d30aee5))
* local var referenced before assignment (backport [#41780](#41780)) ([#41782](#41782)) ([3777cae](3777cae))
* **minor:** corrected wrong filter condition (backport [#41755](#41755)) ([#41762](#41762)) ([a67fa68](a67fa68))
* payment term when creating PO from SO (backport [#41376](#41376)) ([#41744](#41744)) ([806ff5b](806ff5b))
* Select both account number and company in the account form (backport [#41731](#41731)) ([#41737](#41737)) ([c5d72cd](c5d72cd))
* show material to supplier button (backport [#41686](#41686)) ([#41688](#41688)) ([1a24914](1a24914))
* **stock settings:** Allowed any number in stock frozen upto days field (backport [#41736](#41736)) ([#41749](#41749)) ([278682f](278682f))
* test for pricing rule transaction with cond ([0823de8](0823de8))
* Transaction currency value in Journal Entry (backport [#41717](#41717)) ([#41720](#41720)) ([77f58ca](77f58ca))
* TypeError: 'float' object is not iterable (backport [#41758](#41758)) ([#41764](#41764)) ([12addb7](12addb7))
* Use full name instead of abbreviation ([#41759](#41759)) ([5448d5d](5448d5d))
* work order created message pops up if no items are selected (backport [#41677](#41677)) ([#41682](#41682)) ([4e9faf6](4e9faf6))

### Features

* optional to reconcile all serial nos / batches in stock reconciliation (backport [#41696](#41696)) ([#41713](#41713)) ([38249f4](38249f4))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.27.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants