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: GST Transporter ID Refactor (backport #2198) #2258

Merged
merged 8 commits into from
Jun 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2024


This is an automatic backport of pull request #2198 done by [Mergify](https://mergify.com).

vishakhdesai and others added 7 commits June 18, 2024 07:17
(cherry picked from commit a87d2cb)

# Conflicts:
#	india_compliance/gst_india/doctype/gstin/gstin.json
#	india_compliance/gst_india/doctype/gstin/gstin.py
(cherry picked from commit 0fc37d4)
(cherry picked from commit f7feff8)
…date_gst_transporter_id

(cherry picked from commit 3f2a83b)
(cherry picked from commit dc8db18)
(cherry picked from commit 6f3f5e8)

# Conflicts:
#	india_compliance/gst_india/doctype/gstin/gstin.py
(cherry picked from commit 574b016)

# Conflicts:
#	india_compliance/gst_india/doctype/gstin/gstin.json
#	india_compliance/gst_india/overrides/transaction.py
#	india_compliance/gst_india/utils/gstin_info.py
Copy link
Contributor Author

mergify bot commented Jun 18, 2024

Cherry-pick of a87d2cb has failed:

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

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

Changes to be committed:
	modified:   india_compliance/gst_india/client_scripts/e_waybill_actions.js
	modified:   india_compliance/gst_india/client_scripts/supplier.js
	modified:   india_compliance/gst_india/doctype/gstin/gstin.js
	modified:   india_compliance/gst_india/doctype/gstin/test_gstin.py
	modified:   india_compliance/gst_india/overrides/transaction.py
	modified:   india_compliance/gst_india/utils/__init__.py
	modified:   india_compliance/gst_india/utils/gstin_info.py
	modified:   india_compliance/public/js/transaction.js
	modified:   india_compliance/public/js/utils.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/gst_india/doctype/gstin/gstin.json
	both modified:   india_compliance/gst_india/doctype/gstin/gstin.py

Cherry-pick of 6f3f5e8 has failed:

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

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

Changes to be committed:
	modified:   india_compliance/gst_india/client_scripts/e_waybill_actions.js
	modified:   india_compliance/gst_india/client_scripts/supplier.js
	modified:   india_compliance/gst_india/overrides/transaction.py
	modified:   india_compliance/gst_india/utils/__init__.py
	modified:   india_compliance/public/js/transaction.js
	modified:   india_compliance/public/js/utils.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/gst_india/doctype/gstin/gstin.py

Cherry-pick of 574b016 has failed:

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

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

Changes to be committed:
	modified:   india_compliance/gst_india/doctype/gst_settings/gst_settings.py
	modified:   india_compliance/gst_india/doctype/gstin/gstin.py
	modified:   india_compliance/gst_india/utils/__init__.py
	modified:   india_compliance/public/js/utils.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/gst_india/doctype/gstin/gstin.json
	both modified:   india_compliance/gst_india/overrides/transaction.py
	both modified:   india_compliance/gst_india/utils/gstin_info.py

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

@vorasmit vorasmit added squash and removed conflicts labels Jun 18, 2024
@mergify mergify bot merged commit 452b6a9 into version-15-hotfix Jun 18, 2024
12 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-2198 branch June 18, 2024 07:53
@india-compliance-bot
Copy link
Collaborator

🎉 This PR is included in version 15.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants