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(gstr-1): handle gov api error when downloading and make it optional for unfiled returns (backport #2897) #2933

Closed

Conversation

…al for unfiled returns (#2897)

Co-authored-by: Sanket322 <shahsanket322003.com>
Co-authored-by: Smit Vora <[email protected]>
(cherry picked from commit 49a431e)

# Conflicts:
#	india_compliance/gst_india/doctype/gst_settings/gst_settings.json
#	india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
#	india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py
@mergify mergify bot added the conflicts label Jan 8, 2025
Copy link
Contributor Author

mergify bot commented Jan 8, 2025

Cherry-pick of 49a431e has failed:

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

You are currently cherry-picking commit 49a431e9.
  (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_return_log/generate_gstr_1.py
	modified:   india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
	modified:   india_compliance/gst_india/setup/__init__.py
	modified:   india_compliance/patches.txt
	new file:   india_compliance/patches/v14/rename_gstr1_settings.py
	modified:   india_compliance/patches/v14/update_default_gstr1_settings.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/gst_india/doctype/gst_settings/gst_settings.json
	both modified:   india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
	both modified:   india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.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 closed this Jan 8, 2025
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.

2 participants