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.

Sign up for GitHub

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

Jump to bottom

fix: broken patches (backport #29067) #29406

Merged
merged 6 commits into from
Jan 25, 2022
Merged

fix: broken patches (backport #29067) #29406

merged 6 commits into from
Jan 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2022 •
edited by ankush

This is an automatic copy of pull request #29067 done by Mergify.

saurabh6790 and others added 3 commits January 21, 2022 13:51
@saurabh6790
chore: patch fixes
ba7461e 
(cherry picked from commit 8b5b146)

# Conflicts:
#	erpnext/patches/v13_0/make_homepage_products_website_items.py
@saurabh6790
fix: remove desktop icons while deleting sales reports
19e6d22 
(cherry picked from commit 5f72026)
@ankush
refactor: dont ignore dangerous exceptions in patches
9233218 
(cherry picked from commit 0aa1ea8)
@mergify mergify bot added the conflicts label Jan 21, 2022
@mergify mergify bot mentioned this pull request Jan 21, 2022
Merged
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 21, 2022
@ankush
fix: make patch kinda idempotent
fcde482 
with previous query rerunning would've caused all values to become 0.
@ankush
chore: conflicts
85e9f63
@ankush ankush removed needs-tests This PR needs automated unit-tests. conflicts labels Jan 21, 2022
@codecov
Copy link

codecov bot commented Jan 21, 2022 •
edited

Codecov Report

Merging #29406 (3c499e5) into develop (0a24953) will increase coverage by 7.06%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #29406      +/-   ##
===========================================
+ Coverage    50.95%   58.01%   +7.06%     
===========================================
  Files         1091     1091              
  Lines        67901    67901              
===========================================
+ Hits         34596    39391    +4795     
+ Misses       33305    28510    -4795
Impacted Files Coverage Δ
erpnext/utilities/product.py 14.70% <0.00%> (-35.30%) ⬇️
erpnext/shopping_cart/product_info.py 30.30% <0.00%> (-21.22%) ⬇️
...payroll/doctype/income_tax_slab/income_tax_slab.py 83.33% <0.00%> (-16.67%) ⬇️
...ctype/woocommerce_settings/woocommerce_settings.py 80.76% <0.00%> (-3.85%) ⬇️
erpnext/education/doctype/student/student.py 73.68% <0.00%> (-3.16%) ⬇️
...t/product_bundle_balance/product_bundle_balance.py 79.54% <0.00%> (-2.28%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 44.00% <0.00%> (-2.00%) ⬇️
...e/shopping_cart_settings/shopping_cart_settings.py 66.03% <0.00%> (-1.89%) ⬇️
erpnext/shopping_cart/product_query.py 61.19% <0.00%> (-1.50%) ⬇️
.../hr/doctype/upload_attendance/upload_attendance.py 45.52% <0.00%> (-1.50%) ⬇️
... and 166 more

@ankush ankush changed the title chore: patch fixes (copy #29067) fix: broken patches (backport #29067) Jan 25, 2022
@ankush ankush merged commit f469ec8 into develop Jan 25, 2022
@ankush ankush deleted the mergify/copy/develop/pr-29067 branch January 25, 2022 05:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ankush ankush Awaiting requested review from ankush

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@marination marination Awaiting requested review from marination

@nextchamp-saqib nextchamp-saqib Awaiting requested review from nextchamp-saqib

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ankush @saurabh6790