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

Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv

2013-11-04 13:14:39 +05:30

..

controllers

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

2013-10-24 11:40:32 +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

[pos] pos.js included in all selling & purchase cycle

2013-09-18 18:35:12 +05:30

startup.js

[fix] [minor] translation issue in startup

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

stock_analytics.js

Fix translate stock_analytics.js

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

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

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

2013-10-24 11:40:32 +05:30

utils.js

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

2013-11-04 13:14:39 +05:30

website_utils.js

[fix] [minor] [website]

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