Bárbara Perretti 4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n ...

Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js

2013-10-16 15:09:18 -03:00

..

controllers

Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n

2013-10-16 15:09:18 -03:00

account_tree_grid.js

Fix translate account_tree_grid.js

2013-10-07 17:10:04 -03:00

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

Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n

2013-10-16 15:09:18 -03:00

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 'wsgi' of https://github.com/webnotes/erpnext into i18n

2013-10-16 15:09:18 -03:00

utils.js

Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n

2013-10-16 15:09:18 -03:00

website_utils.js

[fix] [minor] [website]

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