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

resolved conflict in patch

Browse Source
This commit is contained in:
Nabin Hait
2011-09-02 17:48:05 +05:30
parent 343e10586b 779cfafa41
commit 0275149074
12 changed files with 632 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/patch.py
View File

@@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
last_patch = 354
last_patch = 355
#-------------------------------------------
@@ -267,7 +267,7 @@ def execute(patch_no):
delete_doc('Custom Script', 'Profile-Client')
delete_doc('Custom Script', 'Event-Client')
delete_doc('Custom Script', 'File-Server')
# reload profile with new fields for security
delete_doc('DocType', 'Profile')
reload_doc('core', 'doctype', 'profile')
@@ -291,5 +291,16 @@ def execute(patch_no):
elif patch_no == 353:
reload_doc('hr', 'doctype', 'salary_manager')
elif patch_no == 354:
reload_doc('setup', 'doctype','feature_setup')
reload_doc('stock','doctype','item')
sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")
rs = sql("select fieldname from tabDocField where parent='Features Setup' and fieldname is not null")
from webnotes.model.doc import Document
m = Document('Features Setup')
for d in rs:
m.fields[d[0]] = 1
m.save()
elif patch_no == 355:
reload_doc('hr', 'doctype', 'salary_slip')
delete_doc('DocType', 'Salary Control Panel')