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

..

setup

Fix translate setup.js

2013-10-15 18:20:32 -03:00

setup_wizard

[minor] [fixes] view in website and other fixes

2013-10-10 15:43:32 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30