Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17337 from nabinhait/travis-fix-dev

Browse Source 
fix: Load doc before save
This commit is contained in:
Nabin Hait 2019-04-23 21:35:18 +05:30 committed by GitHub
commit 5e0bc20ab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,13 +20,12 @@ class BOMUpdateTool(Document):
for bom in bom_list: for bom in bom_list:
try: try:
bom_obj = frappe.get_doc("BOM", bom) bom_obj = frappe.get_doc("BOM", bom)
bom_obj.get_doc_before_save() bom_obj.load_doc_before_save()
updated_bom = bom_obj.update_cost_and_exploded_items(updated_bom) updated_bom = bom_obj.update_cost_and_exploded_items(updated_bom)
bom_obj.calculate_cost() bom_obj.calculate_cost()
bom_obj.update_parent_cost() bom_obj.update_parent_cost()
bom_obj.db_update() bom_obj.db_update()
if (getattr(bom_obj.meta, 'track_changes', False) if (getattr(bom_obj.meta, 'track_changes', False) and not bom_obj.flags.ignore_version):
and bom_obj._doc_before_save and not bom_obj.flags.ignore_version):
bom_obj.save_version() bom_obj.save_version()
frappe.db.commit() frappe.db.commit()

2
erpnext/stock/doctype/item/item.py
View File

@ -90,8 +90,6 @@ class Item(WebsiteGenerator):
self.set_opening_stock() self.set_opening_stock()
def validate(self): def validate(self):
self.get_doc_before_save()
super(Item, self).validate() super(Item, self).validate()
if not self.item_name: if not self.item_name: