nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
This commit is contained in:
Anand Doshi
2013-03-22 18:43:47 +05:30
parent 3f725308e1 b632ba5f51
commit aeed499d12
10 changed files with 64 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/doctype/contact_us_settings/contact_us_settings.py
View File

@@ -10,9 +10,9 @@ class DocType:
def onload(self):
"""load address"""
if self.doc.query_options:
self.doc.query_options = filter(None, self.doc.query_options.replace(",", "\n").split())
self.query_options = filter(None, self.doc.query_options.replace(",", "\n").split())
else:
self.doc.query_options = ["Sales", "Support", "General"]
self.query_options = ["Sales", "Support", "General"]
if self.doc.address:
self.address = webnotes.bean("Address", self.doc.address).doc