Anand Doshi 6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco ...

Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt

2013-01-14 13:28:31 +05:30

..

locale

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

account_tree_grid.js

Trial Balance : with/without closing entry

2013-01-01 13:48:40 +05:30

complete_setup.js

added query report and cleaned up wn.ui.Dialog

2012-10-01 14:46:37 +05:30

conf.js

desktop icons now use font-awesome

2012-12-21 15:00:29 +05:30

feature_setup.js

form toolbar ui fixes and added themes

2012-09-28 16:11:57 +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 moduleview

2013-01-09 16:39:27 +05:30

queries.js

datepicker fixes

2013-01-11 11:15:27 +05:30

startup.css

desktop icons now use font-awesome

2012-12-21 15:00:29 +05:30

startup.js

updates in manufacturing module

2012-12-19 19:33:41 +05:30

stock_analytics.js

stock level report

2012-12-28 15:39:55 +05:30

stock_controller.js

stock reco fixes with testcases

2013-01-11 19:25:46 +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

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

utils.js

stock uom replace bugfix

2013-01-11 10:50:54 +05:30

website_utils.js

added option to add status in Support Ticket created through website

2012-12-24 19:50:15 +05:30