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: Collapse Scrap Items in Job Card #28362

Merged
merged 1 commit into from
Nov 12, 2021
Merged

fix: Collapse Scrap Items in Job Card #28362

merged 1 commit into from
Nov 12, 2021

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Nov 12, 2021

Source/Reference: (FR-ISS-316618)

Screenshots:

Before:

After:

Changes:

https://user-images.githubusercontent.com/63660334/141418305-3f20db83-dcbe-46c1-b6b5-0e07d34d81eb.png

If the Scrap Item table is empty i.e., length == 0 then the scrap_items_section is collapsed by default.

@codecov
Copy link

codecov bot commented Nov 12, 2021

Codecov Report

Merging #28362 (55285fc) into develop (944bf8d) will decrease coverage by 0.05%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28362      +/-   ##
===========================================
- Coverage    55.26%   55.20%   -0.06%     
===========================================
  Files         1119     1119              
  Lines        66548    66548              
===========================================
- Hits         36777    36740      -37     
- Misses       29771    29808      +37     
Impacted Files Coverage Δ
...work_order_stock_report/work_order_stock_report.py 50.00% <0.00%> (-50.00%) ⬇️
...ctype/woocommerce_settings/woocommerce_settings.py 80.00% <0.00%> (-4.00%) ⬇️
...e/asset_value_adjustment/asset_value_adjustment.py 87.65% <0.00%> (-3.71%) ⬇️
...ctype/accounting_dimension/accounting_dimension.py 64.06% <0.00%> (-1.57%) ⬇️
.../hr/doctype/upload_attendance/upload_attendance.py 44.69% <0.00%> (-1.52%) ⬇️
...e/period_closing_voucher/period_closing_voucher.py 88.05% <0.00%> (-1.50%) ⬇️
erpnext/portal/utils.py 28.98% <0.00%> (-1.45%) ⬇️
...eport/production_analytics/production_analytics.py 69.51% <0.00%> (-1.22%) ⬇️
erpnext/stock/stock_ledger.py 85.63% <0.00%> (-0.91%) ⬇️
erpnext/accounts/deferred_revenue.py 75.11% <0.00%> (-0.89%) ⬇️
... and 12 more

@ankush ankush merged commit a424310 into frappe:develop Nov 12, 2021
mergify bot pushed a commit that referenced this pull request Nov 12, 2021
(cherry picked from commit a424310)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
ankush added a commit that referenced this pull request Nov 12, 2021
* fix: Collapse Scrap Items in Job Card (#28362)

(cherry picked from commit a424310)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
@s-aga-r s-aga-r deleted the Job-Card-Scrap-Items branch November 12, 2021 14:12
@sharmanakul sharmanakul added this to In progress in ERPNext Roadmap via automation Nov 24, 2021
@sharmanakul sharmanakul added this to the v13.16 milestone Nov 24, 2021
@ankush ankush moved this from In progress to Done in ERPNext Roadmap Dec 3, 2021
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants