Anand Doshi 59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge ... Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt		2013-02-21 11:09:43 +05:30
..
controllers	refactored purchase cycle's get item details and update item details functions and started with purchase price list	2013-01-15 18:39:21 +05:30
locale	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
account_tree_grid.js	Trial Balance : with/without closing entry	2013-01-01 13:48:40 +05:30
complete_setup.js	started fresh install and added country_info	2013-01-17 18:22:22 +05:30
conf.js	desktop icons now use font-awesome	2012-12-21 15:00:29 +05:30
feature_setup.js	rename Purchase Request to Material Request	2013-02-18 13:49:15 +05:30
gantt_task.js	refactored javascript models	2012-12-13 12:53:21 +05:30
kb_common.js	fixed conflict	2012-12-19 12:18:15 +05:30
modules.js	added calendar view	2013-02-15 12:09:05 +05:30
queries.js	started fresh install and added country_info	2013-01-17 18:22:22 +05:30
startup.css	desktop icons now use font-awesome	2012-12-21 15:00:29 +05:30
startup.js	bugfix in session update and separated GET and POST queries	2013-01-31 11:20:10 +05:30
stock_analytics.js	added uom column in stock reports	2013-01-22 17:52:43 +05:30
stock_grid_report.js	stock balance report and inclusion of filter on brand in all stock reports	2012-12-25 18:04:10 +05:30
toolbar.js	added icons in modules drop down menu	2013-02-16 15:05:37 +05:30
utils.js	fix in get_currency -- using :Company	2013-01-30 00:42:41 +05:30
website_utils.js	get post fix	2013-01-31 22:05:39 +05:30