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
..
includes	Fix translate cart.js	2013-10-09 14:53:44 -03:00
pages	[minor] Added allow_rename in Employee webnotes/erpnetx#962	2013-10-11 10:57:13 +05:30
__init__.py	[website] [minor] moving to framework	2013-09-10 13:46:28 +05:30
base.html	[website] [minor] moving to framework	2013-09-11 15:31:58 +05:30
sale.html	[portal] [minor] show status for order and invoice	2013-09-12 15:25:47 +05:30
sales_transactions.html	[fix] [minor] [website]	2013-09-16 19:28:06 +05:30