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: minor linting issues (backport #27314) #46180

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 28, 2025

* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions

(cherry picked from commit eec4051)

# Conflicts:
#	erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/payroll/doctype/gratuity_rule/gratuity_rule.py
Copy link
Contributor Author

mergify bot commented Feb 28, 2025

Cherry-pick of eec4051 has failed:

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

You are currently cherry-picking commit eec40513be.
  (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/accounts/doctype/accounting_dimension/accounting_dimension.py
	both modified:   erpnext/accounts/doctype/payment_entry/payment_entry.py
	both modified:   erpnext/payroll/doctype/gratuity_rule/gratuity_rule.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

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.

2 participants