Skip to content

fix: south africa vat patch failure (backport #27323)#46179

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

fix: south africa vat patch failure (backport #27323)#46179
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27323

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 28, 2025

reload doc is necessary on new doctypes


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

reload doc is necessary on new doctypes

(cherry picked from commit d1fe060)

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

mergify bot commented Feb 28, 2025

Cherry-pick of d1fe060 has failed:

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

You are currently cherry-picking commit d1fe060e4a.
  (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

@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