Anand Doshi 7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi ... Conflicts: accounts/doctype/sales_invoice/sales_invoice.txt controllers/selling_controller.py patches/patch_list.py selling/doctype/lead/lead.py selling/doctype/opportunity/opportunity.py selling/doctype/quotation/quotation.py selling/doctype/quotation/quotation.txt selling/doctype/sales_order/sales_order.txt stock/doctype/purchase_receipt/purchase_receipt.py stock/doctype/serial_no/serial_no.py stock/doctype/stock_entry/stock_entry.py stock/doctype/stock_ledger_entry/stock_ledger_entry.py		2013-10-15 12:18:46 +05:30
..
controllers	[minor] removed get_rate	2013-10-10 17:07:53 +05:30
account_tree_grid.js	[fix] [minor] round off currency values in grid reports	2013-08-12 17:32:47 +05:30
conf.js	[docs] [minor] updated install instructions	2013-08-07 16:32:12 +05:30
feature_setup.js	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
purchase_trends_filters.js	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
queries.js	[fix] [minor] profile query	2013-09-03 15:33:56 +05:30
sales_trends_filters.js	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
startup.css	[pos] pos.js included in all selling & purchase cycle	2013-09-18 18:35:12 +05:30
startup.js	New Setup Wizard	2013-10-08 17:59:11 +05:30
stock_analytics.js	[fix] [minor] round off currency values in grid reports	2013-08-12 17:32:47 +05:30
stock_grid_report.js	[fix] [minor] stock balance report for serialized item	2013-10-14 17:54:28 +05:30
toolbar.js	[fix] [minor] show live chat link if commercial_support = 1 in conf.py	2013-09-05 17:50:40 +05:30
transaction.js	[fix] [minor] conversion arte related fixes	2013-10-11 19:06:30 +05:30
utils.js	[setup wizard] added more steps [minor] [wip]	2013-10-07 18:22:29 +05:30
website_utils.js	[fix] [minor] [website]	2013-09-16 19:28:06 +05:30