Anand Doshi ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list ...

Conflicts:
	accounts/doctype/gl_control/gl_control.py

2013-01-17 20:31:41 +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

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

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

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 automatic lead creation for sales email id

2013-01-16 12:19:28 +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

added automatic lead creation for sales email id

2013-01-16 11:34:26 +05:30

stock_analytics.js

stock level report

2012-12-28 15:39:55 +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

merge

2013-01-14 16:11:03 +05:30

website_utils.js

added automatic lead creation for sales email id

2013-01-16 11:34:26 +05:30