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

fixed conflict while merging with webnotes repo

Browse Source
This commit is contained in:
nabinhait
2011-07-06 09:23:02 +05:30
parent 7f339e0a6d 4b2f35ed79
commit 5deab24401
11 changed files with 944 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patches/patch.py
View File

@@ -1218,9 +1218,10 @@ def execute(patch_no):
sql("delete from `tabDocField` where parent = 'company' and label = 'Trash Company' and fieldtype = 'Button'")
reload_doc('setup', 'doctype', 'company')
elif patch_no == 308:
from erpnext_structure_cleanup import run_patches
run_patches()
sql("update `tabDocField` set reqd = 0 where fieldname = 'select_item' and parent = 'Property Setter'")
elif patch_no == 309:
sql("delete from `tabDocField` where fieldname = 'item_attachments_details' and parent = 'Item'")
elif patch_no == 310:
sql("delete from `tabModule Def Item` where parent = 'Stock' and doc_name = 'Landed Cost Wizard'")
elif patch_no == 310:
from erpnext_structure_cleanup import run_patches
run_patches()