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

fixed conflict

Browse Source
This commit is contained in:
nabinhait
2011-06-28 16:21:58 +05:30
parent 53e6b81322 a6a8d57914
commit 78f5bf6498
34 changed files with 167 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
patches/patch.py
View File

@@ -1,6 +1,6 @@
# REMEMBER to update this
# ========================
last_patch = 300
last_patch = 301
#-------------------------------------------
@@ -1193,5 +1193,8 @@ def execute(patch_no):
elif patch_no == 299:
sql("update `tabDocPerm` set `match` = NULL where parent = 'Employee' and role = 'Employee'")
elif patch_no == 300:
sql("""DELETE FROM `tabSearch Criteria` WHERE name IN
('sales_register1', 'sales_register2', 'purchase_register1')""")
elif patch_no == 301:
from patches.delivery_billing_status_patch import run_patch
run_patch()