Skip to content

fix: patch failure for vat audit report (backport #27355)#46165

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

fix: patch failure for vat audit report (backport #27355)#46165
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27355

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2025

Newly added report not reloaded before patch.


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

(cherry picked from commit 14b0161)

# Conflicts:
#	erpnext/patches/v13_0/add_custom_field_for_south_africa.py
@mergify
Copy link
Contributor Author

mergify bot commented Feb 27, 2025

Cherry-pick of 14b0161 has failed:

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

You are currently cherry-picking commit 14b01619de.
  (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/patches/v13_0/add_custom_field_for_south_africa.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

@ankush ankush closed this Feb 27, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 14, 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.

1 participant