nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bom_convert_uom

Browse Source
This commit is contained in:
Makarand Bauskar
2017-06-21 21:35:38 +05:30
committed by GitHub
parent 2c77165fc6 1b6746e3bc
commit 0ea5d941e6
167 changed files with 1001 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom/bom.js
View File

@@ -68,6 +68,10 @@ erpnext.bom.BomController = erpnext.TransactionController.extend({
scrap_items = true;
}
if (child.bom_no) {
child.bom_no = '';
}
get_bom_material_detail(doc, cdt, cdn, scrap_items);
},
conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) {