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): minor e-invoicing fixes (backport #30553) #31067

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2022

This is an automatic backport of pull request #30553 done by Mergify.
Cherry-pick of 0c26f9a has failed:

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

You are currently cherry-picking commit 0c26f9a8c8.
  (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")

Cherry-pick of b91bf40 has failed:

On branch mergify/bp/version-12-hotfix/pr-30553
Your branch is ahead of 'origin/version-12-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b91bf40f1b.
  (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/print_format/gst_e_invoice/gst_e_invoice.html

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

* If mode of payment > 18 characters, the e-invoice portal throws error

(cherry picked from commit 0c26f9a)

# Conflicts:
#	erpnext/regional/india/e_invoice/utils.py
(cherry picked from commit b91bf40)

# Conflicts:
#	erpnext/accounts/print_format/gst_e_invoice/gst_e_invoice.html
@nextchamp-saqib nextchamp-saqib merged commit 432210d into version-12-hotfix May 19, 2022
@mergify mergify bot deleted the mergify/bp/version-12-hotfix/pr-30553 branch May 19, 2022 08:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant