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

Conflicts:
	controllers/buying_controller.py
This commit is contained in:
Anand Doshi
2013-05-21 19:40:09 +05:30
5 changed files with 68 additions and 15 deletions

View File

@@ -249,4 +249,5 @@ patch_list = [
"patches.may_2013.p01_selling_net_total_export",
"patches.may_2013.repost_stock_for_no_posting_time",
"patches.may_2013.p01_conversion_factor_and_aii",
"patches.may_2013.p02_update_valuation_rate",
]