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

[fix] merge-conflicts

Browse Source
This commit is contained in:
Saurabh
2017-11-22 18:01:56 +05:30
parent 02ac901345 7cf945c975
commit ed4191ec5b
10 changed files with 87 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/buying_controller.py
View File

@@ -171,7 +171,7 @@ class BuyingController(StockController):
for item in self.get("items"):
if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
item.rm_supp_cost = 0.0
if item.item_code in self.sub_contracted_items:
if item.bom and item.item_code in self.sub_contracted_items:
self.update_raw_materials_supplied(item, raw_material_table)
if [item.item_code, item.name] not in parent_items: