Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts: erpnext/patches/patch_list.py
This commit is contained in:
commit
d297b88f60
4
erpnext/patches/august_2012/changed_blog_date_format.py
Normal file
4
erpnext/patches/august_2012/changed_blog_date_format.py
Normal file
@ -0,0 +1,4 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.model.doclist import DocList
|
||||
DocList("Website Settings", "Website Settings").save()
|
@ -552,5 +552,9 @@ patch_list = [
|
||||
{
|
||||
'patch_module': 'patches.august_2012',
|
||||
'patch_file': 'change_profile_permission',
|
||||
}
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.august_2012',
|
||||
'patch_file': 'changed_blog_date_format',
|
||||
},
|
||||
]
|
@ -84,4 +84,4 @@ class DocType(website.web_page.Page):
|
||||
|
||||
self.doc.comment_list = comment_list or []
|
||||
for comment in self.doc.comment_list:
|
||||
comment['comment_date'] = webnotes.utils.pretty_date(comment['creation'])
|
||||
comment['comment_date'] = webnotes.utils.global_date_format(comment['creation'])
|
||||
|
Loading…
x
Reference in New Issue
Block a user