Merge branch 'develop' into hr-separation

2022-07-12 19:27:19 +05:30
parent 5a51951224 d7446fd3ae
commit d8aa1c59f1
109 changed files with 8155 additions and 3263 deletions
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -475,7 +475,11 @@ erpnext.utils.update_child_items = function(opts) {
 				filters = {"is_sales_item": 1};
 			} else if (frm.doc.doctype == 'Purchase Order') {
 				if (frm.doc.is_subcontracted) {
-					filters = {"is_sub_contracted_item": 1};
+					if (frm.doc.is_old_subcontracting_flow) {
+						filters = {"is_sub_contracted_item": 1};
+					} else {
+						filters = {"is_stock_item": 0};
+					}
 				} else {
 					filters = {"is_purchase_item": 1};
 				}