[MERGE] : with trunk and resolve conflicts

bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn

diff --cc addons/website_blog/controllers/main.py
index 03c6477,400bc81..54c6688
--- 1/addons/website_blog/controllers/main.py
--- 2/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@@ -90,8 -94,12 +90,8 @@@ class WebsiteBlog(http.Controller)
          cr, uid, context = request.cr, request.uid, request.context
          blog_post_obj = request.registry['blog.post']
  
 -        blog_posts = None
 -
          blog_obj = request.registry['blog.blog']
-         blog_ids = blog_obj.search(cr, uid, [], context=context)
+         blog_ids = blog_obj.search(cr, uid, [], order="create_date asc", context=context)
          blogs = blog_obj.browse(cr, uid, blog_ids, context=context)
  
          path_filter = ""
@@@ -106,16 -115,19 +106,16 @@@
              path_filter += "date/%s" % date
              domain += [("create_date", ">=", date.split("_")[0]), ("create_date", "<=", date.split("_")[1])]
  
 -        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date asc", context=context)
 -        blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
 -
 +        blog_post_count = blog_post_obj.search(cr, uid, domain, count=True, context=context)
          pager = request.website.pager(
              url="/blog/%s" % path_filter,
 -            total=len(blog_posts),
 +            total=blog_post_count,
              page=page,
              step=self._blog_post_per_page,
 -            scope=BYPAGE
 +            scope=10
          )
-         blog_post_ids = blog_post_obj.search(cr, uid, domain, context=context, limit=self._blog_post_per_page, offset=pager['offset'])
 -        pager_begin = (page - 1) * self._blog_post_per_page
 -        pager_end = page * self._blog_post_per_page
 -        blog_posts = blog_posts[pager_begin:pager_end]
++        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date asc", context=context)
 +        blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
  
          tag_obj = request.registry['blog.tag']
          tag_ids = tag_obj.search(cr, uid, [], context=context)