Merge branch 'master' of github.com:webnotes/erpnext into customer-login

This commit is contained in:
Anand Doshi
2013-09-02 11:13:32 +05:30
26 changed files with 196 additions and 195 deletions

View File

@@ -119,18 +119,3 @@ def get_blog_template_args():
}
args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
return args
def get_writers_args():
bloggers = webnotes.conn.sql("""select * from `tabBlogger`
order by posts desc""", as_dict=1)
args = {
"bloggers": bloggers,
"texts": {
"all_posts_by": _("All posts by")
},
"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
}
args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
return args