-
Notifications
You must be signed in to change notification settings - Fork 7.3k
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: Job Card excess transfer behaviour (backport #31054) #31096
Merged
ankush
merged 4 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-31054
May 23, 2022
Merged
fix: Job Card excess transfer behaviour (backport #31054) #31096
ankush
merged 4 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-31054
May 23, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Block excess transfer of items if not allowed in settings - Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings) - Test for same case (cherry picked from commit e07ce6e) # Conflicts: # erpnext/manufacturing/doctype/job_card/test_job_card.py
…ed in settings (cherry picked from commit 9f6e106)
mergify
bot
requested review from
marination,
rohitwaghchaure and
ankush
as code owners
May 23, 2022 09:14
ankush
added
squash
Meant to tell reviewers that this PR should be squashed into a single commit while merging.
and removed
conflicts
labels
May 23, 2022
failing test fixed separately. |
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 26, 2022
# [13.31.0](v13.30.0...v13.31.0) (2022-05-26) ### Bug Fixes * Account currency validation for first transaction ([228f10b](228f10b)) * Add party account validation for journal entry ([7f853b1](7f853b1)) * always update item_name for stock entry (backport [#31068](#31068)) ([#31071](#31071)) ([f519dc6](f519dc6)) * change project's actual_start_date fieldtype from Data to Date (backport [#31085](#31085)) ([#31135](#31135)) ([8c2f203](8c2f203)) * Chart data for monthly periodicity in Cash Flow report ([#31039](#31039)) ([f14e9b7](f14e9b7)) * corrective job card creation (backport [#31083](#31083)) ([#31084](#31084)) ([c17c260](c17c260)) * don't capture payments with invoice_id as donations ([168a9d4](168a9d4)) * employee advance status update on return via additional salary ([d59c3d2](d59c3d2)) * Handle missing HSN Codes ([ce3a21e](ce3a21e)) * Healthcare module accounting test cases ([09a42a1](09a42a1)) * **India:** Async issue in company address trigger ([2ea3318](2ea3318)) * **india:** error while parsing e-invoice ([#31061](#31061)) ([1461d66](1461d66)) * **india:** eway bill cancel api is disabled ([#31060](#31060)) ([95491e1](95491e1)) * Job Card excess transfer behaviour (backport [#31054](#31054)) ([#31096](#31096)) ([3984f04](3984f04)) * Leave Encashment calculations (backport [#31062](#31062)) ([#31091](#31091)) ([ba76b64](ba76b64)) * Loan Doc query in Bank Reconciliation Statement ([611d1af](611d1af)) * Loan repayment entries for payroll payable account ([ea6d754](ea6d754)) * multiple entries for same payment term ([90b1147](90b1147)) * Party account validation in JV ([d10c2e5](d10c2e5)) * payments duplicate on pos closing entry (backport [#30976](#30976)) ([#31005](#31005)) ([0efbabe](0efbabe)) * **pos:** paid amount calculation for multicurrency invoice ([#31122](#31122)) ([98eb7da](98eb7da)) * remove bad default for Membership From Date ([34928d2](34928d2)) * Remove validation from Journal Entry ([4ca6cdc](4ca6cdc)) * replace document states with list settings ([78e9e66](78e9e66)) * timesheet fetching in sales invoice ([216c32f](216c32f)) * Use directly <a> and style it as button instead of using button ([0ab9fc0](0ab9fc0)) ### Features * **Employee Advance:** add 'Returned' and 'Partly Claimed and Returned' status ([42e7a86](42e7a86)) ### Reverts * Revert "fix: Add party account validation for journal entry" ([9d43a90](9d43a90))
🎉 This PR is included in version 13.31.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #31054 done by Mergify.