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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-11-19 12:38:47 +05:30
committed by GitHub
parent 5b1674018b
commit 2550b44db8
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -796,13 +796,8 @@ class BOM(WebsiteGenerator):
"stock_uom": d.stock_uom,
"conversion_factor": d.conversion_factor,
"sourced_by_supplier": d.sourced_by_supplier,
<<<<<<< HEAD
}
=======
"is_phantom_item": d.is_phantom_item,
},
notify=False,
>>>>>>> 074f07694f (fix: redundant message on bom save)
)
d.base_rate = flt(d.rate) * flt(self.conversion_rate)