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(projects settings): add checkbox to auto fetch timesheet in sales invoice (backport #45908) #46142

Merged
merged 5 commits into from
Feb 26, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2025

Issue:
Unable to link project without fetching the timesheet in the sales invoice.
ref: 31312

Before:

si-timesheet-issue.mp4

After:

si-timesheet-fix.mp4

Backport needed for v15


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

…invoice

(cherry picked from commit 876082e)

# Conflicts:
#	erpnext/projects/doctype/projects_settings/projects_settings.json
…fore fetching the timesheet

(cherry picked from commit 914ad35)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
(cherry picked from commit 43b13b9)
(cherry picked from commit 5880f1d)

# Conflicts:
#	erpnext/projects/doctype/timesheet/test_timesheet.py
Copy link
Contributor Author

mergify bot commented Feb 25, 2025

Cherry-pick of 876082e has failed:

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

You are currently cherry-picking commit 876082ea2f.
  (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/projects/doctype/projects_settings/projects_settings.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/projects/doctype/projects_settings/projects_settings.json

Cherry-pick of 914ad35 has failed:

On branch mergify/bp/version-15-hotfix/pr-45908
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 914ad357fd.
  (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/accounts/doctype/sales_invoice/sales_invoice.js

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

Cherry-pick of 5880f1d has failed:

On branch mergify/bp/version-15-hotfix/pr-45908
Your branch is ahead of 'origin/version-15-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5880f1d5c6.
  (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/timesheet/test_timesheet.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

@ruthra-kumar ruthra-kumar self-assigned this Feb 26, 2025
@ruthra-kumar ruthra-kumar removed the request for review from deepeshgarg007 February 26, 2025 00:53
@ruthra-kumar ruthra-kumar merged commit 8bb085a into version-15-hotfix Feb 26, 2025
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-45908 branch February 26, 2025 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants