nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 23:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor

Browse Source 
(cherry picked from commit b90875575c)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
This commit is contained in:
Sagar Sharma
2022-09-17 15:58:33 +05:30
committed by Mergify
parent 7c4f5fa5c5
commit 0329642116
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -879,6 +879,32 @@ class StockEntry(StockController):
se_item.idx, se_item.item_code, total_allowed, self.purchase_order se_item.idx, se_item.item_code, total_allowed, self.purchase_order
) )
) )
<<<<<<< HEAD
=======
elif not se_item.get(self.subcontract_data.rm_detail_field):
filters = {
"parent": self.get(self.subcontract_data.order_field),
"docstatus": 1,
"rm_item_code": se_item.item_code,
"main_item_code": se_item.subcontracted_item,
}
order_rm_detail = frappe.db.get_value(
self.subcontract_data.order_supplied_items_field, filters, "name"
)
if order_rm_detail:
se_item.db_set(self.subcontract_data.rm_detail_field, order_rm_detail)
else:
if not se_item.allow_alternative_item:
frappe.throw(
_("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format(
se_item.idx,
se_item.item_code,
self.subcontract_data.order_doctype,
self.get(self.subcontract_data.order_field),
)
)
>>>>>>> b90875575c (fix: make `po_detail` or `sco_rm_detail` mandatory for SE `Send to Subcontractor`)
elif backflush_raw_materials_based_on == "Material Transferred for Subcontract": elif backflush_raw_materials_based_on == "Material Transferred for Subcontract":
for row in self.items: for row in self.items:
if not row.subcontracted_item: if not row.subcontracted_item: