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

chore: allow wip_composite_asset in the MR PO PR PI flow #37723

Merged
merged 2 commits into from
Oct 27, 2023
Merged

chore: allow wip_composite_asset in the MR PO PR PI flow #37723

merged 2 commits into from
Oct 27, 2023

Conversation

anandbaburajan
Copy link
Contributor

  • Allowing wip_composite_asset to be set anywhere in the MR PO PR PI flow and retain it throughout the flow
  • Hiding/making some fields non-mandatory on the Asset doctype form

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Oct 27, 2023
@frappe frappe deleted a comment from mergify bot Oct 27, 2023
@anandbaburajan
Copy link
Contributor Author

@mergify copy version-15-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2023

copy version-15-hotfix

✅ Pull request copies have been created

@anandbaburajan
Copy link
Contributor Author

@mergify copy version-14-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2023

copy version-14-hotfix

✅ Pull request copies have been created

@codecov
Copy link

codecov bot commented Oct 27, 2023

Codecov Report

Merging #37723 (5768ceb) into develop (dc5d2c7) will decrease coverage by 0.01%.
Report is 42 commits behind head on develop.
The diff coverage is 70.76%.

@@             Coverage Diff             @@
##           develop   #37723      +/-   ##
===========================================
- Coverage    67.32%   67.32%   -0.01%     
===========================================
  Files          757      757              
  Lines        60147    60144       -3     
===========================================
- Hits         40496    40493       -3     
  Misses       19651    19651              
Files Coverage Δ
...ounts/doctype/bank_transaction/bank_transaction.py 69.71% <ø> (-0.18%) ⬇️
...ounts/doctype/purchase_invoice/purchase_invoice.py 84.29% <ø> (ø)
erpnext/accounts/utils.py 73.12% <100.00%> (ø)
...xt/buying/doctype/purchase_order/purchase_order.py 78.99% <ø> (ø)
erpnext/controllers/stock_controller.py 82.20% <ø> (ø)
...egrations/doctype/plaid_settings/plaid_settings.py 45.30% <100.00%> (-0.31%) ⬇️
...nufacturing/doctype/blanket_order/blanket_order.py 89.39% <ø> (ø)
erpnext/selling/doctype/sales_order/sales_order.py 79.09% <100.00%> (ø)
...pnext/stock/doctype/delivery_trip/delivery_trip.py 62.08% <100.00%> (ø)
...stock/doctype/material_request/material_request.py 74.76% <ø> (ø)
... and 8 more

... and 1 file with indirect coverage changes

@anandbaburajan anandbaburajan merged commit d99a56b into frappe:develop Oct 27, 2023
anandbaburajan added a commit that referenced this pull request Oct 27, 2023
#37724)

* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea3)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
anandbaburajan added a commit that referenced this pull request Oct 27, 2023
#37725)

* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea3)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
mergify bot added a commit that referenced this pull request Oct 27, 2023
#37725)

* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea3)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
(cherry picked from commit 3f296ee)
anandbaburajan added a commit that referenced this pull request Oct 27, 2023
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (copy #37725)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant