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(ITC-04): create necessary fields to update original reference (backport #2479) #2524

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 20, 2024

Huly®: IC-2593


This is an automatic backport of pull request #2479 done by Mergify.

…2479)

* fix: fields required for itc_04 workflow setup

* fix: child doctype for reference document

* fix: dialog and query for selection of original document reference

* fix: redundant doctype

* fix: query for references

* fix: removed dialog and query shifted to backend

* fix: added validations

* fix: also validate if purpose is material_transfer

* fix better filters for queries and refactor

* fix: improved queries

* fix: only consider specific conditions

* fix: increment patch

* fix: changes as per review for stock entry

* fix: correct condition for taxes and references

---------

Co-authored-by: Smit Vora <[email protected]>
(cherry picked from commit a0108de)

# Conflicts:
#	india_compliance/gst_india/client_scripts/stock_entry.js
#	india_compliance/gst_india/client_scripts/subcontracting_receipt.js
#	india_compliance/gst_india/constants/custom_fields.py
#	india_compliance/gst_india/overrides/subcontracting_transaction.py
#	india_compliance/patches.txt
Copy link
Contributor Author

mergify bot commented Aug 20, 2024

Cherry-pick of a0108de has failed:

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

You are currently cherry-picking commit a0108de9.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   india_compliance/gst_india/client_scripts/stock_entry.js
	deleted by us:   india_compliance/gst_india/client_scripts/subcontracting_receipt.js
	both modified:   india_compliance/gst_india/constants/custom_fields.py
	deleted by us:   india_compliance/gst_india/overrides/subcontracting_transaction.py
	both modified:   india_compliance/patches.txt

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@vorasmit vorasmit closed this Aug 20, 2024
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-2479 branch August 20, 2024 05:01
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