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.

Sign up for GitHub

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

Jump to bottom

fix: remove leave policy assignment creation patch (backport #31097) #31204

Merged
merged 2 commits into from
Jun 1, 2022
Merged

fix: remove leave policy assignment creation patch (backport #31097) #31204

merged 2 commits into from
Jun 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 1, 2022

This is an automatic backport of pull request #31097 done by Mergify.
Cherry-pick of d4b9cc0 has failed:

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

You are currently cherry-picking commit d4b9cc0242.
  (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:
	deleted:    erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

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

@ruchamahabal @mergify
fix: remove leave policy assignment creation patch (#31097)
0083bc7 
(cherry picked from commit d4b9cc0)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Jun 1, 2022
ruchamahabal
ruchamahabal reviewed Jun 1, 2022
View reviewed changes
@ruchamahabal
Copy link
Member

Will fix unrelated test test_unmarked_days in a separate PR

@ruchamahabal ruchamahabal merged commit 4aeb448 into version-13-hotfix Jun 1, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31097 branch June 1, 2022 07:16
frappe-pr-bot pushed a commit that referenced this pull request Jun 7, 2022
@frappe-bot
chore(release): Bumped to Version 13.33.0
3b1f9fe 
# [13.33.0](v13.32.0...v13.33.0) (2022-06-07)

### Bug Fixes

* Close unsecured terms loans ([d6d1d79](d6d1d79))
* Consider only Approved leave applications in LWP, Employee Benefit calculations ([7f84c86](7f84c86))
* display currencies in validation message. ([ef22337](ef22337))
* incorrect billed_qty in sales order analysis report when multiple delivery notes for item (backport [#31194](#31194)) ([#31250](#31250)) ([3b1f6da](3b1f6da))
* incorrect LWP calculation for half days in employee benefit application ([10f0c93](10f0c93))
* **India:** GSTIN filter in GSTR-1 report ([abe9fe7](abe9fe7))
* **India:** Supplies from composite dealer not showing up ([15712c7](15712c7))
* **job card:** only hold during draft state (backport [#31243](#31243)) ([#31249](#31249)) ([a7fc278](a7fc278))
* **Leave Application:** 'Cancelled' status shown as 'Open' in list view ([8b48d45](8b48d45))
* leave balance for earned leaves in backdated Leave Application dashboard (backport [#31253](#31253)) ([#31256](#31256)) ([a22d92f](a22d92f))
* only fetch membership expiry if not already set in `member.js` ([#31259](#31259)) ([d433784](d433784))
* Parent dimension filters in orders ([b3cbcd8](b3cbcd8))
* Pluralize year text instead of optional bracket (backport [#31210](#31210)) ([#31212](#31212)) ([b31709c](b31709c))
* re-validate warehouse after 'update items' (backport [#31203](#31203)) ([#31206](#31206)) ([3a718c7](3a718c7))
* remove leave policy assignment creation patch (backport [#31097](#31097)) ([#31204](#31204)) ([4aeb448](4aeb448))
* Remove redundant query ([3c4cf59](3c4cf59))
* Reverse provisional entries on Purchase Invoice cancel ([1fba432](1fba432))
* **Sales Register:** incorrect query with dimensions (backport [#31242](#31242)) ([#31251](#31251)) ([0badfc8](0badfc8))
* Simply cancel reverse entries ([100b8d9](100b8d9))

### Features

* **india:** Improve E-way Bill Cancellation. ([#31088](#31088)) ([622d25e](622d25e))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.33.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 Oct 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ruchamahabal ruchamahabal ruchamahabal left review comments

Assignees

@ruchamahabal ruchamahabal

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ruchamahabal @frappe-pr-bot