Merge pull request #5530 from rmehta/website-route-fixes

[redesign] website routing system
This commit is contained in:
Rushabh Mehta 2016-06-24 16:37:43 +05:30 committed by GitHub
commit 994fa8dcef
171 changed files with 1075 additions and 1338 deletions

View File

@ -25,7 +25,6 @@ script:
- bench use test_site
- bench reinstall
- bench build
- bench build-website
- bench start &
- sleep 10
- bench --verbose run-tests --driver Firefox

View File

@ -19,7 +19,7 @@ def get_list_context(context=None):
}
def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20):
from frappe.templates.pages.list import get_list
from frappe.www.list import get_list
user = frappe.session.user
key = None

View File

@ -48,13 +48,16 @@ class Opportunity(TransactionBase):
if not lead_name:
sender_name = get_fullname(self.contact_email)
if sender_name == self.contact_email:
sender_name = None
account = ''
email_name = self.contact_email[0:self.contact_email.index('@')]
email_split = email_name.split('.')
for s in email_split:
account = account + s.capitalize() + ' '
sender_name = None
account = _('Unknown')
if self.contact_email.index('@'):
email_name = self.contact_email[0:self.contact_email.index('@')]
email_split = email_name.split('.')
for s in email_split:
account = account + s.capitalize() + ' '
lead = frappe.get_doc({
"doctype": "Lead",

0
erpnext/docs/__init__.py Normal file
View File

View File

View File

View File

View File

View File

View File

View File

Some files were not shown because too many files have changed in this diff Show More