Anand Doshi 0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext ... Conflicts: accounts/doctype/account/account.py controllers/accounts_controller.py patches/patch_list.py selling/doctype/sales_common/sales_common.py stock/doctype/purchase_receipt/purchase_receipt.py		2013-11-15 19:12:09 +05:30
..
js	[fix] [minor] take correct docname when creating contact/address from a previous document	2013-08-14 17:22:14 +05:30
__init__.py	fixes in tax controller and test purchase receipt	2012-12-04 11:49:37 +05:30
accounts_controller.py	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-15 19:12:09 +05:30
buying_controller.py	[cleanup] purchase common	2013-10-18 17:01:56 +05:30
queries.py	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-05 12:10:08 +05:30
selling_controller.py	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-15 19:12:09 +05:30
status_updater.py	[minor] [fix] status updater, only change communication status when called explicitly	2013-10-04 13:33:24 +05:30
stock_controller.py	[fix] update future gl entries for stock	2013-11-14 18:40:08 +05:30
trends.py	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30