nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Bárbara Perretti
2013-10-16 15:09:18 -03:00
parent 3da50f0960 f146e8b7f5
commit 4b41e5f7f7
250 changed files with 5061 additions and 2506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
portal/templates/pages/cart.py
View File

@@ -3,4 +3,5 @@
from __future__ import unicode_literals
no_cache = True
no_cache = True
no_sitemap = True

3
portal/templates/pages/profile.py
View File

@@ -7,6 +7,7 @@ from webnotes import _
from webnotes.utils import cstr
no_cache = True
no_sitemap = True
def get_context():
from selling.utils.cart import get_lead_or_customer
@@ -33,7 +34,7 @@ def update_profile(fullname, password=None, company_name=None, mobile_no=None, p
return _("Name is required")
webnotes.conn.set_value("Profile", webnotes.session.user, "first_name", fullname)
webnotes.add_cookies["full_name"] = fullname
webnotes._response.set_cookie("full_name", fullname)
return _("Updated")