From 1dceb70f3bf281f44cc746263a9a00a0fb6de2d8 Mon Sep 17 00:00:00 2001
From: Rifakat <rha@tinyerp.com>
Date: Thu, 13 Jun 2013 15:13:30 +0530
Subject: [PATCH 01/66] [FIX] account: if tax is , total base is applied only
 on the main tax and does not carry the child tax amount into base, it is
 compulsory to add child tax amount to tax base becuase the next tax i.e. VAT
 is applied on total tax base amount

---
 addons/account/account.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c2e75e889f0..418a4f7b161 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2088,12 +2088,15 @@ class account_tax(osv.osv):
                 data['balance'] = cur_price_unit
 
             amount2 = data.get('amount', 0.0)
+            amount3 = 0.0
             if tax.child_ids:
                 if tax.child_depend:
                     latest = res.pop()
                 amount = amount2
                 child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
                 res.extend(child_tax)
+                for child in child_tax:
+                    amount3 += child.get('amount', 0.0)
                 if tax.child_depend:
                     for r in res:
                         for name in ('base','ref_base'):
@@ -2109,7 +2112,7 @@ class account_tax(osv.osv):
                                 r['amount'] = data['amount']
                                 latest[name+'_code_id'] = False
             if tax.include_base_amount:
-                cur_price_unit+=amount2
+                cur_price_unit += amount2 + amount3
         return res
 
     def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):

From 8e3a8bb0feaec9e48bb597caaeda1120d346ce94 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 13:44:14 +0200
Subject: [PATCH 02/66] [FIX] google maps controller should be for POST only

---
 addons/website_google_map/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 01a0cc3b85e..9de241a00fd 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -28,7 +28,7 @@ class google_map(http.Controller):
         return partner_obj.google_map_json(request.cr, openerp.SUPERUSER_ID,
                                            partner_ids, request.context)
 
-    @http.route(['/google_map/set_partner_position'], type='http', auth="public", website=True)
+    @http.route(['/google_map/set_partner_position'], type='http', methods=['POST'], auth="public", website=True)
     def google_map_set_partner_position(self, *arg, **post):
         partner_obj = request.registry['res.partner']
 

From 1ce14dbe6af78956b4f158e0cdc3b49a211ad104 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 13:58:34 +0200
Subject: [PATCH 03/66] [FIX] survey route that is only accessed with POST verb

---
 addons/survey/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 0e708d96f43..2f65d92cd4c 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -234,7 +234,7 @@ class WebsiteSurvey(http.Controller):
 
     # AJAX submission of a page
     @http.route(['/survey/submit/<model("survey.survey"):survey>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', methods=['POST'], auth='public', multilang=True, website=True)
     def submit(self, survey, **post):
         _logger.debug('Incoming data: %s', post)
         page_id = int(post['page_id'])

From ce5ba45d45062f444b772deaa3828c7366f6c2fe Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 15:41:38 +0200
Subject: [PATCH 04/66] [IMP] gamification: avoid fetching function field while
 we could reuse the cache system of the browse records (avoid memory errors
 when updating a large number of records)

---
 addons/gamification/models/goal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index b4a47a0d07a..904e6fafa36 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -349,8 +349,8 @@ class gamification_goal(osv.Model):
                 goal = all_goals[goal_id]
 
                 # check goal target reached
-                if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
-                  or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
+                if (goal.definition_id.condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
+                  or (goal.definition_id.condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
                     value['state'] = 'reached'
 
                 # check goal failure

From a20ccfc7d4328642a50bd8eaab297b7f0f809bbe Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 15:48:51 +0200
Subject: [PATCH 05/66] [FIX] lazy sitemap with generators

---
 addons/website/controllers/main.py         | 23 ++++++++++++++--------
 addons/website/views/website_templates.xml |  3 ++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 5068d7d0e74..c064fdcbcd9 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -4,6 +4,7 @@ import contextlib
 import hashlib
 import json
 import logging
+import math
 import os
 import datetime
 import re
@@ -75,12 +76,14 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        pages = list(request.website.enumerate_pages())
-        if len(pages)<=LOC_PER_SITEMAP:
-            return self.__sitemap_xml(pages, 0)
+        count = 0
+        for loc in request.website.enumerate_pages():
+            count += 1
+        if count <= LOC_PER_SITEMAP:
+            return self.__sitemap_xml(0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
+            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -90,12 +93,16 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        pages = list(request.website.enumerate_pages())
-        return self.__sitemap_xml(pages, page)
+        return self.__sitemap_xml(page)
 
-    def __sitemap_xml(self, pages, index=0):
+    def __sitemap_xml(self, index=0):
+        locs = request.website.enumerate_pages()
+        feed = index * LOC_PER_SITEMAP
+        for i in xrange(feed):
+            locs.next()
         values = {
-            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
+            'locs': locs,
+            'iter': xrange(LOC_PER_SITEMAP),
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b9f33ef1c6b..d79dcbcd32a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,7 +699,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="pages" t-as="page">
+  <url t-foreach="iter" t-as="i">
+    <t t-set="page" t-value="locs.next()"/>
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 8145c52dea43c51c3997fc5aa8740dccfaadf5d0 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Wed, 14 May 2014 16:11:46 +0200
Subject: [PATCH 06/66] [FIX] website_blog: display blog posts in
 anti-chronological order

---
 addons/website_blog/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 133a95d0c8a..59914df884b 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -122,7 +122,7 @@ class WebsiteBlog(http.Controller):
         blog_url = QueryURL('', ['blog', 'tag'], blog=blog, tag=tag, date_begin=date_begin, date_end=date_end)
         post_url = QueryURL('', ['blogpost'], tag_id=tag and tag.id or None, date_begin=date_begin, date_end=date_end)
 
-        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date asc", context=context)
+        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date desc", context=context)
         blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
 
         pager = request.website.pager(

From 8f2bbf73ae5943a0cd35de3f3f48482575f4fe2c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 16:15:18 +0200
Subject: [PATCH 07/66] [FIX] gamification: avoid sending reports for
 non-reported challenges

---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 9612cf4a05e..ed6016b9665 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -324,7 +324,7 @@ class gamification_challenge(osv.Model):
                     ('end_date', '<=', challenge.last_report_date)
                 ])
 
-                if fields.date.today() >= challenge.next_report_date:
+                if challenge.next_report_date and fields.date.today() >= challenge.next_report_date:
                     self.report_progress(cr, uid, challenge, context=context)
 
                 elif len(closed_goals_to_report) > 0:

From 6130ed3ce0fbc6da5dea27ca2a005fc8d4445588 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 May 2014 16:32:36 +0200
Subject: [PATCH 08/66] [IMP] website: refactor website_image controller (and
 placeholder), move to model to make it reusable

It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
---
 addons/website/controllers/main.py |  82 +----------------------
 addons/website/models/website.py   | 100 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index c064fdcbcd9..79e5dfb0147 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,18 +1,12 @@
 # -*- coding: utf-8 -*-
 import cStringIO
-import contextlib
-import hashlib
 import json
 import logging
 import math
-import os
-import datetime
 import re
 
 from sys import maxint
 
-import werkzeug
-import werkzeug.exceptions
 import werkzeug.utils
 import werkzeug.wrappers
 from PIL import Image
@@ -336,13 +330,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         return request.website.kanban_col(**post)
 
     def placeholder(self, response):
-        # file_open may return a StringIO. StringIO can be closed but are
-        # not context managers in Python 2 though that is fixed in 3
-        with contextlib.closing(openerp.tools.misc.file_open(
-                os.path.join('web', 'static', 'src', 'img', 'placeholder.png'),
-                mode='rb')) as f:
-            response.data = f.read()
-            return response.make_conditional(request.httprequest)
+        return request.registry['website']._image_placeholder(response)
 
     @http.route([
         '/website/image',
@@ -366,74 +354,10 @@ class Website(openerp.addons.web.controllers.main.Home):
         The requested field is assumed to be base64-encoded image data in
         all cases.
         """
-        Model = request.registry[model]
-
         response = werkzeug.wrappers.Response()
+        return request.registry['website']._image(
+                    request.cr, request.uid, model, id, field, response)
 
-        id = int(id)
-
-        ids = Model.search(request.cr, request.uid,
-                           [('id', '=', id)], context=request.context)
-        if not ids and 'website_published' in Model._all_columns:
-            ids = Model.search(request.cr, openerp.SUPERUSER_ID,
-                               [('id', '=', id), ('website_published', '=', True)], context=request.context)
-
-        if not ids:
-            return self.placeholder(response)
-
-        presized = '%s_big' % field
-        concurrency = '__last_update'
-        [record] = Model.read(request.cr, openerp.SUPERUSER_ID, [id],
-                              [concurrency, field, presized],
-                              context=request.context)
-
-        if concurrency in record:
-            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
-            try:
-                response.last_modified = datetime.datetime.strptime(
-                    record[concurrency], server_format + '.%f')
-            except ValueError:
-                # just in case we have a timestamp without microseconds
-                response.last_modified = datetime.datetime.strptime(
-                    record[concurrency], server_format)
-
-        # Field does not exist on model or field set to False
-        if not record.get(field):
-            # FIXME: maybe a field which does not exist should be a 404?
-            return self.placeholder(response)
-
-        response.set_etag(hashlib.sha1(record[field]).hexdigest())
-        response.make_conditional(request.httprequest)
-
-        # conditional request match
-        if response.status_code == 304:
-            return response
-
-        data = (record.get(presized) or record[field]).decode('base64')
-
-        image = Image.open(cStringIO.StringIO(data))
-        response.mimetype = Image.MIME[image.format]
-
-        # record provides a pre-resized version of the base field, use that
-        # directly
-        if record.get(presized):
-            response.data = data
-            return response
-
-        fit = int(max_width), int(max_height)
-        w, h = image.size
-        max_w, max_h = fit
-
-        if w < max_w and h < max_h:
-            response.data = data
-        else:
-            image.thumbnail(fit, Image.ANTIALIAS)
-            image.save(response.stream, image.format)
-            # invalidate content-length computed by make_conditional as
-            # writing to response.stream does not do it (as of werkzeug 0.9.3)
-            del response.headers['Content-Length']
-
-        return response
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 584dc4b6105..e0aac6dbbbf 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1,13 +1,20 @@
 # -*- coding: utf-8 -*-
+import cStringIO
+import contextlib
+import datetime
 import hashlib
 import inspect
 import itertools
 import logging
 import math
 import mimetypes
+import os
 import re
 import urlparse
 
+from PIL import Image
+from sys import maxint
+
 import werkzeug
 import werkzeug.exceptions
 import werkzeug.utils
@@ -472,6 +479,99 @@ class website(osv.osv):
             html += request.website._render(template, {'object_id': object_id})
         return html
 
+    def _image_placeholder(self, response):
+        # file_open may return a StringIO. StringIO can be closed but are
+        # not context managers in Python 2 though that is fixed in 3
+        with contextlib.closing(openerp.tools.misc.file_open(
+                os.path.join('web', 'static', 'src', 'img', 'placeholder.png'),
+                mode='rb')) as f:
+            response.data = f.read()
+            return response.make_conditional(request.httprequest)
+
+    def _image(self, cr, uid, model, id, field, response, max_width=maxint, max_height=maxint, context=None):
+        """ Fetches the requested field and ensures it does not go above
+        (max_width, max_height), resizing it if necessary.
+
+        Resizing is bypassed if the object provides a $field_big, which will
+        be interpreted as a pre-resized version of the base field.
+
+        If the record is not found or does not have the requested field,
+        returns a placeholder image via :meth:`~._image_placeholder`.
+
+        Sets and checks conditional response parameters:
+        * :mailheader:`ETag` is always set (and checked)
+        * :mailheader:`Last-Modified is set iif the record has a concurrency
+          field (``__last_update``)
+
+        The requested field is assumed to be base64-encoded image data in
+        all cases.
+        """
+        Model = self.pool[model]
+        id = int(id)
+
+        ids = Model.search(cr, uid,
+                           [('id', '=', id)], context=context)
+        if not ids and 'website_published' in Model._all_columns:
+            ids = Model.search(cr, openerp.SUPERUSER_ID,
+                               [('id', '=', id), ('website_published', '=', True)], context=context)
+        if not ids:
+            return self._image_placeholder(response)
+
+        presized = '%s_big' % field
+        concurrency = '__last_update'
+        [record] = Model.read(cr, openerp.SUPERUSER_ID, [id],
+                              [concurrency, field, presized],
+                              context=context)
+
+        if concurrency in record:
+            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
+            try:
+                response.last_modified = datetime.datetime.strptime(
+                    record[concurrency], server_format + '.%f')
+            except ValueError:
+                # just in case we have a timestamp without microseconds
+                response.last_modified = datetime.datetime.strptime(
+                    record[concurrency], server_format)
+
+        # Field does not exist on model or field set to False
+        if not record.get(field):
+            # FIXME: maybe a field which does not exist should be a 404?
+            return self._image_placeholder(response)
+
+        response.set_etag(hashlib.sha1(record[field]).hexdigest())
+        response.make_conditional(request.httprequest)
+
+        # conditional request match
+        if response.status_code == 304:
+            return response
+
+        data = (record.get(presized) or record[field]).decode('base64')
+
+        image = Image.open(cStringIO.StringIO(data))
+        response.mimetype = Image.MIME[image.format]
+
+        # record provides a pre-resized version of the base field, use that
+        # directly
+        if record.get(presized):
+            response.data = data
+            return response
+
+        fit = int(max_width), int(max_height)
+        w, h = image.size
+        max_w, max_h = fit
+
+        if w < max_w and h < max_h:
+            response.data = data
+        else:
+            image.thumbnail(fit, Image.ANTIALIAS)
+            image.save(response.stream, image.format)
+            # invalidate content-length computed by make_conditional as
+            # writing to response.stream does not do it (as of werkzeug 0.9.3)
+            del response.headers['Content-Length']
+
+        return response
+        
+
 class website_menu(osv.osv):
     _name = "website.menu"
     _description = "Website Menu"

From 230a9c34b1609bfed3ab5853fdee0e9d28a2a893 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 May 2014 16:32:54 +0200
Subject: [PATCH 09/66] [FIX] website_forum: fix controllers losing paging and
 query params, allow to see own profile even without karma, add avatar
 controller to make the images public

---
 addons/website_forum/controllers/main.py     | 42 ++++++++++++++++----
 addons/website_forum/views/website_forum.xml | 13 +++---
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 332cfd4bb41..78c47603e7c 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -2,6 +2,7 @@
 
 from datetime import datetime
 import werkzeug.urls
+import werkzeug.wrappers
 import simplejson
 
 from openerp import tools
@@ -87,7 +88,8 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/<model("forum.forum"):forum>',
                  '/forum/<model("forum.forum"):forum>/page/<int:page>',
-                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions'''
+                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions''',
+                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions/page/<int:page>''',
                  ], type='http', auth="public", website=True, multilang=True)
     def questions(self, forum, tag=None, page=1, filters='all', sorting='date', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -115,7 +117,21 @@ class WebsiteForum(http.Controller):
             order = 'write_date desc'
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
-        pager = request.website.pager(url="/forum/%s" % slug(forum), total=question_count, page=page, step=self._post_per_page, scope=self._post_per_page)
+        if tag:
+            url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
+        else:
+            url = "/forum/%s" % slug(forum)
+        
+        url_args = {}
+        if search:
+            url_args['search'] = search
+        if filters:
+            url_args['filters'] = filters
+        if sorting:
+            url_args['sorting'] = sorting
+        pager = request.website.pager(url=url, total=question_count, page=page,
+                                      step=self._post_per_page, scope=self._post_per_page,
+                                      url_args=url_args)
 
         obj_ids = Post.search(cr, uid, domain, limit=self._post_per_page, offset=pager['offset'], order=order, context=context)
         question_ids = Post.browse(cr, uid, obj_ids, context=context)
@@ -418,14 +434,16 @@ class WebsiteForum(http.Controller):
     # User
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/users', type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/users',
+                 '/forum/<model("forum.forum"):forum>/users/page/<int:page>'],
+                type='http', auth="public", website=True, multilang=True)
     def users(self, forum, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         User = request.registry['res.users']
 
         step = 30
         tag_count = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], count=True, context=context)
-        pager = request.website.pager(url="/forum/users", total=tag_count, page=page, step=step, scope=30)
+        pager = request.website.pager(url="/forum/%s/users" % slug(forum), total=tag_count, page=page, step=step, scope=30)
 
         obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], order='karma DESC', context=context)
         users = User.browse(cr, SUPERUSER_ID, obj_ids, context=context)
@@ -451,6 +469,17 @@ class WebsiteForum(http.Controller):
                 return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), partner.user_ids[0].id))
         return werkzeug.utils.redirect("/forum/%s" % slug(forum))
 
+    @http.route(['/forum/user/<int:user_id>/avatar'], type='http', auth="public", website=True, multilang=True)
+    def user_avatar(self, user_id=0, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        response = werkzeug.wrappers.Response()
+        User = request.registry['res.users']
+        Website = request.registry['website']
+        user = User.browse(cr, SUPERUSER_ID, user_id, context=context)
+        if not user.exists() or (user_id != request.session.uid and user.karma < 1):
+            return Website._image_placeholder(response)
+        return Website._image(cr, SUPERUSER_ID, 'res.users', user.id, 'image', response)
+
     @http.route(['/forum/<model("forum.forum"):forum>/user/<int:user_id>'], type='http', auth="public", website=True, multilang=True)
     def open_user(self, forum, user_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -461,10 +490,9 @@ class WebsiteForum(http.Controller):
         Followers = request.registry['mail.followers']
         Data = request.registry["ir.model.data"]
 
-        user_id = User.search(cr, SUPERUSER_ID, [('id', '=', user_id), ('karma', '>', '1')], context=context)
-        if not user_id:
+        user = User.browse(cr, SUPERUSER_ID, user_id, context=context)
+        if not user.exists() or (user_id != request.session.uid and user.karma < 1): 
             return werkzeug.utils.redirect("/forum/%s" % slug(forum))
-        user = User.browse(cr, SUPERUSER_ID, user_id[0], context=context)
 
         # questions and answers by user
         user_questions, user_answers = [], []
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0e0ada6df48..60175620dc4 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -501,7 +501,7 @@
                         </ul>
                     </div>
                     <div>
-                        <span t-field="question.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                        <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{question.create_uid.id}/avatar"/>
                         <div>
                             <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
                                 t-field="question.create_uid"
@@ -557,7 +557,7 @@
                                 </t>
                             </li>
                         </ul>
-                        <span t-field="answer.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                        <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar"/>
                         <div>
                             <a t-attf-href="/forum/#{ slug(forum) }/user/#{ answer.create_uid.id }"
                                 t-field="answer.create_uid"
@@ -692,7 +692,7 @@
         </h4>
         <div class="row">
             <div class="col-sm-3 mt16" t-foreach="users" t-as="user">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
                 </div>
@@ -705,7 +705,7 @@
     <t t-call="website_forum.header">
         <div class="row">
             <div t-foreach="users" t-as="user" class="col-sm-4">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
                     <t t-if="user.country_id">
@@ -736,7 +736,7 @@
     <t t-call="website_forum.header">
         <h3>Edit Profile </h3>
             <div class="col-md-2">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class": "img img-responsive img-circle"}'/>
+                <img class="img img-responsive img-circle" t-attf-src="/forum/user/#{user.id}/avatar"/>
             </div>
             <form t-attf-action="/forum/#{slug(forum)}/user/#{slug(user)}/save" method="post" role="form" class="form-horizontal">
                 <input name="user_id" t-att-value="user.id" type="hidden"/>
@@ -786,8 +786,7 @@
         </h1>
         <div class="row">
             <div class="col-sm-2">
-                <span t-field="user.image"
-                    t-field-options='{"widget": "image", "class": "img img-responsive img-circle"}'/>
+                <img class="img img-responsive img-circle" t-attf-src="/forum/user/#{user.id}/avatar"/>
             </div>
             <div class="col-sm-10">
                 <table class="table table-condensed">

From 2e0e242c82dfd9a8a386cbb7a9cc02202a97a1a7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 17:11:16 +0200
Subject: [PATCH 10/66] [REV] Revert lazy sitemap

---
 addons/website/controllers/main.py         | 23 ++++++++--------------
 addons/website/views/website_templates.xml |  3 +--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 79e5dfb0147..a002abc8c88 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -2,7 +2,6 @@
 import cStringIO
 import json
 import logging
-import math
 import re
 
 from sys import maxint
@@ -70,14 +69,12 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        count = 0
-        for loc in request.website.enumerate_pages():
-            count += 1
-        if count <= LOC_PER_SITEMAP:
-            return self.__sitemap_xml(0)
+        pages = list(request.website.enumerate_pages())
+        if len(pages)<=LOC_PER_SITEMAP:
+            return self.__sitemap_xml(pages, 0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
+            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -87,16 +84,12 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        return self.__sitemap_xml(page)
+        pages = list(request.website.enumerate_pages())
+        return self.__sitemap_xml(pages, page)
 
-    def __sitemap_xml(self, index=0):
-        locs = request.website.enumerate_pages()
-        feed = index * LOC_PER_SITEMAP
-        for i in xrange(feed):
-            locs.next()
+    def __sitemap_xml(self, pages, index=0):
         values = {
-            'locs': locs,
-            'iter': xrange(LOC_PER_SITEMAP),
+            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d79dcbcd32a..b9f33ef1c6b 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,8 +699,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="iter" t-as="i">
-    <t t-set="page" t-value="locs.next()"/>
+  <url t-foreach="pages" t-as="page">
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 4e2fe7998ebb813dc53e471f6ce89a436c797082 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 18:31:16 +0200
Subject: [PATCH 11/66] [FIX] website_forum: display it as some kind of table
 for better display

---
 addons/website_forum/views/website_forum.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 60175620dc4..6bc5f02d5e9 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -703,8 +703,11 @@
 
 <template id="users">
     <t t-call="website_forum.header">
-        <div class="row">
-            <div t-foreach="users" t-as="user" class="col-sm-4">
+        <t t-foreach="users" t-as="user">
+            <t t-if="user_index % 3 == 0">
+                <div class="row"></div>
+            </t>
+            <div class="col-sm-4">
                 <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
@@ -725,7 +728,7 @@
                     <t t-raw="0"/>
                 </div>
             </div>
-        </div>
+        </t>
         <div class="pull-left">
             <t t-call="website.pager"/>
         </div>

From f38161608b867b125e2ce56f40aa34239f8d8e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 May 2014 18:36:58 +0200
Subject: [PATCH 12/66] [FIX] website_forum: fixed commit 9426: values were
 badly computed for the link_button template leading to most buttons being
 buggy on the forum.

---
 addons/website_forum/views/website_forum.xml | 59 ++++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 6bc5f02d5e9..fd45d9ce5a3 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -441,9 +441,9 @@
                     </p>
                     <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
                         <t t-call="website_forum.link_button">
-                            <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
-                            <t t-set="label"> Reopen</t>
-                            <t t-set="classes">fa-arrow-right</t>
+                            <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
+                            <t t-set="label" t-value="'Reopen'"/>
+                            <t t-set="classes" t-value="'fa-arrow-right'"/>
                         </t>
                     </div>
                 </div>
@@ -465,37 +465,37 @@
                             </li>
                             <li t-if="question.state != 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"/></t>
-                                    <t t-set="label"> Close</t>
-                                    <t t-set="classes">text-muted fa-times</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/ask_for_close'"/>
+                                    <t t-set="label" t-value="'Close'"/>
+                                    <t t-set="classes" t-vaoue="'text-muted fa-times'"/>
                                 </t>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
-                                    <t t-set="label"> Reopen</t>
-                                    <t t-set="classes">text-muted fa-undo</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/reopen'"/>
+                                    <t t-set="label" t-value="'Reopen'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-undo'"/>
                                 </t>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"/></t>
-                                    <t t-set="label"> Edit</t>
-                                    <t t-set="classes">text-muted fa-edit</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/edit'"/>
+                                    <t t-set="label" t-value="'Edit'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-edit'"/>
                                 </t>
                             </li>
                             <li t-if="question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/delete"/></t>
-                                    <t t-set="label"> Delete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/delete'"/>
+                                    <t t-set="label" t-value="'Delete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                             <li t-if="not question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete"/></t>
-                                    <t t-set="label"> Undelete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/undelete'"/>
+                                    <t t-set="label" t-value="'Undelete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                         </ul>
@@ -544,16 +544,16 @@
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"/></t>
-                                    <t t-set="label"> Delete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/delete'"/>
+                                    <t t-set="label" t-value="'Delete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"/></t>
-                                    <t t-set="label">Convert as a comment</t>
-                                    <t t-set="classes">text-muted fa-magic</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/convert_to_comment'"/>
+                                    <t t-set="label" t-value="'Convert as a comment'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-magic'"/>
                                 </t>
                             </li>
                         </ul>
@@ -593,16 +593,15 @@
                         t-attf-data-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete"
                         class="close comment_delete">&amp;times;</button>
                     <span t-field="message.body"/>
+                    <t t-call="website_forum.link_button">
+                        <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(object) + '/comment/' + slug(message) + '/convert_to_answer'"/>
+                        <t t-set="label" t-value="'Convert as an answer'"/>
+                        <t t-set="classes" t-value="'text-muted fa-magic pull-right'"/>
+                    </t>
                     <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
                         t-field="message.author_id" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
                     on <span t-field="message.date" t-field-options='{"format":"short"}'/>
-
-                    <t t-call="website_forum.link_button">
-                        <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/convert_to_answer"/></t>
-                        <t t-set="label"> Convert as an answer</t>
-                        <t t-set="classes">text-muted fa-magic pull-right</t>
-                    </t>
                 </small>
             </div>
             <div class="css_editable_mode_hidden">

From 2bcbebb0d5d4223f0bfd727a2f418468b302877c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 14 May 2014 21:36:34 +0200
Subject: [PATCH 13/66] [FIX] account_analysis_account: Keep price_unit to 0.0
 if passed

---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 785d7cd6db0..513c42e9ef6 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,7 +73,7 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit or res.list_price or 0.0})
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.list_price or 0.0)})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id:

From cfefd04871487ff9b4714d0714f6f9702c440674 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 14 May 2014 23:51:18 +0200
Subject: [PATCH 14/66] [FIX] account_analytic_analysis: recurring invoices,
 product_id_change wasnt returning the price get from the pricelist

---
 .../account_analytic_analysis.py                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 513c42e9ef6..2f4147cd45c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -62,22 +62,22 @@ class account_analytic_invoice_line(osv.osv):
         context = context or {}
         uom_obj = self.pool.get('product.uom')
         company_id = company_id or False
-        context.update({'company_id': company_id, 'force_company': company_id, 'pricelist_id': pricelist_id})
+        local_context = dict(context, company_id=company_id, force_company=company_id, pricelist=pricelist_id)
 
         if not product:
             return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         if partner_id:
-            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=local_context)
             if part.lang:
                 context.update({'lang': part.lang})
 
         result = {}
-        res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.list_price or 0.0)})
+        res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.price or res.list_price)})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id:
-            selected_uom = uom_obj.browse(cr, uid, result['uom_id'], context=context)
+            selected_uom = uom_obj.browse(cr, uid, result['uom_id'], context=local_context)
             new_price = uom_obj._compute_price(cr, uid, res.uom_id.id, res_final['value']['price_unit'], result['uom_id'])
             res_final['value']['price_unit'] = new_price
         return res_final

From 1501c7e64b74e5a9afd3c8076d9febce3a1781ad Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 00:43:38 +0200
Subject: [PATCH 15/66] [FIX] website_partner remove controller, add support
 for negative ids

---
 .../controllers/main.py                       | 23 +++++++++--------
 addons/website_customer/controllers/main.py   | 23 ++++++++++-------
 .../website_partner/controllers/__init__.py   |  1 -
 addons/website_partner/controllers/main.py    | 25 -------------------
 4 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 addons/website_partner/controllers/__init__.py
 delete mode 100644 addons/website_partner/controllers/main.py

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index bf54968e9ae..83474a798c7 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+import re
 
 import werkzeug
 
-import openerp
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
-from openerp.tools.translate import _
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
@@ -106,10 +105,14 @@ class WebsiteCrmPartnerAssign(http.Controller):
         return request.website.render("website_crm_partner_assign.index", values)
 
     # Do not use semantic controller due to SUPERUSER_ID
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partners_ref(self, partner_id, partner_name='', **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.partners(**post)
-        values['main_object'] = values['partner']
-        return request.website.render("website_crm_partner_assign.partner", values)
+    @http.route(['/partners/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, partner_name='', **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_crm_partner_assign.partner", values)
+        return self.partners(**post)
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 2caf8c74373..09db80c8908 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+import re
 
 import openerp
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 import werkzeug.urls
 
 class WebsiteCustomer(http.Controller):
@@ -80,11 +81,15 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def customer(self, partner_id, partner_name='', **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.customers(**post)
-
-        values['main_object'] = values['partner']
-        return request.website.render("website_customer.details", values)
+    # Do not use semantic controller due to SUPERUSER_ID
+    @http.route(['/customers/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_customer.details", values)
+        return self.customers(**post)
diff --git a/addons/website_partner/controllers/__init__.py b/addons/website_partner/controllers/__init__.py
deleted file mode 100644
index 8ee9bae18d9..00000000000
--- a/addons/website_partner/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import main
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
deleted file mode 100644
index c92ddac8189..00000000000
--- a/addons/website_partner/controllers/main.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import werkzeug
-
-from openerp import SUPERUSER_ID
-from openerp.addons.web import http
-from openerp.addons.web.http import request
-
-def get_partner_template_value(partner_id):
-    partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-    if not partner.exists() or not partner.website_published:
-        return None
-    return {
-        'partner': partner,
-    }
-
-class WebsitePartner(http.Controller):
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partner(self, partner_id, partner_name='', **post):
-        """ Route for displaying a single partner / customer. """
-        values = get_partner_template_value(partner_id)
-        if not values:
-            raise werkzeug.exceptions.NotFound()
-
-        return request.website.render("website_partner.partner_page", values)

From 10db161454340cc070f65a919f2fb3fe9e465639 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 May 2014 06:10:52 +0000
Subject: [PATCH 16/66] Launchpad automatic translations update.

---
 addons/project_issue/i18n/mn.po | 4 ++--
 addons/stock/i18n/nl.po         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index badabe240d0..1436ef3b2d9 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 3fb1f4079fc..ad5f42d7cfa 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-13 13:54+0000\n"
+"PO-Revision-Date: 2014-05-14 18:21+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -5128,7 +5128,7 @@ msgstr "Gekoppelde locatiesoort"
 #: help:stock.picking.in,min_date:0
 #: help:stock.picking.out,min_date:0
 msgid "Scheduled time for the shipment to be processed"
-msgstr "Geplande tijd, wanneer de uitgaande levering wordt verwerkt"
+msgstr "Geplande tijd, wanneer de levering wordt verwerkt"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0

From ca08f5d6745a2d886739d59ca55e9f6f98532706 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 09:54:13 +0200
Subject: [PATCH 17/66] [FIX] website_membership support negative ids

---
 addons/website_membership/controllers/main.py | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 810fd7dac14..24e0ed2dd5b 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
+import re
 
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 from openerp.tools.translate import _
 
 import werkzeug.urls
@@ -102,10 +102,15 @@ class WebsiteMembership(http.Controller):
         }
         return request.website.render("website_membership.index", values)
 
-    @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partners_ref(self, partner_id, **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.members(**post)
-        values['main_object'] = values['partner']
-        return request.website.render("website_membership.partner", values)
+    # Do not use semantic controller due to SUPERUSER_ID
+    @http.route(['/members/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_membership.partner", values)
+        return self.customers(**post)

From cada6437d564ad2525574bf3b4246cffd4a73eeb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 10:25:18 +0200
Subject: [PATCH 18/66] [REM] temporary disable sitemap

---
 addons/website/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index a002abc8c88..be13b5c7f1f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -69,6 +69,7 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
+        return request.not_found() # Temporary disable sitemap
         pages = list(request.website.enumerate_pages())
         if len(pages)<=LOC_PER_SITEMAP:
             return self.__sitemap_xml(pages, 0)

From 87615ac65d009cd890b980ebf5f45272f008b94b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 11:25:33 +0200
Subject: [PATCH 19/66] [FIX] website_crm_partner assign import

---
 addons/website_crm_partner_assign/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 83474a798c7..168e0ab3d52 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -3,6 +3,7 @@ import re
 
 import werkzeug
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request

From 70f29d774892f0256e3e7e773b9abe95c233a9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 11:27:14 +0200
Subject: [PATCH 20/66] [FIX] website_forum: fixed link to edit a question

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index fd45d9ce5a3..7cefe20e860 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -479,7 +479,7 @@
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/edit'"/>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/post/' + slug(question) + '/edit'"/>
                                     <t t-set="label" t-value="'Edit'"/>
                                     <t t-set="classes" t-value="'text-muted fa-edit'"/>
                                 </t>

From 1fbc5c1cfbf5ad41960c2c9e5e48ee54d323f081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 11:38:00 +0200
Subject: [PATCH 21/66] [FIX] website_forum: fixed issues with images in
 question / answers, now limited in width + auto height. Improved rule for
 img-avatar to avoid being overriden by the default img rule.

---
 .../static/src/css/website_forum.css          | 19 ++++++++++++++-----
 .../static/src/css/website_forum.sass         | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 75befd62b1c..54a7f47380f 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -24,16 +24,25 @@
 .question .badge-active {
   background-color: #428bca;
 }
+.question img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+.forum_answer img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+img.img-avatar {
+  max-width: 50px;
+  margin-right: 10px;
+}
 
 .oe_grey {
   background-color: #eeeeee;
 }
 
-.img-avatar {
-  max-width: 50px;
-  margin-right: 10px;
-}
-
 .badge-gold {
   color: #ffcc00;
 }
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index d800d293de8..4a16f48e77e 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -19,14 +19,23 @@
     margin-left: 4px
   .badge-active
     background-color: #428bca
+  img
+    max-width: 600px
+    height: auto !important
+
+.forum_answer
+  img
+    max-width: 600px
+    height: auto !important
+
+img.img-avatar
+  max-width: 50px
+  margin-right: 10px
+
 
 .oe_grey
   background-color: #eeeeee
 
-.img-avatar
-  max-width: 50px
-  margin-right: 10px
-
 .badge-gold
   color: #ffcc00
 

From f0c1eb17866f2d378bc4353247653ec58386a789 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 10:57:51 +0200
Subject: [PATCH 22/66] [FIX] website_forum: execute the change of number of
 views in SQL instead of using the orm

Using sql will be faster (doing a write in a read is never a good idea for performances) and will not update the write_date (which is used for the last activity filter)
---
 addons/website_forum/models/forum.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 061b9e55eb8..b1de4c001a5 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -269,8 +269,7 @@ class Post(osv.Model):
         return {'vote_count': self._get_vote_count(cr, uid, ids, None, None, context=context)[ids[0]]}
 
     def set_viewed(self, cr, uid, ids, context=None):
-        for post in self.browse(cr, uid, ids, context=context):
-            self.write(cr, uid, [post.id], {'views': post.views + 1}, context=context)
+        cr.execute("""UPDATE forum_post SET views = views+1 WHERE id IN %s""", (tuple(ids),))
         return True
 
 

From a2edf9520b8cde67549fe409063a1d7403bb5a02 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 11:23:11 +0200
Subject: [PATCH 23/66] [ADD] website_forum: adding the 'Newest' filter on the
 forum to sort by create date

---
 addons/website_forum/controllers/main.py     | 6 ++++--
 addons/website_forum/views/website_forum.xml | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 78c47603e7c..69a420be320 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -112,9 +112,11 @@ class WebsiteForum(http.Controller):
             order = 'child_count desc'
         elif sorting == 'vote':
             order = 'vote_count desc'
-        else:
-            sorting = 'date'
+        elif sorting == 'date':
             order = 'write_date desc'
+        else:
+            sorting = 'creation'
+            order = 'create_date desc'
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
         if tag:
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 7cefe20e860..66b13026335 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -229,6 +229,7 @@
                   <t t-if="filters == 'followed'">Followed</t>
                   <t t-if="tag"><span t-field="tag.name"/></t>
                   <t t-if="sorting == 'date'"> by activity date</t>
+                  <t t-if="sorting == 'creation'"> by creation date</t>
                   <t t-if="sorting == 'answered'"> by most answered</t>
                   <t t-if="sorting == 'vote'"> by most voted</t>
                   <b class="caret"/>
@@ -252,6 +253,9 @@
                   <li t-att-class="sorting == 'date' and 'active' or '' ">
                       <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='date')">Last activity date</a>
                   </li>
+                  <li t-att-class="sorting == 'creation' and 'active' or '' ">
+                      <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='creation')">Newest</a>
+                  </li>
                   <li t-att-class="sorting == 'answered' and 'active' or '' ">
                       <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='answered')">Most answered</a>
                   </li>

From 6a5fd8e6afc3b91e77a451bb13a6953deb5dd3f1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 11:36:08 +0200
Subject: [PATCH 24/66] [FIX] website_crm_partner_assign: fix import issues

---
 .../controllers/main.py                          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 168e0ab3d52..486d10e6ef6 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -3,10 +3,10 @@ import re
 
 import werkzeug
 
-import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.tools.translate import _
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
@@ -45,10 +45,10 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # group by country
         countries = partner_obj.read_group(
-            request.cr, openerp.SUPERUSER_ID, partner_domain, ["id", "country_id"],
+            request.cr, SUPERUSER_ID, partner_domain, ["id", "country_id"],
             groupby="country_id", orderby="country_id", context=request.context)
         countries_partners = partner_obj.search(
-            request.cr, openerp.SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, partner_domain,
             context=request.context, count=True)
 
         if country_id:
@@ -68,23 +68,23 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # format pager
         partner_count = partner_obj.search_count(
-            request.cr, openerp.SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, partner_domain,
             context=request.context)
         pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
 
-        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, partner_domain,
+        partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, partner_domain,
                                          offset=pager['offset'], limit=self._references_per_page,
                                          order="grade_id DESC, partner_weight DESC",
                                          context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
-        partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
+        partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
 
         # group by grade
         grades = partner_obj.read_group(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
+            request.cr, SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
             groupby="grade_id", orderby="grade_id DESC", context=request.context)
         grades_partners = partner_obj.search(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain,
+            request.cr, SUPERUSER_ID, base_partner_domain,
             context=request.context, count=True)
         grades.insert(0, {
             'grade_id_count': grades_partners,

From 4baccd7beea34c8421df20e181f4304374857fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 14:13:33 +0200
Subject: [PATCH 25/66] [IMP] mail: notifications: when having more than 500
 followers to mail use the email queue instead of directly sending
 notification emails.

---
 addons/mail/mail_followers.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 0059df90530..0985b16f5ac 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -183,16 +183,20 @@ class mail_notification(osv.Model):
         references = message.parent_id.message_id if message.parent_id else False
 
         # create email values
-        mail_values = {
-            'mail_message_id': message.id,
-            'auto_delete': True,
-            'body_html': body_html,
-            'recipient_ids': [(4, id) for id in email_pids],
-            'references': references,
-        }
-        email_notif_id = self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
-        if force_send:
-            self.pool.get('mail.mail').send(cr, uid, [email_notif_id], context=context)
+        max_recipients = 100
+        chunks = [email_pids[x:x + max_recipients] for x in xrange(0, len(email_pids), max_recipients)]
+        email_ids = []
+        for chunk in chunks:
+            mail_values = {
+                'mail_message_id': message.id,
+                'auto_delete': True,
+                'body_html': body_html,
+                'recipient_ids': [(4, id) for id in chunk],
+                'references': references,
+            }
+            email_ids.append(self.pool.get('mail.mail').create(cr, uid, mail_values, context=context))
+        if force_send and len(chunks) < 6:  # for more than 500 followers, use the queue system
+            self.pool.get('mail.mail').send(cr, uid, email_ids, context=context)
         return True
 
     def _notify(self, cr, uid, message_id, partners_to_notify=None, context=None,

From 828b7aef2f66fbc15ed28e39e7adc9068e9c4fa7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 16:58:16 +0200
Subject: [PATCH 26/66] [WIP] sitemap

---
 addons/website/controllers/main.py         | 44 +++++++++++++++++-----
 addons/website/views/website_templates.xml |  2 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index be13b5c7f1f..fc8dca6d07f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import cStringIO
+from itertools import islice
 import json
 import logging
+import math
 import re
 
 from sys import maxint
@@ -22,6 +24,24 @@ logger = logging.getLogger(__name__)
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
 
+import time
+
+from functools import wraps
+
+def timeit(f):
+    @wraps(f)
+    def wrapper(*args, **kw):
+        ts = time.time()
+        result = f(*args, **kw)
+        te = time.time()
+
+        print 'func:%r args:[%r, %r] took: %2.4f sec' % \
+          (f.__name__, args, kw, te-ts)
+        return result
+    return wrapper
+
+
+
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # View
@@ -67,15 +87,17 @@ class Website(openerp.addons.web.controllers.main.Home):
     def robots(self):
         return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
 
+    @timeit
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        return request.not_found() # Temporary disable sitemap
-        pages = list(request.website.enumerate_pages())
-        if len(pages)<=LOC_PER_SITEMAP:
-            return self.__sitemap_xml(pages, 0)
+        count = 0
+        for loc in request.website.enumerate_pages():
+            count += 1
+        if count <= LOC_PER_SITEMAP:
+            return self.__sitemap_xml(0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
+            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -85,18 +107,20 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        pages = list(request.website.enumerate_pages())
-        return self.__sitemap_xml(pages, page)
+        return self.__sitemap_xml(page)
 
-    def __sitemap_xml(self, pages, index=0):
+    @timeit
+    def __sitemap_xml(self, index=0):
+        start = index * LOC_PER_SITEMAP
+        locs = islice(request.website.enumerate_pages(), start , start + LOC_PER_SITEMAP)
         values = {
-            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
+            'locs': locs,
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
             'Content-Type': 'application/xml;charset=utf-8',
         }
-        return request.render('website.sitemap_xml', values, headers=headers)
+        return request.render('website.sitemap_xml', values, headers=headers).flatten()
 
     #------------------------------------------------------
     # Edit
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b9f33ef1c6b..3611645cbf5 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,7 +699,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="pages" t-as="page">
+  <url t-foreach="locs" t-as="page">
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 66484dbbc8e0f68c9fc5eaee0016ceb2c013d8e1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 15 May 2014 17:08:29 +0200
Subject: [PATCH 27/66] [FIX] website_twitter: use HTTPS profile URLs to be
 safe on HTTPS websites

---
 addons/website_twitter/static/src/xml/website.twitter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_twitter/static/src/xml/website.twitter.xml b/addons/website_twitter/static/src/xml/website.twitter.xml
index 25c6121e166..3a58fc4f43d 100644
--- a/addons/website_twitter/static/src/xml/website.twitter.xml
+++ b/addons/website_twitter/static/src/xml/website.twitter.xml
@@ -4,7 +4,7 @@
     <t t-name="website.Twitter.Tweet">
         <div class="tweet" t-attf-data-url="http://twitter.com/#{tweet.user.screen_name}/status/#{tweet.id_str}" t-attf-data-tweet-id="#{tweet.id_str}">
           <div class="left">
-              <img t-att-src="tweet.user.profile_image_url"/>
+              <img t-att-src="tweet.user.profile_image_url_https"/>
           </div>
           <div class="right">
               <div class="top">

From 3d881b1a0c30e74e965511c5b64c98e42945cbc3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 17:26:37 +0200
Subject: [PATCH 28/66] [REM] debuggin stuff

---
 addons/website/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index fc8dca6d07f..b1e414c8a33 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -120,7 +120,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         headers = {
             'Content-Type': 'application/xml;charset=utf-8',
         }
-        return request.render('website.sitemap_xml', values, headers=headers).flatten()
+        return request.render('website.sitemap_xml', values, headers=headers)
 
     #------------------------------------------------------
     # Edit

From e81306704170aeb62aefd716b4bbf511d3eb1f22 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 16 May 2014 06:43:51 +0000
Subject: [PATCH 29/66] Launchpad automatic translations update.

---
 addons/account_budget/i18n/it.po |  10 +-
 addons/stock/i18n/hr.po          | 240 ++++++++++++-------------------
 2 files changed, 100 insertions(+), 150 deletions(-)

diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 90b54d479cc..babb30b80ae 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-15 08:00+0000\n"
+"Last-Translator: Davide Corio @ LS <davide.corio@lsweb.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -212,7 +212,7 @@ msgstr "Valore Effettivo"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr "Imporo effettivo"
+msgstr "Importo effettivo"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index f387ab46671..191bf94479e 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-05 09:49+0000\n"
+"PO-Revision-Date: 2014-05-15 13:48+0000\n"
 "Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 07:27+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -55,7 +55,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Confirm & Deliver"
-msgstr "Potvrdi i isporuči"
+msgstr "Forsiraj dostupnost i  isporuči"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -125,8 +125,8 @@ msgid "Product Moves"
 msgstr "Product Moves"
 
 #. module: stock
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Molimo unesite ispravnu količinu"
@@ -145,13 +145,13 @@ msgstr ""
 "Interni broj za slučajeve kada se razlikuje od proizvođačeva serijskog broja"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Nije oguće izvršiti ovu operaciju  na više od jednog skladišta"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Količine nemogu biti negativne"
@@ -184,8 +184,6 @@ msgstr "npr. godišnja inventura"
 #: field:stock.partial.move.line,quantity:0
 #: field:stock.partial.picking.line,quantity:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.return.picking.memory,quantity:0
@@ -319,7 +317,7 @@ msgid "Reference"
 msgstr "Vezna oznaka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1565
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Artikli za obradu"
@@ -358,12 +356,12 @@ msgstr ""
 "da bi mogao biti ubačen u kanban pogled."
 
 #. module: stock
-#: code:addons/stock/stock.py:782
-#: code:addons/stock/stock.py:2517
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -371,9 +369,9 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #: code:addons/stock/wizard/stock_partial_picking.py:181
 #: code:addons/stock/wizard/stock_partial_picking.py:192
-#: code:addons/stock/wizard/stock_return_picking.py:102
-#: code:addons/stock/wizard/stock_return_picking.py:109
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -492,9 +490,6 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "Čeka dostupnost"
@@ -503,9 +498,6 @@ msgstr "Čeka dostupnost"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -578,7 +570,7 @@ msgstr ""
 "Ovo vrijeme jamčite kupcu kao rok isporuke."
 
 #. module: stock
-#: code:addons/stock/product.py:195
+#: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -595,7 +587,7 @@ msgid "Draft Physical Inventories"
 msgstr "Nacrti fizičkih inventura"
 
 #. module: stock
-#: code:addons/stock/stock.py:1806
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -643,7 +635,7 @@ msgid "Item Labels"
 msgstr "Labela"
 
 #. module: stock
-#: code:addons/stock/stock.py:1373
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -724,8 +716,6 @@ msgstr "Količina za serijski broj %d  %s je veća od dostupne količine (%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Order(Origin)"
 msgstr "Nalog(Izvor)"
 
@@ -765,7 +755,6 @@ msgid "Destination Address "
 msgstr "Odredišna adresa "
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,reception_count:0
 msgid "Reception"
 msgstr "Zaprimanje"
@@ -816,8 +805,6 @@ msgstr "Planirana godina"
 #: view:stock.picking.in:0
 #: field:stock.picking.in,state:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,state:0
 msgid "Status"
 msgstr "Status"
@@ -915,7 +902,7 @@ msgstr ""
 "which entries will be automatically posted when stock moves are processed."
 
 #. module: stock
-#: code:addons/stock/stock.py:2296
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -943,7 +930,7 @@ msgid "Reference must be unique per Company!"
 msgstr "Oznaka mora biti jedinstvena unuar organizacije"
 
 #. module: stock
-#: code:addons/stock/product.py:448
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Budući prijemi"
@@ -982,8 +969,6 @@ msgstr "- ažuriraj"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Weight"
 msgstr "Težina"
 
@@ -1027,7 +1012,7 @@ msgid "December"
 msgstr "Prosinac"
 
 #. module: stock
-#: code:addons/stock/stock.py:1204
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1052,7 +1037,7 @@ msgid "Change Product Quantity"
 msgstr "Promjeni količinu proizvoda"
 
 #. module: stock
-#: code:addons/stock/product.py:464
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Budući P&L"
@@ -1089,7 +1074,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Morate dodijeliti serijski broj za ovaj proizvod"
 
 #. module: stock
-#: code:addons/stock/stock.py:2299
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Definirajte dnevnik za kategoriju proizvoda: \"%s\" (id: %d)"
@@ -1136,8 +1121,6 @@ msgstr "Valuta"
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Journal"
 msgstr "Dnevnik"
 
@@ -1216,7 +1199,7 @@ msgid ""
 msgstr "Molim izaberite višestruke fizičke zalihe za spajanje u popis."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
@@ -1345,7 +1328,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1851
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1353,8 +1336,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Internal Shipment :"
 msgstr "Interni prijenosi:"
 
@@ -1382,7 +1363,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: stock
-#: code:addons/stock/stock.py:2908
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1493,8 +1474,6 @@ msgstr "Skl. prijenos utroška"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Delivery Order :"
 msgstr "Otpremnica"
 
@@ -1588,7 +1567,7 @@ msgstr ""
 "otpremnice koja utječe na prosječnu cijenu proizvoda."
 
 #. module: stock
-#: code:addons/stock/stock.py:1919
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1610,13 +1589,13 @@ msgid "To be refunded/invoiced"
 msgstr "Kreiraj fakturu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Možete izbrisati samo transakcije u nacrtu."
 
 #. module: stock
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1655,7 +1634,7 @@ msgid "Additional Info"
 msgstr "Dodatni podaci"
 
 #. module: stock
-#: code:addons/stock/stock.py:2697
+#: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
 msgstr ""
@@ -1671,7 +1650,7 @@ msgid "Incoming Shipments already processed"
 msgstr "Dolazne počiljke su već obrađene"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1748,9 +1727,6 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
-#: field:stock.picking,date:0
-#: field:stock.picking.in,date:0
-#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1840,7 +1816,7 @@ msgid "Order Date"
 msgstr "Datum naloga"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1878,7 +1854,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Račun nakon isporuke"
 
 #. module: stock
-#: code:addons/stock/stock.py:2517
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1943,8 +1919,6 @@ msgstr "Zaostala narudžba"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Incoming Shipment :"
 msgstr "Primka"
 
@@ -2030,7 +2004,7 @@ msgid "Shelf 2"
 msgstr "Shelf 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:543
+#: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
 msgstr ""
@@ -2054,7 +2028,7 @@ msgid "Localization"
 msgstr "Lokacija"
 
 #. module: stock
-#: code:addons/stock/product.py:460
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Otpremljena kol."
@@ -2373,7 +2347,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:450
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Zaprimljena kol."
@@ -2413,8 +2387,6 @@ msgstr "Naziv"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Supplier Address :"
 msgstr "Adresa dobavljača :"
 
@@ -2449,8 +2421,8 @@ msgid "Customer Locations"
 msgstr "Lokacije kupca"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
-#: code:addons/stock/stock.py:2907
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Greška korisnika!"
@@ -2681,7 +2653,7 @@ msgid "Warehouse board"
 msgstr "Kokpit skladišta"
 
 #. module: stock
-#: code:addons/stock/product.py:470
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Buduće kol."
@@ -2747,7 +2719,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2287
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2787,7 +2759,7 @@ msgid "Outgoing Products"
 msgstr "Izlazni proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2293
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2809,7 +2781,7 @@ msgid "Move"
 msgstr "Temeljnica"
 
 #. module: stock
-#: code:addons/stock/product.py:466
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L kol."
@@ -2904,8 +2876,6 @@ msgstr "Izvor"
 #: field:stock.picking,location_id:0
 #: field:stock.picking.in,location_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,location_id:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
@@ -2929,7 +2899,7 @@ msgid "Cancel Move"
 msgstr "Otkaži prijenos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2290
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2953,7 +2923,7 @@ msgid "scrap"
 msgstr "otpis"
 
 #. module: stock
-#: code:addons/stock/stock.py:1920
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3045,13 +3015,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zalihe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:176
+#: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:86
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktivni ID nije u kontekstu"
@@ -3074,7 +3044,7 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: stock
-#: help:stock.move,prodlot_id:0
+#: help:stock.move,lot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
@@ -3119,7 +3089,7 @@ msgid "Date of Completion"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3206,10 +3176,8 @@ msgstr "Datum revizije"
 
 #. module: stock
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
+#: field:report.stock.inventory,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Lot"
 msgstr "Lot"
 
@@ -3238,8 +3206,6 @@ msgstr "Postavi raspoloživo"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Contact Address :"
 msgstr "Kontakt adresa :"
 
@@ -3431,7 +3397,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2545
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3450,9 +3416,6 @@ msgstr "Customers Packings"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Done"
 msgstr "Izvršeno"
 
@@ -3481,7 +3444,7 @@ msgid "Date done"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3556,7 +3519,7 @@ msgid "Stock"
 msgstr "Zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:226
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3634,7 +3597,7 @@ msgid "Assigned Internal Moves"
 msgstr "DOdjeljeni interni prijenosi"
 
 #. module: stock
-#: code:addons/stock/stock.py:804
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Prijenosi za ovaj serijski broj"
@@ -3883,7 +3846,7 @@ msgid "Inventory Move"
 msgstr "Skladišni prijenos"
 
 #. module: stock
-#: code:addons/stock/product.py:476
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Buduća proizvodnja"
@@ -4006,24 +3969,21 @@ msgstr "Inventar lotova"
 #: model:ir.model,name:stock.model_stock_production_lot
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.change.product.qty,lot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
+#: field:stock.inventory.line.split.lines,lot_id:0
+#: field:stock.move,lot_id:0
 #: view:stock.move.split:0
 #: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.partial.move.line,lot_id:0
+#: field:stock.partial.picking.line,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 #: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-#: field:stock.return.picking.memory,prodlot_id:0
+#: field:stock.report.prodlots,lot_id:0
 msgid "Serial Number"
 msgstr "Serijski broj"
 
@@ -4082,7 +4042,7 @@ msgid "Non European Customers"
 msgstr "Klijenti izvan Europe"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #: code:addons/stock/product.py:110
 #: code:addons/stock/product.py:113
 #: code:addons/stock/product.py:120
@@ -4090,19 +4050,18 @@ msgstr "Klijenti izvan Europe"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:543
-#: code:addons/stock/stock.py:804
-#: code:addons/stock/stock.py:1204
-#: code:addons/stock/stock.py:1213
-#: code:addons/stock/stock.py:2287
-#: code:addons/stock/stock.py:2290
-#: code:addons/stock/stock.py:2293
-#: code:addons/stock/stock.py:2296
-#: code:addons/stock/stock.py:2299
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/stock.py:2525
-#: code:addons/stock/stock.py:2634
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -4199,7 +4158,7 @@ msgstr ""
 "je fiksna."
 
 #. module: stock
-#: code:addons/stock/stock.py:1882
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4269,7 +4228,7 @@ msgid "Followers"
 msgstr "Pratitelji"
 
 #. module: stock
-#: code:addons/stock/stock.py:2634
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4355,7 +4314,7 @@ msgstr ""
 "stock input account will be debited."
 
 #. module: stock
-#: code:addons/stock/stock.py:2860
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4374,7 +4333,7 @@ msgid "Chaining Journal"
 msgstr "Dnevnik ulančavanja"
 
 #. module: stock
-#: code:addons/stock/stock.py:782
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nedovoljna količina na zalihi, rezervacija artikla nije moguća."
@@ -4406,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:458
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Buduće otpreme"
@@ -4429,7 +4388,7 @@ msgid "Auto Validate"
 msgstr "Automatska potvrda"
 
 #. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4526,14 +4485,14 @@ msgid "Invoiced"
 msgstr "Fakturirano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1881
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1213
+#: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
 msgstr "Nije moguće ukloniti pošiljku koja je u statusu %s !"
@@ -4569,8 +4528,6 @@ msgstr "Auto-skladišnica"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Customer Address :"
 msgstr "Adresa kupca:"
 
@@ -4637,7 +4594,7 @@ msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4650,7 +4607,7 @@ msgid "Serial Number Revision"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr ""
@@ -4663,7 +4620,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4696,7 +4653,7 @@ msgid "November"
 msgstr "Studeni"
 
 #. module: stock
-#: code:addons/stock/product.py:472
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplanirana kol."
@@ -4707,7 +4664,7 @@ msgid "Chained Company"
 msgstr "Chained Company"
 
 #. module: stock
-#: view:stock.picking:0
+#: view:stock.picking.out:0
 msgid "Check Availability"
 msgstr "Provjeri dostupnost"
 
@@ -4732,7 +4689,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
@@ -4749,14 +4706,14 @@ msgid "Move History (parent moves)"
 msgstr "Move History (parent moves)"
 
 #. module: stock
-#: code:addons/stock/product.py:454
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Buduća zaliha"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4879,8 +4836,6 @@ msgstr "Kašnjenja"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Schedule Date"
 msgstr "Zakazani datum"
 
@@ -4918,8 +4873,6 @@ msgstr "Realan"
 #. module: stock
 #: field:stock.move,name:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
@@ -4943,7 +4896,6 @@ msgid "Deliver"
 msgstr "Otpremi"
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,delivery_count:0
 msgid "Delivery"
 msgstr "Otprema"
@@ -4965,7 +4917,7 @@ msgid "Location Content"
 msgstr "Location Content"
 
 #. module: stock
-#: code:addons/stock/product.py:478
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena kol."
@@ -5172,8 +5124,6 @@ msgstr "Spremno za isporuku"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Warehouse Address :"
 msgstr "Adresa skladišta:"
 

From 9fc6ff1f55a9f79c43e9092880ac94c99fe1243c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 16 May 2014 10:44:20 +0200
Subject: [PATCH 30/66] [FIX] website_event: when website_event is installed,
 event and event type should by readable (acl) by anyone

This means, public users, but all users that are neither public user nor event user
---
 addons/website_event/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 2d98213669f..b67e94c4ca5 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
-access_event_type_public,event.type.public,event.model_event_type,base.group_public,1,0,0,0
+access_event_event_public,event.event.public,event.model_event_event,,1,0,0,0
+access_event_type_public,event.type.public,event.model_event_type,,1,0,0,0

From d3beae292108f9a1d8afe98a0f0beacbb2248f36 Mon Sep 17 00:00:00 2001
From: rim-odoo <>
Date: Fri, 16 May 2014 12:19:32 +0200
Subject: [PATCH 31/66] [FIX] website: make sure the hidden properties on
 website will not be overwritten by other properties

---
 addons/website/static/src/css/website.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 94de70dc7dc..209d431ae8f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -121,7 +121,7 @@ header a.navbar-brand img {
 
 /* ----- EDITOR ----- */
 .css_non_editable_mode_hidden {
-  display: none;
+  display: none !important;
 }
 
 /* ----- BOOTSTRAP FIX ----- */

From 97fd0d8ed8feeed5353306a50234416ca784e05a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 16 May 2014 13:01:34 +0200
Subject: [PATCH 32/66] [FIX] auth_oauth: Replace OpenERP.com provider by
 Odoo.com provider

---
 addons/auth_oauth/auth_oauth_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 983549f9378..3889cf2d883 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data noupdate="1">
         <record id="provider_openerp" model="auth.oauth.provider">
-            <field name="name">OpenERP.com Accounts</field>
-            <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
+            <field name="name">Odoo.com Accounts</field>
+            <field name="auth_endpoint">https://accounts.odoo.com/oauth2/auth</field>
             <field name="scope">userinfo</field>
-            <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
+            <field name="validation_endpoint">https://accounts.odoo.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Log in with OpenERP.com</field>
+            <field name="body">Log in with Odoo.com</field>
             <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">

From a54b9ffe36eca909ffebc67894184f364c78b136 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 16 May 2014 13:54:50 +0200
Subject: [PATCH 33/66] [FIX] website_event: Increase number of displayed
 events

---
 addons/website_event/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 3e0a0729d92..70e7b0fbe91 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -139,7 +139,7 @@ class website_event(http.Controller):
             'country_id': ("all", _("All Countries"))
         })
 
-        step = 5
+        step = 10  # Number of events per page
         event_count = event_obj.search(
             request.cr, request.uid, dom_without("none"), count=True,
             context=request.context)

From 0fb14cbe0adbf03f2b8e53736a9d0021e130624a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 16 May 2014 14:06:17 +0200
Subject: [PATCH 34/66] [FIX] point_of_sale: add product variant in the
 displayed name (opw 607456)

---
 addons/point_of_sale/static/src/js/db.js     | 3 +++
 addons/point_of_sale/static/src/js/models.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index e0f4fd62b23..516637ab950 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -169,6 +169,9 @@ function openerp_pos_db(instance, module){
                 var product = products[i];
                 var search_string = this._product_search_string(product);
                 var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id;
+                if (product.variants){
+                    product.name = product.name+" ("+product.variants+")";
+                }
                 if(!stored_categories[categ_id]){
                     stored_categories[categ_id] = [];
                 }
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 6fe4db6211a..b7b36d05b4e 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -175,7 +175,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants',
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price

From fd15324d656bb71e4b5b184d1f5abfbb50810a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:16:56 +0200
Subject: [PATCH 35/66] [FIX] website_crm_partner_assign: clean and fix routes,
 pager, and grade / country search and propagation. Routes were still using an
 old int / str way of matching parameters. They have been converted into
 model-based routes. Also cleaned the way grades and countries are managed and
 displayed. Pager is now working, taking into account grade and country.

---
 .../controllers/main.py                       | 144 ++++++++++--------
 .../views/website_crm_partner_assign.xml      |  60 ++++----
 2 files changed, 107 insertions(+), 97 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 486d10e6ef6..c9621b7a0e9 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -6,97 +6,111 @@ import werkzeug
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website.models.website import slug
 from openerp.tools.translate import _
 
+
 class WebsiteCrmPartnerAssign(http.Controller):
-    _references_per_page = 20
+    _references_per_page = 40
 
     @http.route([
         '/partners',
         '/partners/page/<int:page>',
 
-        '/partners/grade/<int:grade_id>',
-        '/partners/grade/<int:grade_id>/page/<int:page>',
+        '/partners/grade/<model("res.partner.grade"):grade>',
+        '/partners/grade/<model("res.partner.grade"):grade>/page/<int:page>',
 
-        '/partners/country/<int:country_id>',
-        '/partners/country/<country_name>-<int:country_id>',
-        '/partners/country/<int:country_id>/page/<int:page>',
-        '/partners/country/<country_name>-<int:country_id>/page/<int:page>',
-
-        '/partners/grade/<int:grade_id>/country/<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
+        '/partners/country/<model("res.country"):country>',
+        '/partners/country/<model("res.country"):country>/page/<int:page>',
 
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>',
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, grade_id=0, page=0, country_name='', **post):
-        country_obj = request.registry['res.country']
+    def partners(self, country=None, grade=None, page=0, **post):
         partner_obj = request.registry['res.partner']
-        post_name = post.get('search', '')
-        country = None
+        search = post.get('search', '')
 
-        # format displayed membership lines domain
         base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
-        partner_domain = list(base_partner_domain)
-        if post_name:
-            partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
-        if grade_id and grade_id != "all":
-            partner_domain += [('grade_id', '=', int(grade_id))]  # try/catch int
+        if search:
+            base_partner_domain += ['|', ('name', 'ilike', search), ('website_description', 'ilike', search)]
 
-        # group by country
-        countries = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, partner_domain, ["id", "country_id"],
-            groupby="country_id", orderby="country_id", context=request.context)
-        countries_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, partner_domain,
+        # group by grade
+        grade_domain = list(base_partner_domain)
+        if country:
+            grade_domain += [('country_id', '=', country.id)]
+        grades = partner_obj.read_group(
+            request.cr, SUPERUSER_ID, grade_domain, ["id", "grade_id"],
+            groupby="grade_id", orderby="grade_id DESC", context=request.context)
+        grades_partners = partner_obj.search(
+            request.cr, SUPERUSER_ID, grade_domain,
             context=request.context, count=True)
-
-        if country_id:
-            country = country_obj.browse(request.cr, request.uid, country_id, request.context)
-            partner_domain += [('country_id', '=', country_id)]
-            if not any(x['country_id'][0] == country_id for x in countries):
-                countries.append({
-                    'country_id_count': 0,
-                    'country_id': (country_id, country.name)
-                })
-                countries.sort(key=lambda d: d['country_id'][1])
-
-        countries.insert(0, {
-            'country_id_count': countries_partners,
-            'country_id': (0, _("All Countries"))
+        # flag active grade
+        for grade_dict in grades:
+            grade_dict['active'] = grade and grade_dict['grade_id'][0] == grade.id
+        grades.insert(0, {
+            'grade_id_count': grades_partners,
+            'grade_id': (0, _("All Categories")),
+            'active': bool(grade is None),
         })
 
-        # format pager
-        partner_count = partner_obj.search_count(
-            request.cr, SUPERUSER_ID, partner_domain,
-            context=request.context)
-        pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
+        # group by country
+        country_domain = list(base_partner_domain)
+        if grade:
+            country_domain += [('grade_id', '=', grade.id)]
+        countries = partner_obj.read_group(
+            request.cr, SUPERUSER_ID, country_domain, ["id", "country_id"],
+            groupby="country_id", orderby="country_id", context=request.context)
+        countries_partners = partner_obj.search(
+            request.cr, SUPERUSER_ID, country_domain,
+            context=request.context, count=True)
+        # flag active country
+        for country_dict in countries:
+            country_dict['active'] = country and country_dict['country_id'][0] == country.id
+        countries.insert(0, {
+            'country_id_count': countries_partners,
+            'country_id': (0, _("All Countries")),
+            'active': bool(country is None),
+        })
 
-        partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, partner_domain,
-                                         offset=pager['offset'], limit=self._references_per_page,
-                                         order="grade_id DESC, partner_weight DESC",
-                                         context=request.context)
+        # current search
+        if grade:
+            base_partner_domain += [('grade_id', '=', grade.id)]
+        if country:
+            base_partner_domain += [('country_id', '=', country.id)]
+
+        # format pager
+        if grade and not country:
+            url = '/partners/grade/' + slug(grade)
+        elif country and not grade:
+            url = '/partners/country/' + slug(country)
+        elif country and grade:
+            url = '/partners/grade/' + slug(grade) + '/country/' + slug(country)
+        else:
+            url = '/partners'
+        url_args = {}
+        if search:
+            url_args['search'] = search
+        partner_count = partner_obj.search_count(
+            request.cr, SUPERUSER_ID, base_partner_domain,
+            context=request.context)
+        pager = request.website.pager(
+            url=url, total=partner_count, page=page, step=self._references_per_page, scope=7,
+            url_args=url_args)
+
+        # search partners matching current search parameters
+        partner_ids = partner_obj.search(
+            request.cr, SUPERUSER_ID, base_partner_domain,
+            offset=pager['offset'], limit=self._references_per_page,
+            order="grade_id DESC, partner_weight DESC",
+            context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
 
-        # group by grade
-        grades = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
-            groupby="grade_id", orderby="grade_id DESC", context=request.context)
-        grades_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, base_partner_domain,
-            context=request.context, count=True)
-        grades.insert(0, {
-            'grade_id_count': grades_partners,
-            'grade_id': (0, _("All Categories"))
-        })
-
         values = {
             'countries': countries,
-            'current_country_id': country_id,
             'current_country': country,
             'grades': grades,
-            'grade_id': grade_id,
+            'current_grade': grade,
             'partners': partners,
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 3e96bc12443..b43f7c1538a 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -36,13 +36,13 @@
                 </h2>
             </div>
 
-            <div class="col-md-4 mb32" id="partner_left">
+            <div class="col-md-3 mb32" id="partner_left">
 
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Categories</h3></li>
+                <ul id="reseller_grades" class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Filter by Grade</h3></li>
                     <t t-foreach="grades" t-as="grade">
-                        <li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
-                            <a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
+                        <li t-att-class="grade['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ grade['grade_id'][0] and 'grade/%s/' % grade['grade_id'][0] or '' }#{ current_country and 'country/%s/' % slug(current_country) or '' }#{ search_path }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/> 
                             </a>
@@ -51,34 +51,26 @@
                 </ul>
 
                 <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Locations</h3></li>
-                    <t t-foreach="countries" t-as="country_dict">
-                        <t t-if="country_dict['country_id']">
-                            <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners' }#{ search_path }">
-                                    <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
-                                    <t t-esc="country_dict['country_id'][1]"/> 
-                                </a>
-                            </li>
-                        </t>
+                    <li class="nav-header"><h3>Filter by Country</h3></li>
+                    <t t-foreach="countries" t-as="country">
+                        <li t-att-class="country['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
+                                <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
+                                <t t-esc="country['country_id'][1]"/> 
+                            </a>
+                        </li>
                     </t>
                 </ul>
 
             </div>
             
-            <div class="col-md-8" id="ref_content">
-                <div class='navbar'>
-                    <div>
-                        <t t-call="website.pager">
-                           <t t-set="classname">pull-left</t>
-                        </t>
-                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                            <div class="form-group">
-                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                            </div>
-
-                        </form>
-                    </div>
+            <div class="col-md-9" id="ref_content">
+                <div class="pull-right">
+                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                        <div class="form-group">
+                            <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                        </div>
+                    </form>
                 </div>
                 <div>
                     <p t-if="not partners">No result found</p>
@@ -94,7 +86,7 @@
                                t-field="partner.image_small"
                                t-field-options='{"widget": "image", "class": "media-object"}'
                             ></a>
-                            <div class="media-body" style="min-height: 64px;">
+                            <div class="media-body o_partner_body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
                                     <span t-field="partner.display_name"/>
                                 </a>
@@ -102,7 +94,11 @@
                             </div>
                         </div>
                     </t>
-
+                </div>
+                <div class='navbar'>
+                    <t t-call="website.pager">
+                       <t t-set="classname">pull-left</t>
+                    </t>
                 </div>
             </div>
         </t>
@@ -113,8 +109,8 @@
     <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
-                style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
+                style="width:260px; height:260px; border:0; padding:0; margin:0;"></iframe>
         </ul>
     </xpath>
 </template>

From 558063ed4c18b1955a0b6f85bf44c3428023141e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:57:06 +0200
Subject: [PATCH 36/66] [IMP] website_customer: set explicit dependency to
 crvm_partner_assign; already present due to google_map, but explicit is
 better than implicit.

---
 addons/website_customer/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_customer/__openerp__.py b/addons/website_customer/__openerp__.py
index c0b620f78e1..c6d26dad04a 100644
--- a/addons/website_customer/__openerp__.py
+++ b/addons/website_customer/__openerp__.py
@@ -30,8 +30,9 @@ OpenERP Customer References
 """,
     'author': 'OpenERP SA',
     'depends': [
+        'crm_partner_assign',
         'website_partner',
-        'website_google_map'
+        'website_google_map',
     ],
     'demo': [
         'website_customer_demo.xml',

From e9ce6f6f743c463aa0d878617e412e2dfcdd6915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:57:44 +0200
Subject: [PATCH 37/66] [FIX] website_partner: css styling, add margin under
 partner image, before address

---
 addons/website_partner/views/website_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 3a2466fb00b..32c1aa63bd3 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -23,7 +23,7 @@
     </t>
     <h1 class="col-md-12 text-center" id="partner_name" t-field="partner.display_name"/>
     <div class="col-md-4">
-        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block"}'/>
+        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block mb16"}'/>
         <address class="well">
              <div t-field="partner.self" t-field-options='{
                  "widget": "contact",

From 9530ff9fb5f9fdb798e93dde34676bd1420241b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:58:11 +0200
Subject: [PATCH 38/66] [IMP] website_crm_partner_assign: moved search on top
 of page, added references block like for customers modules.

---
 .../views/website_crm_partner_assign.xml      | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b43f7c1538a..aa617c266bf 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -29,6 +29,12 @@
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
             <div class="col-md-12">
+
+                <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                    <div class="form-group pull-right">
+                        <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                    </div>
+                </form>
                 <h1 class="text-center">
                     Looking For a Local Store?
                 </h1><h2 class="text-center text-muted">
@@ -65,13 +71,6 @@
             </div>
             
             <div class="col-md-9" id="ref_content">
-                <div class="pull-right">
-                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                        <div class="form-group">
-                            <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                        </div>
-                    </form>
-                </div>
                 <div>
                     <p t-if="not partners">No result found</p>
                     <t t-foreach="partners" t-as="partner">
@@ -91,6 +90,11 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
+                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+                                    <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
+                                        <t t-raw="len([p.website_published for p in partner.implemented_partner_ids])"/> reference(s)
+                                    </a></small>
+                                </t>
                             </div>
                         </div>
                     </t>
@@ -118,7 +122,11 @@
 <template id="partner" name="Partner Detail">
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
-            <t t-call="website_partner.partner_detail"/>
+            <t t-call="website_partner.partner_detail">
+                <t t-set="right_column">
+                    <div id="right_column" class="mb16"><t t-call="website_customer.references_block"/></div>
+                </t>
+            </t>
         </t>
     </t>
 </template>
@@ -130,5 +138,24 @@
   </xpath>
 </template>
 
+<template id="references_block" name="Partner References Block">
+    <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+        <h3 id="references">References</h3>
+        <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
+          <t t-if="reference.website_published">
+            <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
+                <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
+            </a>
+            <div class="media-body" style="min-height: 64px;">
+                <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
+                    <span t-field="reference.self"/>
+                </a>
+                <div t-field='reference.website_short_description'/>
+            </div>
+          </t>
+        </div>
+    </t>
+</template>
+
 </data>
 </openerp>

From f90a37ea70f67f2a090c63c8b8d606640e89f8f3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Fri, 16 May 2014 15:31:26 +0200
Subject: [PATCH 39/66] [IMP] sitemap caches it's output in ir.attachment

---
 addons/website/controllers/main.py         | 109 +++++++++++----------
 addons/website/views/website_templates.xml |  16 +--
 2 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b1e414c8a33..df958d969dd 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import cStringIO
+import datetime
 from itertools import islice
 import json
 import logging
-import math
 import re
 
 from sys import maxint
@@ -13,8 +13,6 @@ import werkzeug.wrappers
 from PIL import Image
 
 import openerp
-from openerp.osv import fields
-from openerp.addons.website.models import website
 from openerp.addons.web import http
 from openerp.http import request, Response
 
@@ -23,24 +21,7 @@ logger = logging.getLogger(__name__)
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
-
-import time
-
-from functools import wraps
-
-def timeit(f):
-    @wraps(f)
-    def wrapper(*args, **kw):
-        ts = time.time()
-        result = f(*args, **kw)
-        te = time.time()
-
-        print 'func:%r args:[%r, %r] took: %2.4f sec' % \
-          (f.__name__, args, kw, te-ts)
-        return result
-    return wrapper
-
-
+SITEMAP_CACHE_TIME = datetime.timedelta(hours=6)
 
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
@@ -87,40 +68,66 @@ class Website(openerp.addons.web.controllers.main.Home):
     def robots(self):
         return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
 
-    @timeit
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        count = 0
-        for loc in request.website.enumerate_pages():
-            count += 1
-        if count <= LOC_PER_SITEMAP:
-            return self.__sitemap_xml(0)
-        # Sitemaps must be split in several smaller files with a sitemap index
-        values = {
-            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
-            'url_root': request.httprequest.url_root
-        }
-        headers = {
-            'Content-Type': 'application/xml;charset=utf-8',
-        }
-        return request.render('website.sitemap_index_xml', values, headers=headers)
+        cr, uid, context = request.cr, openerp.SUPERUSER_ID, request.context
+        ira = request.registry['ir.attachment']
+        iuv = request.registry['ir.ui.view']
+        mimetype ='application/xml;charset=utf-8'
+        content = None
 
-    @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
-    def sitemap_xml(self, page):
-        return self.__sitemap_xml(page)
+        def create_map(url, content):
+            ira.create(cr, uid, dict(
+                datas=content.encode('base64'),
+                mimetype=mimetype,
+                type='binary',
+                name=url,
+                url=url,
+            ), context=context)
 
-    @timeit
-    def __sitemap_xml(self, index=0):
-        start = index * LOC_PER_SITEMAP
-        locs = islice(request.website.enumerate_pages(), start , start + LOC_PER_SITEMAP)
-        values = {
-            'locs': locs,
-            'url_root': request.httprequest.url_root.rstrip('/')
-        }
-        headers = {
-            'Content-Type': 'application/xml;charset=utf-8',
-        }
-        return request.render('website.sitemap_xml', values, headers=headers)
+        sitemap = ira.search_read(cr, uid, [('url', '=' , '/sitemap.xml'), ('type', '=', 'binary')], ('datas', 'create_date'), context=context)
+        if sitemap:
+            # Check if stored version is still valid
+            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
+            create_date = datetime.datetime.strptime(sitemap[0]['create_date'], server_format)
+            delta = datetime.datetime.now() - create_date
+            if delta < SITEMAP_CACHE_TIME:
+                content = sitemap[0]['datas'].decode('base64')
+
+        if not content:
+            # Remove all sitemaps in ir.attachments as we're going to regenerated them
+            sitemap_ids = ira.search(cr, uid, [('url', '=like' , '/sitemap%.xml'), ('type', '=', 'binary')], context=context)
+            if sitemap_ids:
+                ira.unlink(cr, uid, sitemap_ids, context=context)
+
+            pages = 0
+            first_page = None
+            locs = request.website.enumerate_pages()
+            while True:
+                start = pages * LOC_PER_SITEMAP
+                loc_slice = islice(locs, start, start + LOC_PER_SITEMAP)
+                urls = iuv.render(cr, uid, 'website.sitemap_locs', dict(locs=loc_slice), context=context)
+                if urls.strip():
+                    page = iuv.render(cr, uid, 'website.sitemap_xml', dict(content=urls), context=context)
+                    if not first_page:
+                        first_page = page
+                    pages += 1
+                    create_map('/sitemap-%d.xml' % pages, page)
+                else:
+                    break
+            if not pages:
+                return request.not_found()
+            elif pages == 1:
+                content = first_page
+            else:
+                # Sitemaps must be split in several smaller files with a sitemap index
+                content = iuv.render(cr, uid, 'website.sitemap_index_xml', dict(
+                    pages=range(1, pages + 1),
+                    url_root=request.httprequest.url_root,
+                ), context=context)
+            create_map('/sitemap.xml', content)
+
+        return request.make_response(content, [('Content-Type', mimetype)])
 
     #------------------------------------------------------
     # Edit
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3611645cbf5..c322528764a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -697,14 +697,18 @@ User-agent: *
 Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
+<template id="sitemap_locs">
+    <url t-foreach="locs" t-as="page">
+        <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
+        <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
+        <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">
+        <changefreq t-esc="page['changefreq']"/></t>
+    </url>
+</template>
+
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="locs" t-as="page">
-    <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
-    <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
-    <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">
-    <changefreq t-esc="page['changefreq']"/></t>
-  </url>
+    <t t-raw="content"/>
 </urlset>
 </template>
 

From 93c4e0da57511eaab1d441cb29ae4d4016cae8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:28:55 +0200
Subject: [PATCH 40/66] [IMP] crm_partner_assign: added computed field counting
 the number of references of a partner. This allows to order / filter / do
 whatever you want with the number of references.

---
 .../crm_partner_assign/crm_partner_assign.py  | 21 +++++++++++++++++++
 .../crm_partner_assign/res_partner_view.xml   |  1 +
 2 files changed, 22 insertions(+)

diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 046babccf73..317d1f289eb 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -53,6 +53,22 @@ class res_partner_activation(osv.osv):
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
+
+    def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
+        res = dict.fromkeys(ids, 0)
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = len(partner.implemented_partner_ids)
+        return res
+
+    def _get_partner_from_implementation(self, cr, uid, ids, context=None):
+        pids = set()
+        for partner in self.browse(cr, uid, ids, context=context):
+            pids.add(partner.id)
+            if partner.assigned_partner_id:
+                pids.add(partner.assigned_partner_id.id)
+            pids = pids | set([p.id for p in partner.implemented_partner_ids])
+        return list(pids)
+
     _columns = {
         'partner_weight': fields.integer('Grade Weight',
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
@@ -71,6 +87,11 @@ class res_partner(osv.osv):
             'res.partner', 'assigned_partner_id',
             string='Implementation References',
         ),
+        'implemented_count': fields.function(
+            _get_implemented_count, string="Implementations", type='integer',
+            store={
+                'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
+            }),
     }
     _defaults = {
         'partner_weight': lambda *args: 0
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index c298832a2e6..67ac508ef00 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -112,6 +112,7 @@
                             <field name="grade_id" widget="selection"/>
                             <field name="activation" widget="selection"/>
                             <field name="partner_weight"/>
+                            <field name="assigned_partner_id"/>
                         </group>
                         <group>
                             <separator string="Partner Review" colspan="2"/>

From 2ed511855f41bf9f0780219abe5f540e859eea06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:29:36 +0200
Subject: [PATCH 41/66] [IMP] website_partner_crm: display partners in a
 category ordered by descending number of references + some tweaking in the
 view.

---
 .../controllers/main.py                       |  2 +-
 .../views/website_crm_partner_assign.xml      | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index c9621b7a0e9..86018ecd04d 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -101,7 +101,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         partner_ids = partner_obj.search(
             request.cr, SUPERUSER_ID, base_partner_domain,
             offset=pager['offset'], limit=self._references_per_page,
-            order="grade_id DESC, partner_weight DESC",
+            order="grade_id DESC, implemented_count DESC",
             context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index aa617c266bf..0dbfcdb15fc 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -29,12 +29,6 @@
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
             <div class="col-md-12">
-
-                <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                    <div class="form-group pull-right">
-                        <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                    </div>
-                </form>
                 <h1 class="text-center">
                     Looking For a Local Store?
                 </h1><h2 class="text-center text-muted">
@@ -70,7 +64,17 @@
 
             </div>
             
-            <div class="col-md-9" id="ref_content">
+            <div class="col-md-8 col-md-offset-1" id="ref_content">
+                <div class='navbar'>
+                    <div>
+                        <t t-call="website.pager"/>
+                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                            <div class="form-group pull-right">
+                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                            </div>
+                        </form>
+                    </div>
+                </div>
                 <div>
                     <p t-if="not partners">No result found</p>
                     <t t-foreach="partners" t-as="partner">
@@ -90,9 +94,9 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
-                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+                                <t t-if="partner.implemented_count">
                                     <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
-                                        <t t-raw="len([p.website_published for p in partner.implemented_partner_ids])"/> reference(s)
+                                        <t t-raw="partner.implemented_count"/> reference(s)
                                     </a></small>
                                 </t>
                             </div>

From 2ece5f9c4cd010108d16f008d9ef40e66ff1bc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:47:12 +0200
Subject: [PATCH 42/66] [IMP] website_customer: add an offset on the main
 content of customer display

---
 addons/website_customer/views/website_customer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index a2a5fc99c16..a41d5b77f5a 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -25,7 +25,7 @@
                 <div class="row">
                     <div class="col-md-3 mb32" id="ref_left_column">
                     </div>
-                    <div class="col-md-9" id="ref_content">
+                    <div class="col-md-8 col-md-offset-1" id="ref_content">
                         <div class='navbar mb0'>
                             <t t-call="website.pager">
                                <t t-set="classname" t-value="'pull-left'"/>

From e30aae504478f99b9244499ec69a583de2f7fb6d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 16 May 2014 16:47:29 +0200
Subject: [PATCH 43/66] [FIX] website_quote: message_post expects the
 attachments to be NOT in base64 format (opw 607477)

---
 addons/website_quote/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index a5f6ad2cfa6..6bb3b726edb 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -65,7 +65,7 @@ class sale_quote(http.Controller):
         order = order_obj.browse(request.cr, SUPERUSER_ID, order_id)
         if token != order.access_token:
             return request.website.render('website.404')
-        attachments=sign and [('signature.png', sign)] or []
+        attachments=sign and [('signature.png', sign.decode('base64'))] or []
         order_obj.signal_order_confirm(request.cr, SUPERUSER_ID, [order_id], context=request.context)
         message = _('Order signed by %s') % (signer,)
         self.__message_post(message, order_id, type='comment', subtype='mt_comment', attachments=attachments)

From a6b92693988b8ebe424417c325afd1bca4194cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 17:14:03 +0200
Subject: [PATCH 44/66] [REF] Achieved the same result with a sorting to avoid
 having to add a field in stable release

---
 .../crm_partner_assign/crm_partner_assign.py  | 39 ++++++++++---------
 .../controllers/main.py                       | 11 ++++--
 .../views/website_crm_partner_assign.xml      |  4 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 317d1f289eb..dac23ecae32 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -54,20 +54,22 @@ class res_partner_activation(osv.osv):
 class res_partner(osv.osv):
     _inherit = "res.partner"
 
-    def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
-        res = dict.fromkeys(ids, 0)
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = len(partner.implemented_partner_ids)
-        return res
+    # uncomment me in trunk
+    # def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
+    #     res = dict.fromkeys(ids, 0)
+    #     for partner in self.browse(cr, uid, ids, context=context):
+    #         res[partner.id] = len(partner.implemented_partner_ids)
+    #     return res
 
-    def _get_partner_from_implementation(self, cr, uid, ids, context=None):
-        pids = set()
-        for partner in self.browse(cr, uid, ids, context=context):
-            pids.add(partner.id)
-            if partner.assigned_partner_id:
-                pids.add(partner.assigned_partner_id.id)
-            pids = pids | set([p.id for p in partner.implemented_partner_ids])
-        return list(pids)
+    # uncomment me in trunk
+    # def _get_partner_from_implementation(self, cr, uid, ids, context=None):
+    #     pids = set()
+    #     for partner in self.browse(cr, uid, ids, context=context):
+    #         pids.add(partner.id)
+    #         if partner.assigned_partner_id:
+    #             pids.add(partner.assigned_partner_id.id)
+    #         pids = pids | set([p.id for p in partner.implemented_partner_ids])
+    #     return list(pids)
 
     _columns = {
         'partner_weight': fields.integer('Grade Weight',
@@ -87,11 +89,12 @@ class res_partner(osv.osv):
             'res.partner', 'assigned_partner_id',
             string='Implementation References',
         ),
-        'implemented_count': fields.function(
-            _get_implemented_count, string="Implementations", type='integer',
-            store={
-                'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
-            }),
+        # uncomment me in trunk
+        # 'implemented_count': fields.function(
+        #     _get_implemented_count, string="Implementations", type='integer',
+        #     store={
+        #         'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
+        #     }),
     }
     _defaults = {
         'partner_weight': lambda *args: 0
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 86018ecd04d..3dd96798d09 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -100,11 +100,14 @@ class WebsiteCrmPartnerAssign(http.Controller):
         # search partners matching current search parameters
         partner_ids = partner_obj.search(
             request.cr, SUPERUSER_ID, base_partner_domain,
-            offset=pager['offset'], limit=self._references_per_page,
-            order="grade_id DESC, implemented_count DESC",
-            context=request.context)
-        google_map_partner_ids = ','.join(map(str, partner_ids))
+            order="grade_id DESC",
+            context=request.context)  # todo in trunk: order="grade_id DESC, implemented_count DESC", offset=pager['offset'], limit=self._references_per_page
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
+        # remove me in trunk
+        partners.sort(key=lambda x: (-1 * (x.grade_id and x.grade_id.id or 0), len(x.implemented_partner_ids)), reverse=True)
+        partners = partners[pager['offset']:pager['offset'] + self._references_per_page]
+
+        google_map_partner_ids = ','.join(map(str, [p.id for p in partners]))
 
         values = {
             'countries': countries,
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 0dbfcdb15fc..b215a14e6cb 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -94,9 +94,9 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
-                                <t t-if="partner.implemented_count">
+                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
                                     <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
-                                        <t t-raw="partner.implemented_count"/> reference(s)
+                                        <t t-raw="len([p for p in partner.implemented_partner_ids if p.website_published])"/> reference(s)
                                     </a></small>
                                 </t>
                             </div>

From 6ab0f645bc9cfb23ac303e47a1b1eb0ceab19117 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 17 May 2014 07:10:37 +0000
Subject: [PATCH 45/66] Launchpad automatic translations update.

---
 addons/procurement/i18n/tr.po             |  50 ++--
 addons/product/i18n/tr.po                 |  34 +--
 addons/product_expiry/i18n/tr.po          |  16 +-
 addons/product_margin/i18n/tr.po          |  20 +-
 addons/purchase/i18n/tr.po                |  42 +--
 addons/purchase_analytic_plans/i18n/tr.po |  10 +-
 addons/purchase_requisition/i18n/tr.po    |  12 +-
 addons/sale/i18n/tr.po                    |  36 +--
 addons/sale_analytic_plans/i18n/tr.po     |  10 +-
 addons/sale_journal/i18n/tr.po            |  10 +-
 addons/sale_margin/i18n/tr.po             |  10 +-
 addons/sale_stock/i18n/tr.po              |  32 +-
 addons/stock/i18n/tr.po                   | 346 +++++++++-------------
 addons/stock_location/i18n/tr.po          |  20 +-
 addons/warning/i18n/tr.po                 |  32 +-
 15 files changed, 315 insertions(+), 365 deletions(-)

diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index e9b270ba7c6..192cc26c41c 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-30 15:08+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -121,7 +121,7 @@ msgstr "Şirket"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr "Satış Birimi Miktarı"
+msgstr "Satış Birim Miktarı"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -158,12 +158,12 @@ msgstr "Tedarikleri Hesapla"
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr "Enson hata"
+msgstr "En Son Hata"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Minimum Quantity"
-msgstr "Enaz Miktar"
+msgstr "En Az Miktar"
 
 #. module: procurement
 #: help:mrp.property,composition:0
@@ -173,7 +173,7 @@ msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "Enson tedarik"
+msgstr "En Son Tedarik"
 
 #. module: procurement
 #: field:procurement.order,message_ids:0
@@ -183,7 +183,7 @@ msgstr "Mesajlar"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Cancel Procurement"
-msgstr "Tedarik İptal et"
+msgstr "Tedarik İptal Et"
 
 #. module: procurement
 #: view:product.product:0
@@ -193,7 +193,7 @@ msgstr "Ürünler"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -224,7 +224,7 @@ msgstr "Stoklanabilir ürünler"
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Invalid Action!"
-msgstr "Geçersiz Eylem!"
+msgstr "Geçersiz İşlem!"
 
 #. module: procurement
 #: help:procurement.order,message_summary:0
@@ -299,7 +299,7 @@ msgstr "Onayla"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Multiple"
-msgstr "Çok Miktarlı"
+msgstr "Çoklu Miktar"
 
 #. module: procurement
 #: help:procurement.order,origin:0
@@ -318,7 +318,7 @@ msgstr "İşlenecek Tedarik Emirleri"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr "Enaz Envanter Kuralı"
+msgstr "En Az Envanter Kuralı"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:370
@@ -384,7 +384,7 @@ msgstr "Tedarik Hesapla"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr "Planlamacı Aralığı Günleri"
+msgstr "Zamanlayıcı Kapsama Günleri"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -541,7 +541,7 @@ msgstr "İlgili Tedarik Emirleri"
 #. module: procurement
 #: field:procurement.order,message_unread:0
 msgid "Unread Messages"
-msgstr "Okunmamış mesajlar"
+msgstr "Okunmamış Mesajlar"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
@@ -606,7 +606,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Lines"
-msgstr "Tedarik Kalemleri"
+msgstr "Tedarik Satırları"
 
 #. module: procurement
 #: view:product.product:0
@@ -684,7 +684,7 @@ msgstr ""
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Maximum Quantity"
-msgstr "Ençok Miktar"
+msgstr "En Çok Miktar"
 
 #. module: procurement
 #: field:procurement.order,message_is_follower:0
@@ -705,7 +705,7 @@ msgstr "Etkin"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Ürün Tedarik et"
+msgstr "Ürün Tedarikleri"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:312
@@ -778,7 +778,7 @@ msgstr "Şirketler"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr "Ek Bilgiler"
+msgstr "Ek Bilgisi"
 
 #. module: procurement
 #: field:procurement.order,message_summary:0
@@ -793,7 +793,7 @@ msgstr "Mkt. Çarpanı 0'dan büyük olmalıdır."
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr "Ençoğa Sipariş yap"
+msgstr "En Çoğa Sipariş Yap"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -819,7 +819,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr "Bileşim Özellikleri"
+msgstr "Bileşen Özellikleri"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:311
@@ -852,7 +852,7 @@ msgstr "Tedarik Çalıştır"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr "Yapıldı"
+msgstr "Biten"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -904,7 +904,7 @@ msgstr "Tüm Planlamacıları Hesapla"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr "Geç"
+msgstr "Geciken"
 
 #. module: procurement
 #: view:board.board:0
@@ -920,7 +920,7 @@ msgstr "Sipariş Noktaları"
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rules"
-msgstr "Enaz Stok Kuralları"
+msgstr "En Az Stok Kuralları"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -984,7 +984,7 @@ msgstr "Yürütülüyor"
 #: selection:procurement.order,procure_method:0
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr "Sipariş Ver"
+msgstr "Sipariş Verme"
 
 #. module: procurement
 #: field:product.template,supply_method:0
@@ -1057,7 +1057,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr "Tedarik Ara"
+msgstr "Tedarik Arama"
 
 #. module: procurement
 #: help:procurement.order,message:0
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index a1be39f49c1..d4de293d97b 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-28 13:52+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -148,7 +148,7 @@ msgstr "Bu fiyat listesi satırı için belirgin kural adı"
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "Unit of Measure -> UOS Coeff"
-msgstr "Ölçü Birimi -> Satış Birimi Kats"
+msgstr "Ölçü Birimi -> UOS Katsayı"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -480,7 +480,7 @@ msgstr "Tedarikler"
 #. module: product
 #: model:res.groups,name:product.group_mrp_properties
 msgid "Manage Properties of Product"
-msgstr "Ürün Özellikleri Yönetimi"
+msgstr "Ürün Özelliklerini Yönetme"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -652,7 +652,7 @@ msgstr "Görünüm"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr "Ürün  Şablonu"
+msgstr "Ürün Şablonu"
 
 #. module: product
 #: field:product.category,parent_left:0
@@ -1000,7 +1000,7 @@ msgstr "Bir İzleyicidir"
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr "Değişke Fiyat Ek"
+msgstr "Değişken Ekstra Fiyatı"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -1299,7 +1299,7 @@ msgstr "Satış Birimi"
 #. module: product
 #: field:product.product,message_unread:0
 msgid "Unread Messages"
-msgstr "Okunmamış mesajlar"
+msgstr "Okunmamış Mesajlar"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -1462,7 +1462,7 @@ msgstr "Ölçü Birimi"
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr "Enaz Miktar"
+msgstr "En Az Miktar"
 
 #. module: product
 #: view:product.supplierinfo:0
@@ -1506,7 +1506,7 @@ msgstr ""
 #: view:product.product:0
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Tüketilebilir"
+msgstr "Hammadde"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1653,7 +1653,7 @@ msgstr "Yuvarlama Hassasiyeti"
 #. module: product
 #: view:product.product:0
 msgid "Consumable products"
-msgstr "Tüketilebilir ürünler"
+msgstr "Sarf ürünler"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -1888,7 +1888,7 @@ msgstr "Hata!Enaz oran ençok orandan daha düşük olmalıdır."
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Manage Secondary Unit of Measure"
-msgstr "İkinci Ölçü Birimi Yönetimi"
+msgstr "İkinci Ölçü Birimini Yönetme"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2186,7 +2186,7 @@ msgstr "Tedarikçi Açıklaması"
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr "Teslimat Süresi"
+msgstr "Teslim Süresi"
 
 #. module: product
 #: view:product.product:0
@@ -2336,7 +2336,7 @@ msgstr "Resim"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "Ölçü Birimi kategorileri"
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_4_product_template
@@ -2359,7 +2359,7 @@ msgstr "Açıklamalar"
 #. module: product
 #: model:res.groups,name:product.group_stock_packaging
 msgid "Manage Product Packaging"
-msgstr "Ürün Ambalaj Yönetimi"
+msgstr "Ürün Paketleme Yönetimi"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
@@ -2488,7 +2488,7 @@ msgstr "Bütün paketin ağırlığı(palet ya da kutu)"
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr "örn: 1 * (bu birim) = oran * (referans birim)"
+msgstr "örn: 1 * (bu birim) = oran * (referans birimi)"
 
 #. module: product
 #: model:product.template,description:product.product_product_25_product_template
@@ -2523,7 +2523,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr "Montaj Hizmeti Maliyeti"
+msgstr "Montaj Hizmet Maliyeti"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index a453b3e5bfd..af4826769c2 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-27 16:09+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:27+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -30,7 +30,7 @@ msgstr "İnek Sütü"
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
-msgstr "Ürünün ömrü"
+msgstr "Ürünün Kulanım Tarihi"
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
-msgstr "Ürün kullanım süresi"
+msgstr "Ürün Kullanım Süresi"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -111,12 +111,12 @@ msgstr "Tarihler"
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
-msgstr "Ömür Sonu Tarihi"
+msgstr "Sonlanma Tarihi"
 
 #. module: product_expiry
 #: field:stock.production.lot,use_date:0
 msgid "Best before Date"
-msgstr "Son kullanım Tarihi"
+msgstr "Son Kullanım Tarihi"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index d531c57c2a9..5b0cac8755c 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-02 11:48+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -83,7 +83,7 @@ msgstr "# Satışda Faturalandı"
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr "Katalog fiyatı"
+msgstr "Katalog Fiyatı"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -125,7 +125,7 @@ msgstr "Oran Tarihi Başı"
 #. module: product_margin
 #: view:product.product:0
 msgid "Analysis Criteria"
-msgstr "Analiz kriteri"
+msgstr "Analiz Kriteri"
 
 #. module: product_margin
 #: view:product.product:0
@@ -156,7 +156,7 @@ msgstr "Tahmini Kâr * 100 / Tahmini Satış"
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices."
-msgstr "Ort. Müşteri Faturalar Fiyat."
+msgstr "Ort. Müşteri Faturalar Fiyatları."
 
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
@@ -229,7 +229,7 @@ msgstr "Toplam margin * 100 / Ciro"
 #. module: product_margin
 #: view:product.margin:0
 msgid "Open Margins"
-msgstr "Marj Aç"
+msgstr "Açık Marj"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -250,7 +250,7 @@ msgstr "Ürün"
 #. module: product_margin
 #: view:product.margin:0
 msgid "General Information"
-msgstr "Genel Bilgiler"
+msgstr "Genel Bilgisi"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -280,4 +280,4 @@ msgstr "ya da"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr "Ürün kar marjı"
+msgstr "Ürün Kar Marjı"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 672866e64e8..1df49ea4e16 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-05 10:43+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -390,7 +390,7 @@ msgstr "Mali Durumu"
 #. module: purchase
 #: field:purchase.config.settings,default_invoice_method:0
 msgid "Default invoicing control method"
-msgstr "Varsayılan fatura denetim yöntemi"
+msgstr "Varsayılan faturalama kontrol yöntemi"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking_in
@@ -636,7 +636,7 @@ msgstr "Ara Toplam"
 #. module: purchase
 #: field:purchase.order,shipped:0
 msgid "Received"
-msgstr "Alındı"
+msgstr "Kabul Edildi"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -825,7 +825,7 @@ msgstr "Sipariş Tarihi"
 #. module: purchase
 #: field:purchase.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr "Ürünler için farklı ölçü birimlerini yönetin"
+msgstr "Ürünler için farklı ölçü birimlerini yönetme"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -1082,7 +1082,7 @@ msgstr "Mesajlar ve iletişim geçmişi"
 #: field:purchase.order,warehouse_id:0
 #: field:stock.picking.in,warehouse_id:0
 msgid "Destination Warehouse"
-msgstr "Varış Deposu"
+msgstr "Hedef Konum"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:967
@@ -1107,7 +1107,7 @@ msgstr "Ölçü Birimi"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_pricelist:0
 msgid "Manage pricelist per supplier"
-msgstr "Her tedarikçi için fiyat listesi yürüt"
+msgstr "Her tedarikçi için fiyat listesi yürütme"
 
 #. module: purchase
 #: view:board.board:0
@@ -1180,7 +1180,7 @@ msgstr "Notlar"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_requisition:0
 msgid "Manage purchase requisitions"
-msgstr "Satınalma istekleri yürüt"
+msgstr "Satınalma isteklerini yürütme"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1216,7 +1216,7 @@ msgstr "İşlem Geçersiz!"
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr "Doğrulayan"
+msgstr "Onaylayan"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1259,7 +1259,7 @@ msgstr "Bir satınalma siparişi için oluşturulan faturalar"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Pre-generate draft invoices based on purchase orders"
-msgstr "Satınalma siparişlerine göre taslak fatura ön oluşturma"
+msgstr "Satınalma siparişinden oluşturulan taslak faturalardan"
 
 #. module: purchase
 #: help:product.template,purchase_ok:0
@@ -1498,7 +1498,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_double_validation:0
 msgid "Force two levels of approvals"
-msgstr "Onayları iki seviye zorlayın"
+msgstr "Onayları ikili düzeye zorlama"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
@@ -1600,7 +1600,7 @@ msgstr "Siparişleri birleştir"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on purchase orders"
-msgstr "Satınalma siparişlerinde birden çok analitik hesap kullanın"
+msgstr "Satınalma siparişlerinde birden çok analitik hesap kullanma"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1623,7 +1623,7 @@ msgstr "Elle Düzeltildi"
 #. module: purchase
 #: field:purchase.config.settings,group_costing_method:0
 msgid "Compute product cost price based on average cost"
-msgstr "Maliyet fiyatını ortalama fiyata göre hesaplayın"
+msgstr "Maliyet fiyatını ortalama fiyata göre hesaplama"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:352
@@ -1684,12 +1684,12 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr "Fatura Alındı"
+msgstr "Fatura Kabulu"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Faturalama Denetimi"
+msgstr "Fatura Kontrolu"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1739,7 +1739,7 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,location_id:0
 msgid "Destination"
-msgstr "Varış yeri"
+msgstr "Hedef Konum"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -1863,7 +1863,7 @@ msgstr ""
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: purchase
 #: field:res.partner,purchase_order_count:0
@@ -2013,7 +2013,7 @@ msgstr "Referans Ölçü Birimi"
 #: report:purchase.order:0
 #: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr "Doğrulayan"
+msgstr "Onaylayan"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -2078,7 +2078,7 @@ msgstr "Faturalandı"
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Satınalma Siparişi Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -2451,7 +2451,7 @@ msgstr "Yıl"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on purchase order lines"
-msgstr "Satınalma sipariş kalemlerine göre"
+msgstr "Satınalma sipariş satırlarına istinaden"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index aa9d1499655..c1a57ef737e 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-04 00:47+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:31+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -25,7 +25,7 @@ msgstr "Analitik Dağıtım"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr "Satınalma Siparişi Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 7ca648b593e..0d196e04544 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-14 17:11+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -72,7 +72,7 @@ msgstr "Sorumlu"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Requisition"
-msgstr "İsteği İptal et"
+msgstr "İsteği İptal Et"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -428,7 +428,7 @@ msgstr "Depo"
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
-msgstr "Enson İstek"
+msgstr "En Son İstek"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 814cea821c9..c7805a6826b 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-05 10:43+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -53,7 +53,7 @@ msgstr "Gün"
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Sipariş İptal et"
+msgstr "Siparişi İptal Et"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
@@ -161,7 +161,7 @@ msgstr "Varsayılan Ödeme Koşulu"
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr "Farklı ölçü birimleri kullanmaya izin ver"
+msgstr "Farklı ölçü birimleri kullanmaya izin verme"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -188,7 +188,7 @@ msgstr "Toplam Fiyat"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr "Satış siparişi kalemlerine göre fatura oluştur"
+msgstr "Satış siparişi satırlarına göre fatura oluşturma"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -286,7 +286,7 @@ msgstr "Tekliflerim"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr "Müşteri ya da ürünlere göre uyarıları yapılandırma"
+msgstr "Müşteri veya ürünlere göre uyarıları yapılandırma"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -461,7 +461,7 @@ msgstr "KDV :"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr "SatışSiparişi Kalemlerini Faturalamayı Etkinleştir"
+msgstr "SatışSiparişi Satırında Faturalamayı Etkinleştirme"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -676,7 +676,7 @@ msgstr "Satış Siparişi Kalemi"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Bir çalışan her sözleşmede farklı rollere sahip olabilir"
+msgstr "Bir çalışanın sözleşme başına farklı rollere sahip olma özelliği"
 
 #. module: sale
 #: view:sale.order:0
@@ -988,7 +988,7 @@ msgstr "Geçerli fiyat listesi kalemi bulunamadı!:"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr "Satış siparişlerinde oranları görüntüle"
+msgstr "Satış siparişlerinde karlılık oranını gösterme"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1364,7 +1364,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Cancel Quotation"
-msgstr "Teklif İptal et"
+msgstr "Teklifi İptal Et"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1417,7 +1417,7 @@ msgstr "Tedarik ve faturalamayı yürütür"
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr "Ödenmdi"
+msgstr "Ödendi"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_report_all
@@ -1448,7 +1448,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr "Satış siparişi kalemlerine indirim uygulamanızı sağlar"
+msgstr "Satış sipariş satırında indirim uygulama"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
@@ -1458,7 +1458,7 @@ msgstr "Paypal Url"
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr "Her müşteriye fiyat ayarlaması için fiyat listeleri kullanın"
+msgstr "Her müşteriye farklı fiyat ayarlaması için fiyat listeleri kullanma"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
@@ -1932,7 +1932,7 @@ msgstr "Tanımlı Müşteri Yok!"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr "Teslimat Adresi"
+msgstr "Teslim Adresi"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1947,7 +1947,7 @@ msgstr "Depo Özellikleri"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Cancel Line"
-msgstr "Satırı İptal et"
+msgstr "Satırı İptal Et"
 
 #. module: sale
 #: field:sale.order,message_ids:0
@@ -2258,7 +2258,7 @@ msgstr "İşlemdeki Satış Siparişleri"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Zaman çizelgelerine göre fatura hazırla"
+msgstr "Zaman çizelgelerine göre fatura hazırlama"
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2315,7 +2315,7 @@ msgstr "Satış Siparişi "
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
-msgstr "Sözleşme yönetimi kullanma"
+msgstr "Sözleşme yönetimini kullanma"
 
 #. module: sale
 #: help:sale.order,invoiced:0
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 54d265e6468..33f3071e426 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-13 18:23+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:33+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -30,4 +30,4 @@ msgstr "Satış Siparişi"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index cae6d28ce2e..3b4392dde4d 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-25 18:56+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Satışlar & Satınalmalar"
+msgstr "Satış & Satınalma"
 
 #. module: sale_journal
 #: view:res.partner:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index f5ca9b38540..ecc18dfb111 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-04 00:46+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -36,7 +36,7 @@ msgstr "Oran"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 011cefe3558..54dff3ed1bf 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-24 21:03+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -70,7 +70,7 @@ msgstr "Çıkışa ya da müşteriye yapılan hareket belgesi."
 #. module: sale_stock
 #: field:sale.config.settings,group_multiple_shops:0
 msgid "Manage multiple shops"
-msgstr "Birden çok mağaza yönet"
+msgstr "Çoklu mağaza yönetme"
 
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_validate0
@@ -80,7 +80,7 @@ msgstr "Doğrula"
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Sipariş İptal Et"
+msgstr "Siparişi İptal Et"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:209
@@ -144,7 +144,7 @@ msgstr "Proje Zaman Çizelgesi"
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr "Teslimat ve faturalama için farklı bir adrese izin verir "
+msgstr "Teslimat ve faturalama için farklı bir adrese izin verme "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:572
@@ -183,7 +183,7 @@ msgstr "Teslimat Emirleri"
 #: model:ir.model,name:sale_stock.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
 
 #. module: sale_stock
 #: model:process.transition,note:sale_stock.process_transition_packing0
@@ -211,7 +211,7 @@ msgstr "Depo"
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr "Güç Tahsisi"
+msgstr "Tahsisi Zorla"
 
 #. module: sale_stock
 #: field:sale.config.settings,default_order_policy:0
@@ -221,7 +221,7 @@ msgstr "Varsayılan faturalama yöntemi"
 #. module: sale_stock
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr "Teslimat Süresi"
+msgstr "Teslim Süresi"
 
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_deliveryorder0
@@ -303,17 +303,17 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
-msgstr "Faturaları sonra ve teslim emirlerine göre oluştur"
+msgstr "Faturaları sonra ve teslim emirlerine göre oluşturma"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
-msgstr "Sevkiyat maliyetlerini eklemeye izin verir"
+msgstr "Sevkiyat maliyetlerini eklemeye izin verme"
 
 #. module: sale_stock
 #: view:sale.order:0
 msgid "days"
-msgstr "günler"
+msgstr "gün"
 
 #. module: sale_stock
 #: field:sale.order.line,product_packaging:0
@@ -351,7 +351,7 @@ msgstr "Tüm ürünler mevcut olduğunda bir kerede teslim et."
 #. module: sale_stock
 #: model:res.groups,name:sale_stock.group_invoice_deli_orders
 msgid "Enable Invoicing Delivery orders"
-msgstr "Teslimat emirlerini faturalamayı etkinleştir"
+msgstr "Teslimat Emirlerinde Faturalamayı Etkinleştirme"
 
 #. module: sale_stock
 #: field:res.company,security_lead:0
@@ -410,7 +410,7 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.config.settings,group_mrp_properties:0
 msgid "Product properties on order lines"
-msgstr "Sipariş kalemlerindeki ürün özellikleri"
+msgstr "Sipariş satırında ürün özellikleri"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_order_policy:0
@@ -524,7 +524,7 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr "Paketleri Numarala"
+msgstr "Paket Numaraları"
 
 #. module: sale_stock
 #: field:sale.order,shipped:0
@@ -539,7 +539,7 @@ msgstr "Fatura Oluştur"
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
-msgstr "Görevlerin eylemlerine göre fatura hazırla"
+msgstr "Görev faaliyetlerine göre faturalar hazırlama"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index afdd99135c5..edf2e1fa4af 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-03-30 09:58+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-31 06:40+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr "Stok hareketi Bölünmüş Satırları"
+msgstr "Stok Hareketi Bölünmüş Satırları"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Confirm & Deliver"
-msgstr "Onay & Teslimat"
+msgstr "Onay & Teslim"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -70,7 +70,7 @@ msgstr "Ürün Miktarını Güncelle"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Zincirli Konum Sabit ise"
+msgstr "Zincirlenmiş Konum Sabit İse"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -129,8 +129,8 @@ msgid "Product Moves"
 msgstr "Ürün Hareketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Uygun miktarı belirtiniz"
@@ -149,13 +149,13 @@ msgstr ""
 "Üretici seri numarasından farklı olması durumunda dahili referans numarası"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Bu işlemi birden fazla stok kalemi üzerinde uygulayamazsınız."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Miktar eksi olamaz"
@@ -188,8 +188,6 @@ msgstr "örn. Yıllık Sayım"
 #: field:stock.partial.move.line,quantity:0
 #: field:stock.partial.picking.line,quantity:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.return.picking.memory,quantity:0
@@ -243,7 +241,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Teslimat/Kabul Ürünler"
+msgstr "Teslim/Kabul Ürünler"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -302,7 +300,7 @@ msgstr "Gelen Ürünler"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "Faturalandırılmamış"
+msgstr "Faturasız"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -323,7 +321,7 @@ msgid "Reference"
 msgstr "Referans"
 
 #. module: stock
-#: code:addons/stock/stock.py:1565
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "İşlenecek Ürünler"
@@ -364,12 +362,12 @@ msgstr ""
 "eklenebilmesi için html biçimindedir."
 
 #. module: stock
-#: code:addons/stock/stock.py:782
-#: code:addons/stock/stock.py:2517
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -377,9 +375,9 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #: code:addons/stock/wizard/stock_partial_picking.py:181
 #: code:addons/stock/wizard/stock_partial_picking.py:192
-#: code:addons/stock/wizard/stock_return_picking.py:102
-#: code:addons/stock/wizard/stock_return_picking.py:109
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -412,7 +410,7 @@ msgstr "İş Ortağı"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr "Teslimatlarda şikayete izin ver"
+msgstr "Teslimatlarda şikayete izin verme"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -464,7 +462,7 @@ msgstr "İç Konum"
 #. module: stock
 #: view:stock.move:0
 msgid "Split in Serial Number"
-msgstr "Deri Numaralarına ayır"
+msgstr "Seri Numaralarına Ayır"
 
 #. module: stock
 #: view:stock.location:0
@@ -484,7 +482,7 @@ msgstr "Gecikme (Gün)"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr "Teslimata Hazırla"
+msgstr "Teslime Hazırla"
 
 #. module: stock
 #: code:addons/stock/stock.py:2525
@@ -500,9 +498,6 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "Uygunluk Bekliyor"
@@ -511,9 +506,6 @@ msgstr "Uygunluk Bekliyor"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -573,7 +565,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr "Lojistik birimlerinde (paletler) seri numaralarını izle"
+msgstr "Lojistik birimlerde (paletler) seri numaralarını izleme"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -586,7 +578,7 @@ msgstr ""
 "sayısı. Bu müşterilerine söz verdiğiniz süredir."
 
 #. module: stock
-#: code:addons/stock/product.py:195
+#: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
 msgstr "Ürünler: "
@@ -603,7 +595,7 @@ msgid "Draft Physical Inventories"
 msgstr "Fiziksel Taslak Envanterler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1806
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -649,7 +641,7 @@ msgid "Item Labels"
 msgstr "Öğe Etiketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1373
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "Sipariş bakiyesi <em>%s</em>  <b>oluşturulmuştur</b>."
@@ -702,7 +694,7 @@ msgstr "Dahili Hareketler"
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "Varış Konumu"
+msgstr "Hedef Konumu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
@@ -730,8 +722,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Order(Origin)"
 msgstr "Sipariş (Orjini)"
 
@@ -768,10 +758,9 @@ msgstr "Konum / Ürün"
 #. module: stock
 #: field:stock.move,partner_id:0
 msgid "Destination Address "
-msgstr "Varış Adresi "
+msgstr "Hedef Adresi "
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,reception_count:0
 msgid "Reception"
 msgstr "Kabul"
@@ -822,8 +811,6 @@ msgstr "Planlanan Yıl"
 #: view:stock.picking.in:0
 #: field:stock.picking.in,state:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,state:0
 msgid "Status"
 msgstr "Durumu"
@@ -922,7 +909,7 @@ msgstr ""
 "Defteridir."
 
 #. module: stock
-#: code:addons/stock/stock.py:2296
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -951,7 +938,7 @@ msgid "Reference must be unique per Company!"
 msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: stock
-#: code:addons/stock/product.py:448
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Gelecek Kabuller"
@@ -981,7 +968,7 @@ msgstr "Konum Adresi"
 #: view:stock.move:0
 #: view:stock.move.scrap:0
 msgid "Scrap Products"
-msgstr "Hurda Ürünler"
+msgstr "Fire Ürünler"
 
 #. module: stock
 #: view:product.product:0
@@ -990,8 +977,6 @@ msgstr "- güncelle"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Weight"
 msgstr "Ağırlık"
 
@@ -1037,7 +1022,7 @@ msgid "December"
 msgstr "Aralık"
 
 #. module: stock
-#: code:addons/stock/stock.py:1204
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1062,7 +1047,7 @@ msgid "Change Product Quantity"
 msgstr "Ürün Miktarını Değiştir"
 
 #. module: stock
-#: code:addons/stock/product.py:464
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Gelecek Kâr&Zarar"
@@ -1086,7 +1071,7 @@ msgstr "Oluşturma tarihi, genellikle sipariş tarihidir."
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Scrap"
-msgstr "Hurda"
+msgstr "Fire"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
@@ -1099,7 +1084,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Bu ürün için seri numarası atamanız gerekir."
 
 #. module: stock
-#: code:addons/stock/stock.py:2299
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Ürün kategorisi ile ilgili yevmiye tanımlayınız: \"%s\" (id: %d)"
@@ -1124,7 +1109,7 @@ msgstr "Birim Fiyat"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Zamanlan Tarih"
+msgstr "Planlanan Tarih"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -1146,8 +1131,6 @@ msgstr "ParaBirimi"
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Journal"
 msgstr "Yevmiye"
 
@@ -1207,7 +1190,7 @@ msgstr "Ters Tranferler"
 #. module: stock
 #: field:stock.config.settings,group_uos:0
 msgid "Invoice products in a different unit of measure than the sales order"
-msgstr "Satış siparişinde ürünleri farklı ölçü biriminde faturalandırma"
+msgstr "Satış siparişinde ürünleri farklı ölçü biriminden faturalama"
 
 #. module: stock
 #: help:stock.location,active:0
@@ -1226,7 +1209,7 @@ msgstr ""
 "seçin."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
@@ -1353,7 +1336,7 @@ msgid "Author"
 msgstr "Yazar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1851
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1362,8 +1345,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Internal Shipment :"
 msgstr "Dahili Sevkiyat :"
 
@@ -1391,7 +1372,7 @@ msgid "Supplier"
 msgstr "Tedarikçi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2908
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1478,7 +1459,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "İş Ortağı Konumları"
+msgstr "İş Ortağı Konumu"
 
 #. module: stock
 #: selection:stock.picking.in,state:0
@@ -1502,12 +1483,10 @@ msgstr "Planlanmış Zaman"
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "Tüketim Hareketi"
+msgstr "Sarf Hareketi"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Delivery Order :"
 msgstr "Teslimat Siparişi:"
 
@@ -1609,7 +1588,7 @@ msgstr ""
 "kullanılırken)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1919
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Uyarı: No Back Order"
@@ -1631,13 +1610,13 @@ msgid "To be refunded/invoiced"
 msgstr "İade edilecek/faturalanacak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sadece taslak hareketlerini silebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr "Bu %s ürününü %s görünüm türlü bir konuma taşıyamazsınız."
@@ -1666,7 +1645,7 @@ msgstr "Taslak"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "Müşteri Teslimat Süresi"
+msgstr "Müşteri Teslim Süresi"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1674,7 +1653,7 @@ msgid "Additional Info"
 msgstr "Ek Bilgisi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2697
+#: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
 msgstr "Hareket #%s için kısmi toplama verisi eksik."
@@ -1690,7 +1669,7 @@ msgid "Incoming Shipments already processed"
 msgstr "Halihazırda işlenmiş Gelen sevkiyatlar"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1700,7 +1679,7 @@ msgstr ""
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Stok Konumları"
+msgstr "Stok Konumu"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1731,7 +1710,7 @@ msgstr "Böl"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_out
 msgid "Delivery Slip"
-msgstr "Teslimat Makbuzu"
+msgstr "Teslim Makbuzu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
@@ -1773,9 +1752,6 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
-#: field:stock.picking,date:0
-#: field:stock.picking.in,date:0
-#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1866,7 +1842,7 @@ msgid "Order Date"
 msgstr "Sipariş Tarihi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1896,7 +1872,7 @@ msgstr "Zincirleme Tedarik Süresi"
 #. module: stock
 #: field:stock.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr "Ürünler için farklı ölçü birimleri yönetimi"
+msgstr "Ürünler için farklı ölçü birimleri yönetme"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
@@ -1904,10 +1880,10 @@ msgid "Stock Invoice Onshipping"
 msgstr "Sevkiyatta Stok Faturalandırma"
 
 #. module: stock
-#: code:addons/stock/stock.py:2517
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr "hurda için lütfen artı bir miktar belirtin."
+msgstr "Fire için lütfen artı bir miktar belirtin."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@@ -1942,7 +1918,7 @@ msgstr "Eylül"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr "günler"
+msgstr "gün"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1969,8 +1945,6 @@ msgstr "Birikmiş Sipariş mi (backorder)"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Incoming Shipment :"
 msgstr "Gelen Sevkiyat:"
 
@@ -2060,7 +2034,7 @@ msgid "Shelf 2"
 msgstr "Raf 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:543
+#: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
 msgstr "Lot satırları kaldıramazsınız."
@@ -2084,7 +2058,7 @@ msgid "Localization"
 msgstr "Lokalizasyon"
 
 #. module: stock
-#: code:addons/stock/product.py:460
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "TeslimEdilen Miktar"
@@ -2184,7 +2158,7 @@ msgstr "Stok Konumu"
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr "_Teslimat"
+msgstr "_Teslim"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2398,7 +2372,7 @@ msgstr "Fiyat"
 #. module: stock
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
-msgstr "Kullanıcı bir teslimat emrini tamamladığında fatura oluştur ve aç"
+msgstr "Kullanıcı bir teslim emrini tamamladığında fatura oluşturma ve açma"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2408,10 +2382,10 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr "Stok hareketi başına muhasebe kayıtlarını oluşturun"
+msgstr "Her stok hareketi için muhasebe kayıtları oluşturma"
 
 #. module: stock
-#: code:addons/stock/product.py:450
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Alınan Miktar"
@@ -2453,8 +2427,6 @@ msgstr "Adı"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Supplier Address :"
 msgstr "Tedarikçi Adresi"
 
@@ -2486,11 +2458,11 @@ msgstr "Lojistik sevikayat ünitesi: palet, kutu, paket ..."
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr "Müşteri Konumları"
+msgstr "Müşteri Konumu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
-#: code:addons/stock/stock.py:2907
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Kullanıcı Hatası!"
@@ -2651,7 +2623,7 @@ msgstr "Ölçü Birimi"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr "Çoklu konum ve depo yönet"
+msgstr "Çoklu konum ve depo yönetme"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
@@ -2703,7 +2675,7 @@ msgstr "Diğerleri"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Hurda"
+msgstr "Fire"
 
 #. module: stock
 #: field:product.product,track_incoming:0
@@ -2721,7 +2693,7 @@ msgid "Warehouse board"
 msgstr "Depo panosu"
 
 #. module: stock
-#: code:addons/stock/product.py:470
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Gelecek Miktar"
@@ -2729,7 +2701,7 @@ msgstr "Gelecek Miktar"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr "Seri Numaraları Yönet"
+msgstr "Seri Numaraları Yönetme"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2788,7 +2760,7 @@ msgid "Products"
 msgstr "Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2287
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2812,7 +2784,7 @@ msgstr "Fiyatı Değiştir"
 #: field:stock.picking.in,move_type:0
 #: field:stock.picking.out,move_type:0
 msgid "Delivery Method"
-msgstr "Teslimat Yöntemi"
+msgstr "Teslim Yöntemi"
 
 #. module: stock
 #: help:report.stock.move,location_dest_id:0
@@ -2830,7 +2802,7 @@ msgid "Outgoing Products"
 msgstr "Giden Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2293
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2852,7 +2824,7 @@ msgid "Move"
 msgstr "Hareket"
 
 #. module: stock
-#: code:addons/stock/product.py:466
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Kâr&Zarar Miktarı"
@@ -2947,8 +2919,6 @@ msgstr "Kaynak"
 #: field:stock.picking,location_id:0
 #: field:stock.picking.in,location_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,location_id:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
@@ -2969,10 +2939,10 @@ msgstr "Envanter İptali"
 #. module: stock
 #: view:stock.move:0
 msgid "Cancel Move"
-msgstr "Hareketi İptal et"
+msgstr "Hareketi İptal Et"
 
 #. module: stock
-#: code:addons/stock/stock.py:2290
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2995,10 +2965,10 @@ msgstr "Sabit Konum"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr "hurda"
+msgstr "fire"
 
 #. module: stock
-#: code:addons/stock/stock.py:1920
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3025,7 +2995,7 @@ msgstr "Seri numarası ile Stok raporu"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Transfer"
-msgstr "Aktarmayı iptal et"
+msgstr "Aktarmayı İptal Et"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -3100,13 +3070,13 @@ msgid "Stock Journal"
 msgstr "Stok Yevmiye"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:176
+#: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
 msgstr "%s-%s-dönen"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:86
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktif Kimlik Bağlam bölümünde ayarlanmamış"
@@ -3126,10 +3096,10 @@ msgstr "Raf"
 #: model:ir.actions.act_window,name:stock.move_scrap
 #: view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Hurda Hareketi"
+msgstr "Fire Hareketi"
 
 #. module: stock
-#: help:stock.move,prodlot_id:0
+#: help:stock.move,lot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 "Seri numarası üretimi üzerinde bir seri numarası koymak için kullanılmaktadır"
@@ -3175,7 +3145,7 @@ msgid "Date of Completion"
 msgstr "Tamamlama Tarihi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr "Bu %s ürününü %s görünüm türündeki konumdan taşıyamazsınız."
@@ -3183,7 +3153,7 @@ msgstr "Bu %s ürününü %s görünüm türündeki konumdan taşıyamazsınız.
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr "Firmanız"
+msgstr "Firma"
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -3258,10 +3228,8 @@ msgstr "Revizyon Tarihi"
 
 #. module: stock
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
+#: field:report.stock.inventory,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Lot"
 msgstr "Lot"
 
@@ -3292,10 +3260,8 @@ msgstr "Kullanılabilir Yap"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Contact Address :"
-msgstr "İlgili Adresi:"
+msgstr "Kontak Adresi:"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
@@ -3329,7 +3295,7 @@ msgstr "Özellikler"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr "Ana Sihirbaz"
+msgstr "Üst Sihirbaz"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -3337,7 +3303,7 @@ msgstr "Ana Sihirbaz"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Teslimat Şekilleri"
+msgstr "Teslim Şekilleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
@@ -3473,7 +3439,7 @@ msgstr "Revizyon Adı"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr "Lojistik Seri Numaralarını Yönet"
+msgstr "Lojistik Seri Numaralarını Yönetme"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3506,15 +3472,15 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:2545
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr "%s %s %s olarak <b>taşındı</b> hurda."
+msgstr "%s %s %s olarak <b>taşındı</b> fire."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "Tüketici Paketleri"
+msgstr "Müşteri Paketleri"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3525,9 +3491,6 @@ msgstr "Tüketici Paketleri"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Done"
 msgstr "Biten"
 
@@ -3556,7 +3519,7 @@ msgid "Date done"
 msgstr "Bitim tarih"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3583,7 +3546,7 @@ msgstr "Acil Değil"
 #. module: stock
 #: view:stock.move:0
 msgid "Scheduled"
-msgstr "Zamanlandı"
+msgstr "Planlanan"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3634,7 +3597,7 @@ msgid "Stock"
 msgstr "Stok"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:226
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Dönen SeçimListeleri"
@@ -3709,7 +3672,7 @@ msgid "Assigned Internal Moves"
 msgstr "Atanmış Dahili Hareketler"
 
 #. module: stock
-#: code:addons/stock/stock.py:804
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Stok hareketleri olmadan seçim listesi işleyemiyor."
@@ -3755,7 +3718,7 @@ msgstr "Koridor (X)"
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
 msgstr ""
-"Ürünleri üzerinde çeşitli paketleme yöntemleri tanımlamak için izin ver"
+"Ürünler üzerinde çeşitli paketleme yöntemleri tanımlama için izin verme"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3783,7 +3746,7 @@ msgstr "Başka bir İşlem Bekliyor"
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr "Tedarikçi Konumları"
+msgstr "Tedarikçi Konumu"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3957,7 +3920,7 @@ msgid "Inventory Move"
 msgstr "Envanter Hareketi"
 
 #. module: stock
-#: code:addons/stock/product.py:476
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Gelecek Üretimler"
@@ -4082,24 +4045,21 @@ msgstr "Lot Envanteri"
 #: model:ir.model,name:stock.model_stock_production_lot
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.change.product.qty,lot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
+#: field:stock.inventory.line.split.lines,lot_id:0
+#: field:stock.move,lot_id:0
 #: view:stock.move.split:0
 #: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.partial.move.line,lot_id:0
+#: field:stock.partial.picking.line,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 #: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-#: field:stock.return.picking.memory,prodlot_id:0
+#: field:stock.report.prodlots,lot_id:0
 msgid "Serial Number"
 msgstr "Seri Numarası"
 
@@ -4162,7 +4122,7 @@ msgid "Non European Customers"
 msgstr "Avrupalı Olmayan Müşteriler"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #: code:addons/stock/product.py:110
 #: code:addons/stock/product.py:113
 #: code:addons/stock/product.py:120
@@ -4170,19 +4130,18 @@ msgstr "Avrupalı Olmayan Müşteriler"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:543
-#: code:addons/stock/stock.py:804
-#: code:addons/stock/stock.py:1204
-#: code:addons/stock/stock.py:1213
-#: code:addons/stock/stock.py:2287
-#: code:addons/stock/stock.py:2290
-#: code:addons/stock/stock.py:2293
-#: code:addons/stock/stock.py:2296
-#: code:addons/stock/stock.py:2299
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/stock.py:2525
-#: code:addons/stock/stock.py:2634
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -4280,7 +4239,7 @@ msgstr ""
 "durumunda Zincirlenen Konum."
 
 #. module: stock
-#: code:addons/stock/stock.py:1882
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4321,7 +4280,7 @@ msgstr "Onaylandı"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Onaylama"
+msgstr "Doğrula"
 
 #. module: stock
 #: help:stock.location,icon:0
@@ -4354,7 +4313,7 @@ msgid "Followers"
 msgstr "İzleyiciler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2634
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr "Eksi ya da sıfır miktarlı bir hareket kullanılamıyor."
@@ -4425,7 +4384,7 @@ msgstr "Ayarlar"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr "Çoklu Lokayonları ve Depoları Yönet"
+msgstr "Çoklu Lokayonları ve Depoları Yönetme"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4442,7 +4401,7 @@ msgstr ""
 "giriş hesabı borçlandırılacaktır."
 
 #. module: stock
-#: code:addons/stock/stock.py:2860
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "ENV:"
@@ -4465,7 +4424,7 @@ msgid "Chaining Journal"
 msgstr "Zincirleme Yevmiye"
 
 #. module: stock
-#: code:addons/stock/stock.py:782
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Yeterli stok yok, ürünler rezerve edilemiyor."
@@ -4508,7 +4467,7 @@ msgstr ""
 "olmayacaktır."
 
 #. module: stock
-#: code:addons/stock/product.py:458
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Gelecek Teslimatlar"
@@ -4531,7 +4490,7 @@ msgid "Auto Validate"
 msgstr "Otomatik Onaylama"
 
 #. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Seri Numarası için yetersiz Stok!"
@@ -4629,14 +4588,14 @@ msgid "Invoiced"
 msgstr "Faturalandı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1881
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Bilgisi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1213
+#: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
 msgstr "Bu %s durumundaki toplamayı kaldıramazsınız!"
@@ -4668,12 +4627,10 @@ msgstr "Mak. Beklenen Tarih"
 #: field:stock.picking.in,auto_picking:0
 #: field:stock.picking.out,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Otomatik Seçimlistesi"
+msgstr "Otomatik Seçim listesi"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Customer Address :"
 msgstr "Müşteri Adresi :"
 
@@ -4731,7 +4688,7 @@ msgstr "Bu envanterleri birleştirmek istiyor musunuz?"
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Date of Delivery"
-msgstr "Teslimat Tarihi"
+msgstr "Teslim Tarihi"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -4739,7 +4696,7 @@ msgid "Shelves (Y)"
 msgstr "Raflar (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4754,7 +4711,7 @@ msgid "Serial Number Revision"
 msgstr "Seri No Revizyonu"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr "Ürün Kategorisi için değerleme hesabı belirtin: %s."
@@ -4769,7 +4726,7 @@ msgstr ""
 "                Bu, claim_from_delivery modülünü kurar."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Lütfencsıfır olmayan  enaz bir miktar girin."
@@ -4787,7 +4744,7 @@ msgstr "Kullanıcı"
 #. module: stock
 #: field:stock.config.settings,module_stock_location:0
 msgid "Create push/pull logistic rules"
-msgstr "İtme/çekme lojistik kuralları oluşturun"
+msgstr "İtme/çekme lojistik kuralları oluşturma"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4802,7 +4759,7 @@ msgid "November"
 msgstr "Kasım"
 
 #. module: stock
-#: code:addons/stock/product.py:472
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Planlanmayan Miktar"
@@ -4813,7 +4770,7 @@ msgid "Chained Company"
 msgstr "Zincirlenen Firma"
 
 #. module: stock
-#: view:stock.picking:0
+#: view:stock.picking.out:0
 msgid "Check Availability"
 msgstr "Uygunluk Kontrolu"
 
@@ -4840,7 +4797,7 @@ msgstr ""
 "doğru izlenebilirliğini elde edebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
@@ -4854,17 +4811,17 @@ msgstr "Gelecekteki Stok Hareketleri"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr "Hareket Geçmşi (üst hareketler)"
+msgstr "Hareket Geçmişi (üst hareketler)"
 
 #. module: stock
-#: code:addons/stock/product.py:454
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Sonraki Stok"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Hata"
@@ -4994,8 +4951,6 @@ msgstr "Gecikmeler"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Schedule Date"
 msgstr "Program Tarihi"
 
@@ -5033,8 +4988,6 @@ msgstr "Gerçek"
 #. module: stock
 #: field:stock.move,name:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
@@ -5058,10 +5011,9 @@ msgid "Deliver"
 msgstr "Teslim"
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,delivery_count:0
 msgid "Delivery"
-msgstr "Teslimat"
+msgstr "Teslim"
 
 #. module: stock
 #: view:stock.fill.inventory:0
@@ -5080,7 +5032,7 @@ msgid "Location Content"
 msgstr "Konum İçeriği"
 
 #. module: stock
-#: code:addons/stock/product.py:478
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Üretilen Miktar"
@@ -5181,7 +5133,7 @@ msgstr "Onay & Tranfer"
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Hurda Konumu"
+msgstr "Fire Konumu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -5305,8 +5257,6 @@ msgstr "İşlenmeye Hazır"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Warehouse Address :"
 msgstr "Depo Adresi :"
 
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 89c4540526b..79a21f0ebaf 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-13 23:40+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:50+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:37+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -80,7 +80,7 @@ msgstr "X konumunda alırken,Y konumuna taşı"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr "İç"
+msgstr "Dahili"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -95,7 +95,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr "Yer"
+msgstr "Konum"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
@@ -196,12 +196,12 @@ msgstr "Stoktan Al"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr "farklı bir konumdan alındı"
+msgstr "Farklı bir konumdan alındı"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr "Partner Adresi"
+msgstr "İş Ortağı Adresi"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
@@ -287,7 +287,7 @@ msgstr "Uygun Değil"
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "Geçikme (Gün)"
+msgstr "Geçikme (gün)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:67
@@ -360,7 +360,7 @@ msgstr "İşlem Türü"
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr "TeminEtme Metodu"
+msgstr "Tedarik Metodu"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 8bb3ab4cc17..4bca03b8691 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-02 03:28+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:50+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
 #: field:product.product,purchase_line_warn:0
 msgid "Purchase Order Line"
-msgstr "Satınalma Sipariş Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
@@ -30,7 +30,7 @@ msgstr "Gelen Sevkiyatlar"
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr "Alış Sipariş Kalemi için Mesaj"
+msgstr "Satınalma Sipariş Satırı için Mesaj"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -40,7 +40,7 @@ msgstr "Toplama Listesi"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr "Bu Ürün Satıalınırken yapılacak Uyarı"
+msgstr "Bu Ürün Satınalınırken Yapılacak Uyarı"
 
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
@@ -61,12 +61,12 @@ msgstr "Uyarılar"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr "Mesaj Engelleme"
+msgstr "Mesajı Engelleme"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr "Faturadaki Uyarı"
+msgstr "Faturada Uyarı"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -87,7 +87,7 @@ msgstr "Fatura"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "Bu Ürün Satılırken yapılacak Uyarı"
+msgstr "Bu Ürün Satılırken Yapılacak Uyarı"
 
 #. module: warning
 #: field:res.partner,picking_warn:0
@@ -139,7 +139,7 @@ msgstr "%s için uyarı !"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sales Order"
-msgstr "Satış Siparişinde uyarı"
+msgstr "Satış Siparişinde Uyarı"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -149,17 +149,17 @@ msgstr "Fatura Mesajı"
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sales Order"
-msgstr "Satış siparişi için mesaj"
+msgstr "Satış Siparişi için Mesaj"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "Toplama Uyarısı"
+msgstr "Toplamada Uyarı"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr "Satınalma Siparişi Uyarısı"
+msgstr "Satınalma Siparişinde Uyarı"
 
 #. module: warning
 #: code:addons/warning/warning.py:68
@@ -177,7 +177,7 @@ msgstr "%s için uyarı"
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sales Order Line"
-msgstr "Satış Siparişi kalemi için mesaj"
+msgstr "Satış Sipariş Satırı için Mesaj"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -214,4 +214,4 @@ msgstr "Teslimat Emirleri"
 #: model:ir.model,name:warning.model_sale_order_line
 #: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"

From c2584c8cb06f80de231cc6bec479de5f730a0326 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 18 May 2014 05:53:48 +0000
Subject: [PATCH 46/66] Launchpad automatic translations update.

---
 addons/procurement/i18n/tr.po             | 2 +-
 addons/product/i18n/tr.po                 | 2 +-
 addons/product_expiry/i18n/tr.po          | 2 +-
 addons/product_margin/i18n/tr.po          | 2 +-
 addons/purchase/i18n/tr.po                | 2 +-
 addons/purchase_analytic_plans/i18n/tr.po | 2 +-
 addons/purchase_requisition/i18n/tr.po    | 2 +-
 addons/sale/i18n/tr.po                    | 2 +-
 addons/sale_analytic_plans/i18n/tr.po     | 2 +-
 addons/sale_journal/i18n/tr.po            | 2 +-
 addons/sale_margin/i18n/tr.po             | 2 +-
 addons/sale_stock/i18n/tr.po              | 2 +-
 addons/stock/i18n/nl.po                   | 6 +++---
 addons/stock/i18n/tr.po                   | 2 +-
 addons/stock_location/i18n/tr.po          | 2 +-
 addons/warning/i18n/tr.po                 | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 192cc26c41c..1fb6f2a367a 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: procurement
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index d4de293d97b..4550569506c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index af4826769c2..f25145822c5 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_expiry
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 5b0cac8755c..609fd70c66d 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_margin
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 1df49ea4e16..3304d4ea63f 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index c1a57ef737e..9df8a5ff6bc 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 0d196e04544..4310ba96a8e 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_requisition
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index c7805a6826b..ca8f9db41f8 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 33f3071e426..c7fbd7e01af 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 3b4392dde4d..addc9a5f232 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index ecc18dfb111..96a2fadd38e 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 54dff3ed1bf..08fb7041a3d 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index ad5f42d7cfa..ed31a02907f 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-14 18:21+0000\n"
+"PO-Revision-Date: 2014-05-17 08:22+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
@@ -2415,7 +2415,7 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr "Maak boekingen per voorraadmutatie"
+msgstr "Maak financiële boekingen per voorraadmutatie (voorraadwaardering)"
 
 #. module: stock
 #: code:addons/stock/product.py:449
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index edf2e1fa4af..a6a2e5c6b6e 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 79a21f0ebaf..5668804335a 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock_location
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 4bca03b8691..f5eedb394e9 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: warning

From 7f0a167cf755d9cf54f0a65000d35f0c2adf7f22 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Sun, 18 May 2014 13:25:23 +0200
Subject: [PATCH 47/66] [REVERT]
 revid:jke@openerp.com-20140507120144-m177kqxa3fbfl37r: create_picking checks
 if the order is in state draft before doing anything. Writing the state
 'paid' just before calling this method is then not a good idea

---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 0a2b96fd273..3480ab47221 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1167,8 +1167,8 @@ class pos_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         self.create_picking(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):

From 571e23f3d56c0ff34ef9182de0b1736d4e2f23a9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 19 May 2014 12:30:20 +0200
Subject: [PATCH 48/66] [FIX] marketing_campaign: server actions always return
 None or False, and the return value of method _process_wi_action should
 return True whatever what the server action returns

If the server actions returned None instead of False, the next activity was not triggered, while it should
---
 addons/marketing_campaign/marketing_campaign.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index d4b05c50127..6a3c4de7f49 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -494,11 +494,9 @@ class marketing_campaign_activity(osv.osv):
                               active_ids=[workitem.res_id],
                               active_model=workitem.object_id.model,
                               workitem=workitem)
-        res = server_obj.run(cr, uid, [activity.server_action_id.id],
+        server_obj.run(cr, uid, [activity.server_action_id.id],
                              context=action_context)
-        # server action return False if the action is performed
-        # except client_action, other and python code
-        return res == False and True or res
+        return True
 
     def process(self, cr, uid, act_id, wi_id, context=None):
         activity = self.browse(cr, uid, act_id, context=context)

From e7ea924697d244dd1d94855693caaa50882e7d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 13:50:51 +0200
Subject: [PATCH 49/66] [FIX] website_forum: do not display closed of offensive
 questions in searches. Users can still go on the question using their direct
 link.

---
 addons/website_forum/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 69a420be320..cb9a79edb27 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -96,7 +96,7 @@ class WebsiteForum(http.Controller):
         Post = request.registry['forum.post']
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
 
-        domain = [('forum_id', '=', forum.id), ('parent_id', '=', False)]
+        domain = [('forum_id', '=', forum.id), ('parent_id', '=', False), ('state', '=', 'active')]
         if search:
             domain += ['|', ('name', 'ilike', search), ('content', 'ilike', search)]
         if tag:
@@ -123,7 +123,7 @@ class WebsiteForum(http.Controller):
             url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
         else:
             url = "/forum/%s" % slug(forum)
-        
+
         url_args = {}
         if search:
             url_args['search'] = search

From 42d8a90afd38f1bb0ed5b527e73321256ee702d7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 May 2014 13:59:38 +0200
Subject: [PATCH 50/66] [IMP] minor changes to sitemap

---
 addons/website/controllers/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index df958d969dd..460f64147e8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
-SITEMAP_CACHE_TIME = datetime.timedelta(hours=6)
+SITEMAP_CACHE_TIME = datetime.timedelta(hours=12)
 
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
@@ -76,7 +76,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         mimetype ='application/xml;charset=utf-8'
         content = None
 
-        def create_map(url, content):
+        def create_sitemap(url, content):
             ira.create(cr, uid, dict(
                 datas=content.encode('base64'),
                 mimetype=mimetype,
@@ -112,7 +112,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                     if not first_page:
                         first_page = page
                     pages += 1
-                    create_map('/sitemap-%d.xml' % pages, page)
+                    create_sitemap('/sitemap-%d.xml' % pages, page)
                 else:
                     break
             if not pages:
@@ -125,7 +125,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                     pages=range(1, pages + 1),
                     url_root=request.httprequest.url_root,
                 ), context=context)
-            create_map('/sitemap.xml', content)
+            create_sitemap('/sitemap.xml', content)
 
         return request.make_response(content, [('Content-Type', mimetype)])
 

From 08285450908168d39f0de0d38d7055ee830732ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 14:40:24 +0200
Subject: [PATCH 51/66] [IMP] website_forum: display only the 100 last
 activities + order by date desc

---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index cb9a79edb27..23a7b9ad538 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -535,7 +535,7 @@ class WebsiteForum(http.Controller):
 
         #activity by user.
         model, comment = Data.get_object_reference(cr, uid, 'mail', 'mt_comment')
-        activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], context=context)
+        activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], order='date DESC', limit=100, context=context)
         activities = Activity.browse(cr, uid, activity_ids, context=context)
 
         posts = {}

From 844cf8d5657c60288f98238de0d30b98b5634685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 14:40:55 +0200
Subject: [PATCH 52/66] [FIX] website_forum: fixed crash when displaying a
 closed question for public users; indeed partner data was displayed without
 using the contact widget.

---
 addons/website_forum/views/website_forum.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 66b13026335..0f132c48420 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -434,16 +434,18 @@
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
                 </h1>
-                <div class="alert alert-info" t-if="question.state == 'close'">
-                    <p class="mt32 mb16 text-center">
-                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/>
-                        <br/>
-                        <t t-if="question.closed_uid">
-                            <i>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ slug(question.closed_uid) }" t-field="question.closed_uid"/> </i>
-                        </t>
-                        on <span t-field="question.closed_date"/></b>
+                <div class="alert alert-info text-center" t-if="question.state == 'close'">
+                    <p class="mt16">
+                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/></b>
                     </p>
-                    <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
+                    <t t-if="question.closed_uid">
+                        <b>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"
+                            t-field="question.closed_uid"
+                            t-field-options='{"widget": "contact", "fields": ["name"]}'
+                            style="display: inline-block;"/></b>
+                    </t>
+                    <b>on <span t-field="question.closed_date"/></b>
+                    <div t-if="question.state == 'close' and user.karma&gt;=500" class="mt16 mb24 text-center">
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
                             <t t-set="label" t-value="'Reopen'"/>

From 4837952ad411b135b711dbb0934874f7b0ea2d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 16:40:50 +0200
Subject: [PATCH 53/66] [FIX] website_crm_partner_assign: fixed crash when
 having partners to display on resellers page that do not have country_id set,
 leading to some values not being present in the countries variable holding
 data about partner localisation.

---
 addons/website_crm_partner_assign/controllers/main.py           | 2 +-
 .../views/website_crm_partner_assign.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 3dd96798d09..3c9efb00b7a 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -65,7 +65,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             context=request.context, count=True)
         # flag active country
         for country_dict in countries:
-            country_dict['active'] = country and country_dict['country_id'][0] == country.id
+            country_dict['active'] = country and country_dict['country_id'] and country_dict['country_id'][0] == country.id
         countries.insert(0, {
             'country_id_count': countries_partners,
             'country_id': (0, _("All Countries")),
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b215a14e6cb..ed77acdcb95 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -53,7 +53,7 @@
                 <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
                     <li class="nav-header"><h3>Filter by Country</h3></li>
                     <t t-foreach="countries" t-as="country">
-                        <li t-att-class="country['active'] and 'active' or ''">
+                        <li t-if="country['country_id']" t-att-class="country['active'] and 'active' or ''">
                             <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
                                 <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
                                 <t t-esc="country['country_id'][1]"/> 

From be99dbf16a337c0b8093ac6e5e075e4f1a315add Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Mon, 19 May 2014 17:41:50 +0200
Subject: [PATCH 54/66] [FIX] website_event_track: human-readable display of
 track durations

---
 addons/website_event_track/views/website_event.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 3bfe4f0d742..45531ef73b0 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -224,7 +224,7 @@
                             <b>Date</b><br/>
                             <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/><br/>
                             <b>Duration</b><br/>
-                            <span t-esc="'%.2f' % (track.duration)"/> hours<br/>
+                            <span t-field="track.duration" t-field-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;}"/><br/>
                             <b>Location</b><br/>
                             <span t-field="track.location_id"/><br/>
                         </div>

From eae72dd1c8a7a81cc71f7bddccd5813a2ee6c867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 18:16:10 +0200
Subject: [PATCH 55/66] [FIX] website_crm_partner_assign: fixed error of used
 template to display partner references, use the one defined in
 website_crm_partner_assign module.

---
 .../views/website_crm_partner_assign.xml                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index ed77acdcb95..b7a87b48f59 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -128,7 +128,7 @@
         <t t-set="ref_content">
             <t t-call="website_partner.partner_detail">
                 <t t-set="right_column">
-                    <div id="right_column" class="mb16"><t t-call="website_customer.references_block"/></div>
+                    <div id="right_column" class="mb16"><t t-call="website_crm_partner_assign.references_block"/></div>
                 </t>
             </t>
         </t>

From c97d0ccf8fea8f66a8b3f5a730dc72dc716daff6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 20 May 2014 10:24:01 +0200
Subject: [PATCH 56/66] [FIX] website_forum: allow users to save their edited
 bio

---
 addons/website_forum/models/res_users.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index a9f2dfe0e93..5d05f1f3bf3 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -2,10 +2,16 @@
 
 from openerp.osv import osv, fields
 
-
 class Users(osv.Model):
     _inherit = 'res.users'
 
+    def __init__(self, pool, cr):
+        init_res = super(Users, self).__init__(pool, cr) 
+        self.SELF_WRITEABLE_FIELDS = list(set(
+                self.SELF_WRITEABLE_FIELDS + \
+                ['country_id', 'city', 'website', 'website_description']))
+        return init_res
+
     def _get_user_badge_level(self, cr, uid, ids, name, args, context=None):
         """Return total badge per level of users"""
         result = dict.fromkeys(ids, False)

From c1a0d234226fb80ba186a7836006613e083432d5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 20 May 2014 10:24:33 +0200
Subject: [PATCH 57/66] [FIX] website_forum: country_id is an integer field

---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 23a7b9ad538..f196909b065 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -585,7 +585,7 @@ class WebsiteForum(http.Controller):
             'website': kwargs.get('website'),
             'email': kwargs.get('email'),
             'city': kwargs.get('city'),
-            'country_id': kwargs.get('country'),
+            'country_id': int(kwargs.get('country')),
             'website_description': kwargs.get('description'),
         }, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), user.id))

From 96128a678e9501209fafde56968e5b6b997e69ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 20 May 2014 13:24:18 +0200
Subject: [PATCH 58/66] [IMP] website_crm_partner_assign: use geoip to display
 partners in the visitor's country.

Also added a breadcrumb in partners navigation; when going on the partner view
a link to come back to the list view has been added and takes into account
selected grade and country.
---
 .../controllers/main.py                       | 44 +++++++++++++++++--
 .../views/website_crm_partner_assign.xml      | 16 ++++---
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 3c9efb00b7a..faae5593a9b 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,8 +1,15 @@
 # -*- coding: utf-8 -*-
+import logging
 import re
-
 import werkzeug
 
+_logger = logging.getLogger(__name__)
+try:
+    import GeoIP
+except ImportError:
+    GeoIP = None
+    _logger.warn("Please install GeoIP python module to use events localisation.")
+
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
@@ -13,6 +20,12 @@ from openerp.tools.translate import _
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 40
 
+    def _get_current_country_code(self):
+        if not GeoIP:
+            return False
+        GI = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', 0)
+        return GI.country_code_by_addr(request.httprequest.remote_addr)
+
     @http.route([
         '/partners',
         '/partners/page/<int:page>',
@@ -27,7 +40,9 @@ class WebsiteCrmPartnerAssign(http.Controller):
         '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def partners(self, country=None, grade=None, page=0, **post):
+        country_all = post.pop('country_all', False)
         partner_obj = request.registry['res.partner']
+        country_obj = request.registry['res.country']
         search = post.get('search', '')
 
         base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
@@ -36,6 +51,12 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # group by grade
         grade_domain = list(base_partner_domain)
+        if not country and not country_all:
+            country_code = self._get_current_country_code()
+            if country_code:
+                country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
+                if country_ids:
+                    country = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
         if country:
             grade_domain += [('country_id', '=', country.id)]
         grades = partner_obj.read_group(
@@ -118,7 +139,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
             'searches': post,
-            'search_path': "?%s" % werkzeug.url_encode(post),
+            'search_path': "%s" % werkzeug.url_encode(post),
         }
         return request.website.render("website_crm_partner_assign.index", values)
 
@@ -126,11 +147,26 @@ class WebsiteCrmPartnerAssign(http.Controller):
     @http.route(['/partners/<partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_detail(self, partner_id, partner_name='', **post):
         mo = re.search('-([-0-9]+)$', str(partner_id))
+        current_grade, current_country = None, None
+        grade_id = post.get('grade_id')
+        country_id = post.get('country_id')
+        if grade_id:
+            grade_ids = request.registry['res.partner.grade'].exists(request.cr, request.uid, int(grade_id), context=request.context)
+            if grade_ids:
+                current_grade = request.registry['res.partner.grade'].browse(request.cr, request.uid, grade_ids[0], context=request.context)
+        if country_id:
+            country_ids = request.registry['res.country'].exists(request.cr, request.uid, int(country_id), context=request.context)
+            if country_ids:
+                current_country = request.registry['res.country'].browse(request.cr, request.uid, country_ids[0], context=request.context)
         if mo:
             partner_id = int(mo.group(1))
             partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
             if partner.exists() and partner.website_published:
-                values = {}
-                values['main_object'] = values['partner'] = partner
+                values = {
+                    'main_object': partner,
+                    'partner': partner,
+                    'current_grade': current_grade,
+                    'current_country': current_country
+                }
                 return request.website.render("website_crm_partner_assign.partner", values)
         return self.partners(**post)
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b7a87b48f59..6d5b93793ad 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -15,7 +15,7 @@
         <t t-set="additional_title">Resellers</t>
         <div id="wrap">
             <div class="oe_structure"/>
-            <div class="container">
+            <div class="container mt16">
                 <div class="row">
                     <t t-raw="ref_content" />
                 </div>
@@ -42,7 +42,7 @@
                     <li class="nav-header"><h3>Filter by Grade</h3></li>
                     <t t-foreach="grades" t-as="grade">
                         <li t-att-class="grade['active'] and 'active' or ''">
-                            <a t-attf-href="/partners/#{ grade['grade_id'][0] and 'grade/%s/' % grade['grade_id'][0] or '' }#{ current_country and 'country/%s/' % slug(current_country) or '' }#{ search_path }">
+                            <a t-attf-href="/partners#{ grade['grade_id'][0] and '/grade/%s' % grade['grade_id'][0] or '' }#{ current_country and '/country/%s' % slug(current_country) or '' }#{ '?' + (search_path or '') }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/> 
                             </a>
@@ -54,7 +54,7 @@
                     <li class="nav-header"><h3>Filter by Country</h3></li>
                     <t t-foreach="countries" t-as="country">
                         <li t-if="country['country_id']" t-att-class="country['active'] and 'active' or ''">
-                            <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
+                            <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '') + (country['country_id'][0] == 0 and 'country_all=True' or '')}">
                                 <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
                                 <t t-esc="country['country_id'][1]"/> 
                             </a>
@@ -85,12 +85,12 @@
                             <t t-set="last_grade" t-value="partner.grade_id.id"/>
                         </t>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/partners/#{slug(partner)}"
+                            <a class="pull-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}"
                                t-field="partner.image_small"
                                t-field-options='{"widget": "image", "class": "media-object"}'
                             ></a>
                             <div class="media-body o_partner_body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
+                                <a class="media-heading" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}">
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
@@ -126,6 +126,12 @@
 <template id="partner" name="Partner Detail">
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
+            <div class="col-md-5">
+                <ol class="breadcrumb">
+                    <li><a t-attf-href="/partners#{current_grade and '/grade/%s' % slug(current_grade)}#{current_country and '/country/%s' % slug(current_country)}">Our Partners</a></li>
+                    <li class="active"><span t-field="partner.display_name"/></li>
+                </ol>
+            </div>
             <t t-call="website_partner.partner_detail">
                 <t t-set="right_column">
                     <div id="right_column" class="mb16"><t t-call="website_crm_partner_assign.references_block"/></div>

From 4c822b1a3b7545b52d1423111b82e2a1d6f3e5ba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 13:10:44 +0200
Subject: [PATCH 59/66] [FIX] website_forum: when sending emails about forum
 post, use the public url instead of the private

---
 addons/mail/mail_mail.py             | 16 +++-------------
 addons/mail/mail_thread.py           | 15 +++++++++++++++
 addons/website_forum/models/forum.py |  8 +++++++-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 9811fcd6aef..65970265ce3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -149,19 +149,9 @@ class mail_mail(osv.Model):
         link to action_mail_redirect action that will redirect to doc or Inbox """
         if partner and partner.user_ids:
             base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-            # the parameters to encode for the query and fragment part of url
-            query = {'db': cr.dbname}
-            fragment = {
-                'login': partner.user_ids[0].login,
-                'action': 'mail.action_mail_redirect',
-            }
-            if mail.notification:
-                fragment['message_id'] = mail.mail_message_id.id
-            elif mail.model and mail.res_id:
-                fragment.update(model=mail.model, res_id=mail.res_id)
-
-            url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment)))
-            return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url
+            mail_model = mail.model or 'mail.thread'
+            url = urljoin(base_url, self.pool[mail_model]._get_access_link(cr, uid, mail, partner, context=context))
+            return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in Odoo</a></small></span>""") % url
         else:
             return None
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d2dcef4d85e..8cb735b047f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -35,6 +35,7 @@ import socket
 import time
 import xmlrpclib
 from email.message import Message
+from urllib import urlencode
 
 from openerp import tools
 from openerp import SUPERUSER_ID
@@ -641,6 +642,20 @@ class mail_thread(osv.AbstractModel):
             })
         return action
 
+    def _get_access_link(self, cr, uid, mail, partner, context=None):
+        # the parameters to encode for the query and fragment part of url
+        query = {'db': cr.dbname}
+        fragment = {
+            'login': partner.user_ids[0].login,
+            'action': 'mail.action_mail_redirect',
+        }
+        if mail.notification:
+            fragment['message_id'] = mail.mail_message_id.id
+        elif mail.model and mail.res_id:
+            fragment.update(model=mail.model, res_id=mail.res_id)
+
+        return "/web?%s#%s" % (urlencode(query), urlencode(fragment))
+
     #------------------------------------------------------
     # Email specific
     #------------------------------------------------------
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index b1de4c001a5..8d56d416223 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import openerp
+from urlparse import urljoin
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.website.models.website import slug
 from openerp.osv import osv, fields
@@ -272,6 +273,11 @@ class Post(osv.Model):
         cr.execute("""UPDATE forum_post SET views = views+1 WHERE id IN %s""", (tuple(ids),))
         return True
 
+    def _get_access_link(self, cr, uid, mail, partner, context=None):
+        post = self.pool['forum.post'].browse(cr, uid, mail.res_id, context=context)
+        res_id = post.parent_id and "%s#answer-%s" % (post.parent_id.id, post.id) or post.id
+        return "/forum/%s/question/%s" % (post.forum_id.id, res_id)
+
 
 class PostReason(osv.Model):
     _name = "forum.post.reason"

From 6718e9d03a221c06f71e78a556a0c5c3803a3e7b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 13:10:56 +0200
Subject: [PATCH 60/66] [FIX] crm: do not overwrite the value of
 no_force_assignation if already set in the context

---
 addons/crm/wizard/crm_lead_to_opportunity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 40654f464f4..7964e4a4a3a 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -276,7 +276,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             active_ids = active_ids.difference(merged_lead_ids)
             active_ids = active_ids.union(remaining_lead_ids)
             ctx['active_ids'] = list(active_ids)
-        ctx['no_force_assignation'] = not data.force_assignation
+        ctx['no_force_assignation'] = context.get('no_force_assignation', not data.force_assignation)
         return self.action_apply(cr, uid, ids, context=ctx)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 8da2cb6d4a6b99ef56cbb64a7c8753ab9a0e3365 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:31:55 +0200
Subject: [PATCH 61/66] [FIX] definition of badges

---
 addons/website_forum/data/badges_participation.xml | 6 +++---
 addons/website_forum/data/badges_question.xml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 05c2540d77d..fc07eaaf864 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -78,16 +78,16 @@
             <field name="target_goal">10</field>
         </record>
 
-        <!-- Pundit: 10 comments with at least score of 10 -->
+        <!-- Pundit: 10 answers with at least score of 10 -->
         <record id="badge_25" model="gamification.badge">
             <field name="name">Pundit</field>
-            <field name="description">Left comments with score of 10 or more</field>
+            <field name="description">Left 10 answers with score of 10 or more</field>
             <field name="level">silver</field>
             <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_pundit">
             <field name="name">Pundit</field>
-            <field name="description">Post 10 comments with score of 10 or more</field>
+            <field name="description">Post 10 answers with score of 10 or more</field>
             <field name="display_mode">boolean</field>
             <field name="condition">higher</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index ff2d63c034d..39c1fca9f20 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -372,7 +372,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')" />
-            <field name="domain">[('parent_id', '=', False), ('is_correct', '=', True)]</field>
+            <field name="domain">[('parent_id', '=', False), ('has_validated_answer', '=', True)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
             <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />

From c786ceb760563e5cdc205c1dd2b95e6513426244 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:32:21 +0200
Subject: [PATCH 62/66] [FIX] the badges should be ordered by most popular
 first

---
 addons/website_forum/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index f196909b065..b94e818d0c5 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -599,6 +599,7 @@ class WebsiteForum(http.Controller):
         Badge = request.registry['gamification.badge']
         badge_ids = Badge.search(cr, SUPERUSER_ID, [('challenge_ids.category', '=', 'forum')], context=context)
         badges = Badge.browse(cr, uid, badge_ids, context=context)
+        badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True)
         values = self._prepare_forum_values(forum=forum, searches={'badges': True})
         values.update({
             'badges': badges,

From 70d3652c27ce0a6936f30eaf8af124676e5fa90a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:41:56 +0200
Subject: [PATCH 63/66] [FIX] remove closing reason 'an answer was accepted',
 the questions should be left as open to be possible to improve the answer
 afterward

---
 addons/website_forum/data/forum_data.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index a387a8de7ae..2db99477f61 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -70,9 +70,6 @@
         <record id="reason_4" model="forum.post.reason">
             <field name="name">not a real question</field>
         </record>
-        <record id="reason_5" model="forum.post.reason">
-            <field name="name">already answered and an answer was accepted</field>
-        </record>
         <record id="reason_6" model="forum.post.reason">
             <field name="name">not relevant or out dated</field>
         </record>

From 4d9aa300a725d0bbdfadd87d547e150769f13f40 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:50:51 +0200
Subject: [PATCH 64/66] [IMP] as the closing reason is not required, do not
 display it if none is present

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0f132c48420..f596193c56a 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -436,7 +436,7 @@
                 </h1>
                 <div class="alert alert-info text-center" t-if="question.state == 'close'">
                     <p class="mt16">
-                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/></b>
+                        <b>The question has been closed<t t-if="question.closed_reason_id"> for reason: <i t-esc="question.closed_reason_id.name"/></t></b>
                     </p>
                     <t t-if="question.closed_uid">
                         <b>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"

From a558a8463000644142aa2210bd1b3db9def66375 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 15:05:27 +0200
Subject: [PATCH 65/66] [IMP] display the createion date of the question the
 same way we display the answer fate

---
 addons/website_forum/views/website_forum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index f596193c56a..c47d15004dd 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -514,6 +514,7 @@
                                 t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                                 style="display: inline-block;"/>
                             <div t-field="question.create_uid" t-field-options='{"widget": "contact", "badges": true, "fields": ["karma"]}'/>
+                            <span class="text-muted">Asked on <span t-field="question.create_date" t-field-options='{"format":"short"}'/></span>
                         </div>
                     </div>
                 </div>

From 40abb97136c865b30132dcaa6afff140e9b1ab9d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 20 May 2014 16:08:03 +0200
Subject: [PATCH 66/66] [FIX] account_analytic_analysis: use product.price if
 pricelist is passed, else list_price

---
 .../account_analytic_analysis.py                          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 2f4147cd45c..744c2ef61bf 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,7 +73,13 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.price or res.list_price)})
+        if price_unit is not False:
+            price = price_unit
+        elif pricelist_id:
+            price = res.price
+        else:
+            price = res.list_price
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id: