schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into unicode

Browse Source 
Conflicts:
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-08-23 15:26:38 +05:30
parent 297f37da03 6db2ac51e6
commit d297b88f60
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/august_2012/changed_blog_date_format.py Normal file
View File

@@ -0,0 +1,4 @@
def execute():
import webnotes
from webnotes.model.doclist import DocList
DocList("Website Settings", "Website Settings").save()

6
erpnext/patches/patch_list.py
View File

@@ -552,5 +552,9 @@ patch_list = [
{ {
'patch_module': 'patches.august_2012', 'patch_module': 'patches.august_2012',
'patch_file': 'change_profile_permission', 'patch_file': 'change_profile_permission',
} },
{
'patch_module': 'patches.august_2012',
'patch_file': 'changed_blog_date_format',
},
] ]

2
erpnext/website/doctype/blog/blog.py
View File

@@ -84,4 +84,4 @@ class DocType(website.web_page.Page):
self.doc.comment_list = comment_list or [] self.doc.comment_list = comment_list or []
for comment in self.doc.comment_list: 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'])