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: Parent Task link with Project Task (backport #37025) #37033

Merged
merged 5 commits into from
Sep 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2023

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

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

You are currently cherry-picking commit b4bcd9ba3f.
  (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/projects/doctype/task/task.json

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/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

(cherry picked from commit b4bcd9b)

# Conflicts:
#	erpnext/projects/doctype/task/task.json
(cherry picked from commit 5cae2e7)
@mergify mergify bot added the conflicts label Sep 12, 2023
@s-aga-r s-aga-r removed the conflicts label Sep 12, 2023
@s-aga-r s-aga-r merged commit 6602787 into version-14-hotfix Sep 12, 2023
8 of 9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37025 branch September 12, 2023 03:35
frappe-pr-bot pushed a commit that referenced this pull request Sep 12, 2023
# [14.39.0](v14.38.0...v14.39.0) (2023-09-12)

### Bug Fixes

* `company` is ambiguous ([fe69d53](fe69d53))
* `Parent Task` link with `Project Task` (backport [#37025](#37025)) ([#37033](#37033)) ([6602787](6602787))
* correct asset daily depr schedule calculation [v14] ([#36991](#36991)) ([2ae4463](2ae4463))
* generate pdf only when result exists ([53270dd](53270dd))
* remove report field db set ([284181d](284181d))
* show letterhead and terms for AR pdf ([2077b2c](2077b2c))
* Update party type for payroll payable account ([f251d6c](f251d6c))
* use primary key for link lookup (backport [#36919](#36919)) ([#36978](#36978)) ([4fede56](4fede56))
* **ux:** docstatus filter for `Reference Name` in QI (backport [#37024](#37024)) ([#37028](#37028)) ([21be889](21be889))

### Features

* add field for specifying pdf name ([657ca7f](657ca7f))
* Add half-yearly asset maintenance periodicity. (backport [#37006](#37006)) ([#37014](#37014)) ([acd9c69](acd9c69))
* provision to set required by from Production Plan ([#37039](#37039)) ([d278b11](d278b11))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.39.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 Jan 31, 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