Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/patches/patch_list.py
diff --git a/erpnext/patches/august_2012/changed_blog_date_format.py b/erpnext/patches/august_2012/changed_blog_date_format.py
new file mode 100644
index 0000000..d2dd870
--- /dev/null
+++ b/erpnext/patches/august_2012/changed_blog_date_format.py
@@ -0,0 +1,4 @@
+def execute():
+ import webnotes
+ from webnotes.model.doclist import DocList
+ DocList("Website Settings", "Website Settings").save()
\ No newline at end of file
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 71fc6b3..27dedf3 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -552,5 +552,9 @@
{
'patch_module': 'patches.august_2012',
'patch_file': 'change_profile_permission',
- }
+ },
+ {
+ 'patch_module': 'patches.august_2012',
+ 'patch_file': 'changed_blog_date_format',
+ },
]
\ No newline at end of file
diff --git a/erpnext/website/doctype/blog/blog.py b/erpnext/website/doctype/blog/blog.py
index c1b25f6..41e4f3a 100644
--- a/erpnext/website/doctype/blog/blog.py
+++ b/erpnext/website/doctype/blog/blog.py
@@ -84,4 +84,4 @@
self.doc.comment_list = comment_list or []
for comment in self.doc.comment_list:
- comment['comment_date'] = webnotes.utils.pretty_date(comment['creation'])
\ No newline at end of file
+ comment['comment_date'] = webnotes.utils.global_date_format(comment['creation'])