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

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Browse Source 
Conflicts:
	patches/april_2013/p05_update_file_data.py
This commit is contained in:
Anand Doshi
2013-05-01 14:48:16 +05:30
parent d54a4741a9 e97b07e43f
commit 447008b045
38 changed files with 723 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
patches/patch_list.py
View File

@@ -246,4 +246,7 @@ patch_list = [
"execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')",
"patches.april_2013.p07_rename_cost_center_other_charges",
"patches.april_2013.p06_default_cost_center",
"execute:webnotes.reset_perms('File Data')",
"patches.april_2013.p07_update_file_data_2",
"patches.april_2013.rebuild_sales_browser",
]