nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
Sagar Sharma
2022-09-18 16:38:09 +05:30
parent 0329642116
commit ec6cac8043
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -879,32 +879,27 @@ 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("po_detail"):
=======
elif not se_item.get(self.subcontract_data.rm_detail_field):
filters = { filters = {
"parent": self.get(self.subcontract_data.order_field), "parent": self.purchase_order,
"docstatus": 1, "docstatus": 1,
"rm_item_code": se_item.item_code, "rm_item_code": se_item.item_code,
"main_item_code": se_item.subcontracted_item, "main_item_code": se_item.subcontracted_item,
} }
order_rm_detail = frappe.db.get_value( order_rm_detail = frappe.db.get_value("Purchase Order Item Supplied", filters, "name")
self.subcontract_data.order_supplied_items_field, filters, "name"
)
if order_rm_detail: if order_rm_detail:
se_item.db_set(self.subcontract_data.rm_detail_field, order_rm_detail) se_item.db_set("po_detail", order_rm_detail)
else: else:
if not se_item.allow_alternative_item: if not se_item.allow_alternative_item:
frappe.throw( frappe.throw(
_("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format( _("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format(
se_item.idx, se_item.idx,
se_item.item_code, se_item.item_code,
self.subcontract_data.order_doctype, "Purchase Order",
self.get(self.subcontract_data.order_field), self.purchase_order,
) )
) )
>>>>>>> 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: