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(job card): only hold during draft state #31243

Merged
merged 1 commit into from
Jun 6, 2022

Conversation

ankush
Copy link
Member

@ankush ankush commented Jun 6, 2022

If you pause a job card and then submit the status isn't correctly updated. This is because On hold job cards are completely ignored while updating status.

Fix: only ignore on hold job cards during draft state.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 6, 2022
@ankush ankush removed the needs-tests This PR needs automated unit-tests. label Jun 6, 2022
@ankush ankush force-pushed the on_hold_jc_status branch from 8295c39 to 6602cdd Compare June 6, 2022 07:53
@ankush ankush force-pushed the on_hold_jc_status branch from 6602cdd to d297fc9 Compare June 6, 2022 07:59
@ankush ankush force-pushed the on_hold_jc_status branch from d297fc9 to 4639d06 Compare June 6, 2022 08:06
@codecov
Copy link

codecov bot commented Jun 6, 2022

Codecov Report

Merging #31243 (4639d06) into develop (a8c1b01) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #31243      +/-   ##
===========================================
- Coverage    63.33%   63.30%   -0.04%     
===========================================
  Files          986      986              
  Lines        67405    67405              
===========================================
- Hits         42693    42669      -24     
- Misses       24712    24736      +24     
Impacted Files Coverage Δ
erpnext/manufacturing/doctype/job_card/job_card.py 71.02% <100.00%> (ø)
...eport/item_variant_details/item_variant_details.py 31.32% <0.00%> (-53.02%) ⬇️
.../report/delayed_item_report/delayed_item_report.py 60.78% <0.00%> (-35.30%) ⬇️
...tch_item_expiry_status/batch_item_expiry_status.py 67.92% <0.00%> (-24.53%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 67.79% <0.00%> (-22.04%) ⬇️
...rpnext/accounts/doctype/shareholder/shareholder.py 80.00% <0.00%> (-10.00%) ⬇️
...e_sales_analytics/supplier_wise_sales_analytics.py 81.96% <0.00%> (-8.20%) ⬇️
...next/accounts/doctype/bank_account/bank_account.py 77.27% <0.00%> (-2.28%) ⬇️
...eorder_level/itemwise_recommended_reorder_level.py 90.74% <0.00%> (-1.86%) ⬇️
.../fifo_queue_vs_qty_after_transaction_comparison.py 93.10% <0.00%> (-1.73%) ⬇️
... and 28 more

@ankush ankush marked this pull request as ready for review June 6, 2022 08:32
@ankush ankush merged commit ee5bc58 into frappe:develop Jun 6, 2022
mergify bot pushed a commit that referenced this pull request Jun 6, 2022
(cherry picked from commit ee5bc58)

# Conflicts:
#	erpnext/patches.txt
ankush added a commit that referenced this pull request Jun 6, 2022
* fix(job card): only hold during draft state (#31243)

(cherry picked from commit ee5bc58)

# Conflicts:
#	erpnext/patches.txt

* chore: conflicts

Co-authored-by: Ankush Menat <me@ankush.dev>
frappe-pr-bot pushed a commit that referenced this pull request Jun 7, 2022
# [13.33.0](v13.32.0...v13.33.0) (2022-06-07)

### Bug Fixes

* Close unsecured terms loans ([d6d1d79](d6d1d79))
* Consider only Approved leave applications in LWP, Employee Benefit calculations ([7f84c86](7f84c86))
* display currencies in validation message. ([ef22337](ef22337))
* incorrect billed_qty in sales order analysis report when multiple delivery notes for item (backport [#31194](#31194)) ([#31250](#31250)) ([3b1f6da](3b1f6da))
* incorrect LWP calculation for half days in employee benefit application ([10f0c93](10f0c93))
* **India:** GSTIN filter in GSTR-1 report ([abe9fe7](abe9fe7))
* **India:** Supplies from composite dealer not showing up ([15712c7](15712c7))
* **job card:** only hold during draft state (backport [#31243](#31243)) ([#31249](#31249)) ([a7fc278](a7fc278))
* **Leave Application:** 'Cancelled' status shown as 'Open' in list view ([8b48d45](8b48d45))
* leave balance for earned leaves in backdated Leave Application dashboard (backport [#31253](#31253)) ([#31256](#31256)) ([a22d92f](a22d92f))
* only fetch membership expiry if not already set in `member.js` ([#31259](#31259)) ([d433784](d433784))
* Parent dimension filters in orders ([b3cbcd8](b3cbcd8))
* Pluralize year text instead of optional bracket (backport [#31210](#31210)) ([#31212](#31212)) ([b31709c](b31709c))
* re-validate warehouse after 'update items' (backport [#31203](#31203)) ([#31206](#31206)) ([3a718c7](3a718c7))
* remove leave policy assignment creation patch (backport [#31097](#31097)) ([#31204](#31204)) ([4aeb448](4aeb448))
* Remove redundant query ([3c4cf59](3c4cf59))
* Reverse provisional entries on Purchase Invoice cancel ([1fba432](1fba432))
* **Sales Register:** incorrect query with dimensions (backport [#31242](#31242)) ([#31251](#31251)) ([0badfc8](0badfc8))
* Simply cancel reverse entries ([100b8d9](100b8d9))

### Features

* **india:** Improve E-way Bill Cancellation. ([#31088](#31088)) ([622d25e](622d25e))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants