brotherton-erpnext/projects
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
..
doctype Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 2013-10-16 15:09:18 -03:00
page [project] [link-fix] minor 2013-09-13 10:21:46 +05:30
report Fix translate projects/report/daily_time_log_summary/daily_time_log_summary.js 2013-10-15 17:14:28 -03:00
__init__.py install from txt files, part 1 2013-01-16 17:48:17 +05:30
utils.py [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30