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(india): transporter name is null while generating e-way bill (backport #30736) #30747

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 19, 2022

This is an automatic backport of pull request #30736 done by Mergify.
Cherry-pick of 6291b28 has failed:

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

You are currently cherry-picking commit 6291b28c37.
  (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/regional/india/e_invoice/utils.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/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

)

(cherry picked from commit 6291b28)

# Conflicts:
#	erpnext/regional/india/e_invoice/utils.py
@mergify mergify bot added the conflicts label Apr 19, 2022
@nextchamp-saqib nextchamp-saqib merged commit 68fd8a1 into version-12-hotfix Apr 20, 2022
@mergify mergify bot deleted the mergify/bp/version-12-hotfix/pr-30736 branch April 20, 2022 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants