[sales taxes and charges] renamed field cost_center_other_charges to cost_center
[patches] removed export file from update file data patch
Merge branch 'master' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/patch_list.py
Merge branch 'master' of github.com:webnotes/erpnext into webshop

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/april_2013/p05_update_file_data.py
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	stock/doctype/item/item.txt
[buying controller] [fix] use discount_rate instead of discount
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	stock/doctype/item/item.txt
[precision] [fixes]
[precision] server side cleanup and client side precision method
[buying] [calculation] fix in calculate outstanding amount
[buying, selling] [refactor] get item details
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/patch_list.py
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/april_2013/p05_update_file_data.py
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
[selling] [calculations] client side calculations, cleanup, patch fixes
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	controllers/buying_controller.py
[selling] [calculation] fixes