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

refactor: validate attendance in payroll (backport #705) #721

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 22, 2023

This is an automatic backport of pull request #705 done by Mergify.
Cherry-pick of 6df3cfa has failed:

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

You are currently cherry-picking commit 6df3cfab.
  (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:   hrms/payroll/doctype/payroll_entry/payroll_entry.py

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

Cherry-pick of ebbd329 has failed:

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

You are currently cherry-picking commit ebbd329e.
  (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:   hrms/payroll/doctype/payroll_entry/payroll_entry.js
	both modified:   hrms/payroll/doctype/payroll_entry/payroll_entry.py

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

Cherry-pick of a83e2e6 has failed:

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

You are currently cherry-picking commit a83e2e6c.
  (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:   hrms/payroll/doctype/payroll_entry/payroll_entry.py

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

Cherry-pick of 641d22d has failed:

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

You are currently cherry-picking commit 641d22d7.
  (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:   hrms/payroll/doctype/payroll_entry/payroll_entry.js
	modified:   hrms/public/js/hrms.bundle.js
	deleted:    hrms/public/js/templates/employees_to_mark_attendance.html
	new file:   hrms/public/js/templates/employees_with_unmarked_attendance.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_entry/payroll_entry.py

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

…ce records

(cherry picked from commit 6df3cfa)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
- decoupled functions, better naming, remove unnecessary code

(cherry picked from commit ebbd329)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.js
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
(cherry picked from commit a83e2e6)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
(cherry picked from commit 641d22d)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
@mergify mergify bot requested a review from ruchamahabal as a code owner July 22, 2023 07:41
@mergify mergify bot added the conflicts label Jul 22, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-705 branch July 22, 2023 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant