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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-05-15 21:18:27 +05:30
31 changed files with 624 additions and 143 deletions

View File

@@ -251,4 +251,5 @@ patch_list = [
"patches.april_2013.rebuild_sales_browser",
"patches.april_2013.p08_price_list_country",
"patches.may_2013.p01_selling_net_total_export",
"patches.may_2013.repost_stock_for_no_posting_time",
]