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

..

controllers

[minor] added missing icon

2013-11-15 13:55:45 +05:30

account_tree_grid.js

[fix] [minor] account group balance in grid report

2013-10-28 19:59:44 +05:30

conf.js

Fix translate conf.js

2013-10-07 17:29:58 -03:00

feature_setup.js

Fix translate feature_setup.js

2013-10-07 18:56:56 -03:00

purchase_trends_filters.js

Fix translate purchase_trends_filters.js

2013-10-08 14:35:14 -03:00

queries.js

[fix] [minor] profile query

2013-09-03 15:33:56 +05:30

sales_trends_filters.js

Fix translate sales_trends_filters.js

2013-10-08 14:41:46 -03:00

startup.css

[minor] cleanup start

2013-10-28 18:21:07 +05:30

startup.js

[fix] [minor] translation issue in startup

2013-10-24 14:50:03 +05:30

stock_analytics.js

[cleanup] Fixed title bars, toolbars in all pages, added default background

2013-11-13 16:58:18 +05:30

stock_grid_report.js

[fix] [minor] stock balance report for serialized item

2013-11-15 13:38:23 +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

Merge branch '1310' of github.com:webnotes/erpnext

2013-11-15 19:12:09 +05:30

utils.js

[cleanup] UI Fixes

2013-11-08 16:27:18 +05:30

website_utils.js

[fix] [minor] [website]

2013-09-16 19:28:06 +05:30