erpnext

mirror of https://github.com/frappe/erpnext.git synced 2026-08-19 01:18:43 +00:00

Files

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

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

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

Print Format

[fix] [minor] [print formats] use format_currency in place of fmt_money

2013-08-07 20:15:37 +05:30

report

Merged master into wsgi