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

feat: accounting automations for ineligible ITC (backport #1168) #1191

Merged
merged 2 commits into from
Oct 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2023

This is an automatic backport of pull request #1168 done by Mergify.
Cherry-pick of 212f179 has failed:

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

You are currently cherry-picking commit 212f1799.
  (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/constants/custom_fields.py
	modified:   india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.js
	modified:   india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py
	modified:   india_compliance/gst_india/doctype/bill_of_entry_item/bill_of_entry_item.json
	modified:   india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.html
	modified:   india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py
	modified:   india_compliance/gst_india/overrides/company.py
	new file:   india_compliance/gst_india/overrides/ineligible_itc.py
	modified:   india_compliance/gst_india/overrides/purchase_invoice.py
	new file:   india_compliance/gst_india/overrides/test_ineligible_itc.py
	modified:   india_compliance/gst_india/overrides/transaction.py
	modified:   india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py
	modified:   india_compliance/gst_india/utils/tests.py
	modified:   india_compliance/hooks.py
	modified:   india_compliance/install.py
	modified:   india_compliance/patches/post_install/rename_import_of_capital_goods.py
	modified:   india_compliance/patches/post_install/set_gst_category.py
	modified:   india_compliance/patches/post_install/update_company_fixtures.py
	modified:   india_compliance/patches/post_install/update_itc_amounts.py
	new file:   india_compliance/patches/post_install/update_itc_classification_field.py
	modified:   india_compliance/public/js/transaction.js
	modified:   india_compliance/tests/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/patches.txt

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 212f179)

# Conflicts:
#	india_compliance/patches.txt
@mergify mergify bot added the conflicts label Oct 26, 2023
@vorasmit vorasmit force-pushed the mergify/bp/version-14-hotfix/pr-1168 branch from 5e12407 to fd246b5 Compare October 26, 2023 12:46
@vorasmit vorasmit force-pushed the mergify/bp/version-14-hotfix/pr-1168 branch from fd246b5 to f5f9578 Compare October 27, 2023 02:14
@vorasmit vorasmit merged commit 7be3dca into version-14-hotfix Oct 27, 2023
5 of 8 checks passed
@vorasmit vorasmit deleted the mergify/bp/version-14-hotfix/pr-1168 branch October 27, 2023 02:14
@india-compliance-bot
Copy link
Collaborator

🎉 This PR is included in version 14.18.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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants