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

Merged
merged 5 commits into from
Sep 12, 2023
Merged

fix: Parent Task link with Project Task (backport #37025) #37033

merged 5 commits into from
Sep 12, 2023

Commits on Sep 12, 2023

  1. feat: new field in Task to hold ref of Template Task 

    (cherry picked from commit b4bcd9b)

# Conflicts:
#	erpnext/projects/doctype/task/task.json
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    312c105 View commit details
    Browse the repository at this point in the history

  2. fix: set Template Task ref in Project Task 

    (cherry picked from commit d3295c4)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    857559b View commit details
    Browse the repository at this point in the history

  3. fix: reload task before save 

    (cherry picked from commit 5cae2e7)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    0277a69 View commit details
    Browse the repository at this point in the history

  4. test: add test case for Task having common subject 

    (cherry picked from commit 0d5c8f0)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    5ab04c5 View commit details
    Browse the repository at this point in the history

  5. chore: conflicts

    @s-aga-r
    s-aga-r authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    db58198 View commit details
    Browse the repository at this point in the history