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

Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-03-18 17:42:08 +05:30
parent ab7b7c2974 edf639b607
commit f11e2f8f6f
18 changed files with 433 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -212,4 +212,5 @@ patch_list = [
"patches.march_2013.p03_rename_blog_to_blog_post",
"execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')",
"patches.march_2013.p04_pos_update_stock_check",
"patches.march_2013.p05_payment_reconciliation",
]