Skip to content

fix: minor linting issues (backport #27314)#46180

Closed
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27314
Closed

fix: minor linting issues (backport #27314)#46180
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27314

Conversation

@mergify
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
@mergify
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

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants