From fec027e83203e6705f690469cd39101e4eba3b06 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 15 Jan 2013 11:40:15 +0100
Subject: [PATCH 001/175] [IMP] reorder modules menus

bzr revid: chs@openerp.com-20130115104015-5ytx00t0b5230aaf
---
 openerp/addons/base/module/module_view.xml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 3a43a2591ba..3923c9de3bd 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -171,23 +171,18 @@
             </field>
         </record>
         <record id="open_module_tree" model="ir.actions.act_window">
-            <!-- uncomment on released
             <field name="name">Installed Modules</field>
-            -->
-            <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
-            <!-- uncomment on released
             <field name="context">{'search_default_installed':1}</field>
-            -->
             <field name="search_view_id" ref="view_module_filter"/>
             <field name="help" type="html">
               <p><b>No module found!</b></p>
               <p>You should try others search criteria.</p>
             </field>
         </record>
-        <menuitem id="menu_module_tree" parent="menu_management" name="Installed Modules" sequence="10" action="open_module_tree"/>
+        <menuitem id="menu_module_tree" parent="menu_management" name="Installed Modules" sequence="30" action="open_module_tree" />
 
 
         <!-- Apps modules -->
@@ -195,20 +190,14 @@
             <field name="name">Apps</field>
             <field name="tag">apps</field>
         </record>
-        <!-- uncomment on released
-        <menuitem id="module_mi" parent="base.menu_management" sequence="3" action="modules_act_cl"/>
-        -->
-        <menuitem id="module_mi" parent="base.menu_management" sequence="20" action="modules_act_cl"/>
+        <menuitem id="module_mi" parent="base.menu_management" sequence="10" action="modules_act_cl"/>
 
         <record model="ir.actions.client" id="modules_updates_act_cl">
             <field name="name">Updates</field>
             <field name="tag">apps.updates</field>
             <field name="params">{}</field>
         </record>
-        <!-- uncomment on released
-        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="7" action="modules_updates_act_cl"/>
-        -->
-        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="30" action="modules_updates_act_cl"/>
+        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="20" action="modules_updates_act_cl"/>
 
     </data>
 </openerp>

From 7e1a76cdd846a8c455d402fcd76d8baa58a9b2f8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 15 Jan 2013 11:40:47 +0100
Subject: [PATCH 002/175] [FIX] setup.py: correct windows install

bzr revid: chs@openerp.com-20130115104047-6hrl825bn5pkmoo6
---
 setup.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup.py b/setup.py
index b144924d022..e4e6001d302 100755
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,12 @@ def data():
             base = os.path.join('pytz', root[len(tzdir) + 1:])
             r[base] = [os.path.join(root, f) for f in filenames]
 
+        import docutils
+        dudir = os.path.dirname(docutils.__file__)
+        for root, _, filenames in os.walk(dudir):
+            base = os.path.join('docutils', root[len(dudir) + 1:])
+            r[base] = [os.path.join(root, f) for f in filenames if not f.endswith(('.py', '.pyc', '.pyo'))]
+
     return r.items()
 
 def gen_manifest():

From e2639618f666605e385befb578db3f889a8c035f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 17 Jan 2013 10:27:22 +0100
Subject: [PATCH 003/175] [DOC] remove openerpdev intersphinx, add ref to
 module doc

bzr revid: xmo@openerp.com-20130117092722-6rfhkcu4igrgeo06
---
 addons/web/doc/conf.py    | 1 -
 addons/web/doc/module.rst | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/doc/conf.py b/addons/web/doc/conf.py
index 54434190707..7fe38022ab1 100644
--- a/addons/web/doc/conf.py
+++ b/addons/web/doc/conf.py
@@ -253,6 +253,5 @@ todo_include_todos = True
 intersphinx_mapping = {
     'python': ('http://docs.python.org/', None),
     'openerpserver': ('http://doc.openerp.com/trunk/developers/server', None),
-    'openerpdev': ('http://doc.openerp.com/trunk/developers', None),
     'openerpcommand': ('http://doc.openerp.com/trunk/developers/command', None),
 }
diff --git a/addons/web/doc/module.rst b/addons/web/doc/module.rst
index 1bdb7c14799..8306e885f65 100644
--- a/addons/web/doc/module.rst
+++ b/addons/web/doc/module.rst
@@ -1,3 +1,5 @@
+.. _module:
+
 Building an OpenERP Web module
 ==============================
 

From 3574038ffdf78e8c63430ecc92a4f2d916207fda Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Jan 2013 14:29:24 +0100
Subject: [PATCH 004/175] [FIX] apps: install_from_url: fix install condition +
 better logging

bzr revid: chs@openerp.com-20130117132924-ejzbkh5przqi6hwf
---
 openerp/addons/base/module/module.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 9e8b68451c5..123bf4124ed 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#    Copyright (C) 2004-2013 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -656,6 +656,7 @@ class module(osv.osv):
     def install_from_urls(self, cr, uid, urls, context=None):
         OPENERP = 'openerp'
         tmp = tempfile.mkdtemp()
+        _logger.debug('Install from url: %r', urls)
         try:
             # 1. Download & unzip missing modules
             for module_name, url in urls.items():
@@ -672,12 +673,13 @@ class module(osv.osv):
                     zipfile.ZipFile(StringIO(content)).extractall(tmp)
                     assert os.path.isdir(os.path.join(tmp, module_name))
 
-            # 2a. Copy/Replace module source in addons path 
+            # 2a. Copy/Replace module source in addons path
             for module_name, url in urls.items():
                 if module_name == OPENERP or not url:
                     continue    # OPENERP is special case, handled below, and no URL means local module
                 module_path = modules.get_module_path(module_name, downloaded=True, display_warning=False)
                 bck = backup(module_path, False)
+                _logger.info('Copy downloaded module `%s` to `%s`', module_name, module_path)
                 shutil.move(os.path.join(tmp, module_name), module_path)
                 if bck:
                     shutil.rmtree(bck)
@@ -697,15 +699,22 @@ class module(osv.osv):
                 # then replace the server by the new "base" module
                 server_dir = openerp.tools.config['root_path']      # XXX or dirname()
                 bck = backup(server_dir)
+                _logger.info('Copy downloaded module `openerp` to `%s`', server_dir)
                 shutil.move(os.path.join(tmp, OPENERP), server_dir)
                 #if bck:
                 #    shutil.rmtree(bck)
 
             self.update_list(cr, uid, context=context)
 
-            ids = self.search(cr, uid, [('name', 'in', urls.keys())], context=context)
-            if self.search_count(cr, uid, [('id', 'in', ids), ('state', '=', 'installed')], context=context):
-                # if any to update
+            with_urls = [m for m, u in urls.items() if u]
+            downloaded_ids = self.search(cr, uid, [('name', 'in', with_urls)], context=context)
+            already_installed = self.search(cr, uid, [('id', 'in', downloaded_ids), ('state', '=', 'installed')], context=context)
+
+            to_install_ids = self.search(cr, uid, [('name', 'in', urls.keys()), ('state', '=', 'uninstalled')], context=context)
+            post_install_action = self.button_immediate_install(cr, uid, to_install_ids, context=context)
+
+            if already_installed:
+                # in this case, force server restart to reload python code...
                 cr.commit()
                 openerp.service.restart_server()
                 return {
@@ -713,7 +722,7 @@ class module(osv.osv):
                     'tag': 'home',
                     'params': {'wait': True},
                 }
-            return self.button_immediate_install(cr, uid, ids, context=context)
+            return post_install_action
         finally:
             shutil.rmtree(tmp)
 

From 4857a8a020d81ebd375122fb478726103c3f2393 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Jan 2013 14:51:08 +0100
Subject: [PATCH 005/175] [FIX] module loading: call adapt_version() instead of
 computing it ourself

bzr revid: chs@openerp.com-20130117135108-a4wt4wtbtfdwiui3
---
 openerp/modules/loading.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index fb68642f137..638a40c9fa8 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2013 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -36,14 +36,12 @@ import openerp.modules.graph
 import openerp.modules.migration
 import openerp.osv as osv
 import openerp.pooler as pooler
-import openerp.release as release
 import openerp.tools as tools
 from openerp import SUPERUSER_ID
 
-from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
 from openerp.modules.module import initialize_sys_path, \
-    load_openerp_module, init_module_models
+    load_openerp_module, init_module_models, adapt_version
 
 _logger = logging.getLogger(__name__)
 
@@ -213,7 +211,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
 
             migrations.migrate_module(package, 'post')
 
-            ver = release.major_version + '.' + package.data['version']
+            ver = adapt_version(package.data['version'])
             # Set new modules and dependencies
             modobj.write(cr, SUPERUSER_ID, [module_id], {'state': 'installed', 'latest_version': ver})
             # Update translations for all installed languages

From 66cadcdb18c9ce0f48a05cf7d13cb98ed2f171e5 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Fri, 10 May 2013 17:19:34 +0200
Subject: [PATCH 007/175] [FIX] OPW 591344 : internal reports don't show images

Cleaner method, and shows images.

bzr revid: acl@openerp.com-20130510151934-e2kvwiexdzp3zc12
---
 openerp/report/render/rml2pdf/trml2pdf.py | 54 +++++++----------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index e8d6375c98e..153eff14b65 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -82,53 +82,33 @@ def _open_image(filename, path=None):
             pass
     raise IOError("File %s cannot be found in image path" % filename)
 
+
 class NumberedCanvas(canvas.Canvas):
     def __init__(self, *args, **kwargs):
         canvas.Canvas.__init__(self, *args, **kwargs)
-        self._codes = []
-        self._flag=False
-        self._pageCount=0
-        self._currentPage =0
-        self._pageCounter=0
-        self.pages={}
+        self._saved_page_states = []
 
     def showPage(self):
-        self._currentPage +=1
-        if not self._flag:
-            self._pageCount += 1
-        else:
-            self.pages.update({self._currentPage:self._pageCount})
-        self._codes.append({'code': self._code, 'stack': self._codeStack})
+        self._saved_page_states.append(dict(self.__dict__))
         self._startPage()
-        self._flag=False
-
-    def pageCount(self):
-        if self.pages.get(self._pageCounter,False):
-            self._pageNumber=0
-        self._pageCounter +=1
-        key=self._pageCounter
-        if not self.pages.get(key,False):
-            while not self.pages.get(key,False):
-                key += 1
-        self.setFont("Helvetica", 8)
-        self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40),
-            " %(this)i / %(total)i" % {
-               'this': self._pageNumber+1,
-               'total': self.pages.get(key,False),
-            }
-        )
 
     def save(self):
         """add page info to each page (page x of y)"""
-        # reset page counter
-        self._pageNumber = 0
-        for code in self._codes:
-            self._code = code['code']
-            self._codeStack = code['stack']
-            self.pageCount()
+        num_pages = len(self._saved_page_states)
+        for state in self._saved_page_states:
+            self.__dict__.update(state)
+            self.draw_page_number(num_pages)
             canvas.Canvas.showPage(self)
-#        self.restoreState()
-        self._doc.SaveToFile(self._filename, self)
+        canvas.Canvas.save(self)
+
+    def draw_page_number(self, page_count):
+        self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40),
+            " %(this)i / %(total)i" % {
+               'this': self._pageNumber,
+               'total': page_count,
+            }
+        )
+
 
 class PageCount(platypus.Flowable):
     def __init__(self, story_count=0):

From 46e89d6dd1427ac5c7fa144f3b36e6ea1779771d Mon Sep 17 00:00:00 2001
From: Mohammed Shekha <msh@openerp.com>
Date: Thu, 20 Jun 2013 16:16:06 +0530
Subject: [PATCH 008/175] [FIX]Fixed the issue of recurrent rule, there is no
 need of passing 'Z' after end_date as end_date converted to UNTIL parameter
 in rrule, and date given in UNTIL is not converted to any other timezone
 until you specifically passed timezone difference or timezone name like
 20130620T121012+3:30 or 20130620T121012TZOFFSET, currently Z creates issue
 when recurrent rule is created with end_date, TypeError: can't compare
 offset-naive and offset-aware datetimes.

bzr revid: msh@openerp.com-20130620104606-g3dyr1mafzo8fpgg
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 25bfcac448c..41a142cde68 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1269,7 +1269,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
         def get_end_date(data):
             if data.get('end_date'):
-                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z'
+                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959'
 
             return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\
                              ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')

From 3276861ff6125d02e08b5c5b12b75925e056c4bc Mon Sep 17 00:00:00 2001
From: "Xavier Fernandez http://www.smile.fr" <>
Date: Wed, 28 Aug 2013 17:21:17 +0200
Subject: [PATCH 009/175] [FIX] port Xavier Fernandez's fix for Bug #971412:
 Translations export has no fixed order

lp bug: https://launchpad.net/bugs/971412 fixed

bzr revid: ls@numerigraphe.com-20130828152117-e1h0yljgbn538v9o
---
 openerp/tools/translate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 41113b8ccd9..53762b87970 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -458,7 +458,8 @@ def trans_export(lang, modules, buffer, format, cr):
                 row.setdefault('tnrs', []).append((type, name, res_id))
                 row.setdefault('comments', set()).update(comments)
 
-            for src, row in grouped_rows.items():
+            for src in sorted(grouped_rows):
+                row = grouped_rows[src]
                 if not lang:
                     # translation template, so no translation value
                     row['translation'] = ''

From 1f3a482f4fc309262802b980e143234a56b9503d Mon Sep 17 00:00:00 2001
From: Lionel Sausin <ls@numerigraphe.com>
Date: Thu, 29 Aug 2013 09:50:35 +0200
Subject: [PATCH 010/175] [REF] avoid the lookup in sorted translation export
 as suggested by Guewen Baconnier @ Camptocamp

bzr revid: ls@numerigraphe.com-20130829075035-lml81a7bbn66c8qu
---
 openerp/tools/translate.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 53762b87970..6e9eb50f162 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -458,8 +458,7 @@ def trans_export(lang, modules, buffer, format, cr):
                 row.setdefault('tnrs', []).append((type, name, res_id))
                 row.setdefault('comments', set()).update(comments)
 
-            for src in sorted(grouped_rows):
-                row = grouped_rows[src]
+            for src, row in sorted(grouped_rows.items()):
                 if not lang:
                     # translation template, so no translation value
                     row['translation'] = ''

From 0dcc62426c3689191798fbe33717eea5d4659a96 Mon Sep 17 00:00:00 2001
From: Yanina Aular <yanina.aular@vauxoo.com>
Date: Fri, 15 Nov 2013 17:57:17 -0430
Subject: [PATCH 011/175] [FIX] function field with wrong type int instead of
 integer

bzr revid: yanina.aular@vauxoo.com-20131115222717-12bplq7rnv3rorbm
---
 addons/project/project.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 5bd2e604368..c7b394ad376 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -288,7 +288,8 @@ class project(osv.osv):
                                         help="The kind of document created when an email is received on this project's email alias"),
         'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached",
+            type='integer')
      }
 
     def _get_type_common(self, cr, uid, context):

From f6349ffb7fd9c075573953be2ac0f0dc20520743 Mon Sep 17 00:00:00 2001
From: Leonardo Pistone <leonardo.pistone@camptocamp.com>
Date: Wed, 18 Dec 2013 17:45:26 +0100
Subject: [PATCH 012/175] [merge] [fix] action should return True

lp bug: https://launchpad.net/bugs/1262265 fixed

bzr revid: leonardo.pistone@camptocamp.com-20131218164526-rgyo6p9hlpk28sxg
---
 addons/mrp_repair/mrp_repair.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 9c0ab0e2c18..9335d395714 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -350,7 +350,8 @@ class mrp_repair(osv.osv):
         return self.write(cr,uid,ids,{'state':'cancel'})
 
     def wkf_invoice_create(self, cr, uid, ids, *args):
-        return self.action_invoice_create(cr, uid, ids)
+        self.action_invoice_create(cr, uid, ids)
+        return True
 
     def action_invoice_create(self, cr, uid, ids, group=False, context=None):
         """ Creates invoice(s) for repair order.

From 855836e96e42f1be3075eaa87628184f52112b80 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 27 Feb 2014 13:56:48 +0100
Subject: [PATCH 013/175] [IMP] Move the netsvc.dispatch_rpc function from
 netsvc to openerp.http

bzr revid: stw@openerp.com-20140227125648-kunaefr22y28honx
---
 openerp/http.py                | 96 +++++++++++++++++++++++++++++++---
 openerp/netsvc.py              | 86 ------------------------------
 openerp/service/wsgi_server.py |  2 +-
 openerp/tools/__init__.py      |  2 +-
 openerp/tools/debugger.py      |  8 +++
 5 files changed, 98 insertions(+), 96 deletions(-)
 create mode 100644 openerp/tools/debugger.py

diff --git a/openerp/http.py b/openerp/http.py
index bcd7511d769..ea1e82ed4c6 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -21,8 +21,10 @@ import time
 import traceback
 import urlparse
 import warnings
+from pprint import pformat
 
 import babel.core
+import psutil
 import psycopg2
 import simplejson
 import werkzeug.contrib.sessions
@@ -34,6 +36,7 @@ import werkzeug.wrappers
 import werkzeug.wsgi
 
 import openerp
+import openerp.netsvc
 from openerp.service import security, model as service_model
 import openerp.tools
 
@@ -50,6 +53,83 @@ request = _request_stack()
     A global proxy that always redirect to the current request object.
 """
 
+def replace_request_password(args):
+    # password is always 3rd argument in a request, we replace it in RPC logs
+    # so it's easier to forward logs for diagnostics/debugging purposes...
+    if len(args) > 2:
+        args = list(args)
+        args[2] = '*'
+    return tuple(args)
+
+def log(logger, level, prefix, msg, depth=None):
+    indent=''
+    indent_after=' '*len(prefix)
+    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
+        logger.log(level, indent+line)
+        indent=indent_after
+
+def dispatch_rpc(service_name, method, params):
+    """ Handle a RPC call.
+
+    This is pure Python code, the actual marshalling (from/to XML-RPC) is done
+    in a upper layer.
+    """
+    try:
+        rpc_request = logging.getLogger(__name__ + '.rpc.request')
+        rpc_response = logging.getLogger(__name__ + '.rpc.response')
+        rpc_request_flag = rpc_request.isEnabledFor(logging.DEBUG)
+        rpc_response_flag = rpc_response.isEnabledFor(logging.DEBUG)
+        if rpc_request_flag or rpc_response_flag:
+            start_time = time.time()
+            start_rss, start_vms = 0, 0
+            start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
+            if rpc_request and rpc_response_flag:
+                log(rpc_request, logging.DEBUG, '%s.%s' % (service_name, method), replace_request_password(params))
+
+        threading.current_thread().uid = None
+        threading.current_thread().dbname = None
+        if service_name == 'common':
+            dispatch = openerp.service.common.dispatch
+        elif service_name == 'db':
+            dispatch = openerp.service.db.dispatch
+        elif service_name == 'object':
+            dispatch = openerp.service.model.dispatch
+        elif service_name == 'report':
+            dispatch = openerp.service.report.dispatch
+        else:
+            dispatch = openerp.service.wsgi_server.rpc_handlers.get(service_name)
+        result = dispatch(method, params)
+
+        if rpc_request_flag or rpc_response_flag:
+            end_time = time.time()
+            end_rss, end_vms = 0, 0
+            end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
+            logline = '%s.%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (service_name, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
+            if rpc_response_flag:
+                log(rpc_response, logging.DEBUG, logline, result)
+            else:
+                log(rpc_request, logging.DEBUG, logline, replace_request_password(params), depth=1)
+
+        return result
+    except openerp.osv.orm.except_orm:
+        raise
+    except openerp.exceptions.AccessError:
+        raise
+    except openerp.exceptions.AccessDenied:
+        raise
+    except openerp.exceptions.Warning:
+        raise
+    except openerp.exceptions.RedirectWarning:
+        raise
+    except openerp.exceptions.DeferredException, e:
+        _logger.exception(openerp.tools.exception_to_unicode(e))
+        openerp.tools.debugger.post_mortem(openerp.tools.config, e.traceback)
+        raise
+    except Exception, e:
+        _logger.exception(openerp.tools.exception_to_unicode(e))
+        openerp.tools.debugger.post_mortem(openerp.tools.config, sys.exc_info())
+        raise
+
 def local_redirect(path, query=None, keep_hash=False, forward_debug=True, code=303):
     url = path
     if not query:
@@ -618,7 +698,7 @@ class SessionExpiredException(Exception):
 class Service(object):
     """
         .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        Use ``dispatch_rpc()`` instead.
     """
     def __init__(self, session, service_name):
         self.session = session
@@ -626,7 +706,7 @@ class Service(object):
 
     def __getattr__(self, method):
         def proxy_method(*args):
-            result = openerp.netsvc.dispatch_rpc(self.service_name, method, args)
+            result = dispatch_rpc(self.service_name, method, args)
             return result
         return proxy_method
 
@@ -699,7 +779,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
                 HTTP_HOST=wsgienv['HTTP_HOST'],
                 REMOTE_ADDR=wsgienv['REMOTE_ADDR'],
             )
-            uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
+            uid = dispatch_rpc('common', 'authenticate', [db, login, password, env])
         else:
             security.check(db, uid, password)
         self.db = db
@@ -803,14 +883,14 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
     def send(self, service_name, method, *args):
         """
         .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        Use ``dispatch_rpc()`` instead.
         """
-        return openerp.netsvc.dispatch_rpc(service_name, method, args)
+        return dispatch_rpc(service_name, method, args)
 
     def proxy(self, service):
         """
         .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        Use ``dispatch_rpc()`` instead.
         """
         return Service(self, service)
 
@@ -1184,7 +1264,7 @@ class Root(object):
         return request.registry['ir.http'].routing_map()
 
 def db_list(force=False, httprequest=None):
-    dbs = openerp.netsvc.dispatch_rpc("db", "list", [force])
+    dbs = dispatch_rpc("db", "list", [force])
     return db_filter(dbs, httprequest=httprequest)
 
 def db_filter(dbs, httprequest=None):
@@ -1229,7 +1309,7 @@ class CommonController(Controller):
     @route('/jsonrpc', type='json', auth="none")
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
-        return openerp.netsvc.dispatch_rpc(service, method, args)
+        return dispatch_rpc(service, method, args)
 
     @route('/gen_session_id', type='json', auth="none")
     def gen_session_id(self):
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 755f6513b25..f19162cde5a 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -26,10 +26,6 @@ import os
 import release
 import sys
 import threading
-import time
-import types
-from pprint import pformat
-import psutil
 
 import tools
 import openerp
@@ -188,86 +184,4 @@ def init_alternative_logger():
     logger.addHandler(handler)
     logger.setLevel(logging.ERROR)
 
-def replace_request_password(args):
-    # password is always 3rd argument in a request, we replace it in RPC logs
-    # so it's easier to forward logs for diagnostics/debugging purposes...
-    if len(args) > 2:
-        args = list(args)
-        args[2] = '*'
-    return tuple(args)
-
-def log(logger, level, prefix, msg, depth=None):
-    indent=''
-    indent_after=' '*len(prefix)
-    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
-        logger.log(level, indent+line)
-        indent=indent_after
-
-def dispatch_rpc(service_name, method, params):
-    """ Handle a RPC call.
-
-    This is pure Python code, the actual marshalling (from/to XML-RPC) is done
-    in a upper layer.
-    """
-    try:
-        rpc_request = logging.getLogger(__name__ + '.rpc.request')
-        rpc_response = logging.getLogger(__name__ + '.rpc.response')
-        rpc_request_flag = rpc_request.isEnabledFor(logging.DEBUG)
-        rpc_response_flag = rpc_response.isEnabledFor(logging.DEBUG)
-        if rpc_request_flag or rpc_response_flag:
-            start_time = time.time()
-            start_rss, start_vms = 0, 0
-            start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
-            if rpc_request and rpc_response_flag:
-                log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params))
-
-        threading.current_thread().uid = None
-        threading.current_thread().dbname = None
-        if service_name == 'common':
-            dispatch = openerp.service.common.dispatch
-        elif service_name == 'db':
-            dispatch = openerp.service.db.dispatch
-        elif service_name == 'object':
-            dispatch = openerp.service.model.dispatch
-        elif service_name == 'report':
-            dispatch = openerp.service.report.dispatch
-        else:
-            dispatch = openerp.service.wsgi_server.rpc_handlers.get(service_name)
-        result = dispatch(method, params)
-
-        if rpc_request_flag or rpc_response_flag:
-            end_time = time.time()
-            end_rss, end_vms = 0, 0
-            end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
-            logline = '%s.%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (service_name, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
-            if rpc_response_flag:
-                log(rpc_response,logging.DEBUG, logline, result)
-            else:
-                log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1)
-
-        return result
-    except openerp.osv.orm.except_orm:
-        raise
-    except openerp.exceptions.AccessError:
-        raise
-    except openerp.exceptions.AccessDenied:
-        raise
-    except openerp.exceptions.Warning:
-        raise
-    except openerp.exceptions.RedirectWarning:
-        raise
-    except openerp.exceptions.DeferredException, e:
-        _logger.exception(tools.exception_to_unicode(e))
-        post_mortem(e.traceback)
-        raise
-    except Exception, e:
-        _logger.exception(tools.exception_to_unicode(e))
-        post_mortem(sys.exc_info())
-        raise
-
-def post_mortem(info):
-    if tools.config['debug_mode'] and isinstance(info[2], types.TracebackType):
-        import pdb
-        pdb.post_mortem(info[2])
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py
index 506a07d0295..b31736ba998 100644
--- a/openerp/service/wsgi_server.py
+++ b/openerp/service/wsgi_server.py
@@ -72,7 +72,7 @@ def xmlrpc_return(start_response, service, method, params, string_faultcode=Fals
     # This also mimics SimpleXMLRPCDispatcher._marshaled_dispatch() for
     # exception handling.
     try:
-        result = openerp.netsvc.dispatch_rpc(service, method, params)
+        result = openerp.http.dispatch_rpc(service, method, params)
         response = xmlrpclib.dumps((result,), methodresponse=1, allow_none=False, encoding=None)
     except Exception, e:
         if string_faultcode:
diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index 18dab088440..6ad2cca4724 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -34,7 +34,7 @@ from yaml_import import *
 from sql import *
 from float_utils import *
 from mail import *
-
+from debugger import *
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/tools/debugger.py b/openerp/tools/debugger.py
new file mode 100644
index 00000000000..293d4052513
--- /dev/null
+++ b/openerp/tools/debugger.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright: 2014 - OpenERP S.A. <http://openerp.com>
+import types
+
+def post_mortem(config, info):
+    if config['debug_mode'] and isinstance(info[2], types.TracebackType):
+        import pdb
+        pdb.post_mortem(info[2])

From 3f779a5cae7bd4ca0399cf06e331f5047ec0e343 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 28 Feb 2014 17:10:55 +0100
Subject: [PATCH 014/175] [IMP] Add the ir_logging object where we will store
 the log messages (exception, error and warning)

bzr revid: stw@openerp.com-20140228161055-98897xl1r46mf9mr
---
 openerp/addons/base/ir/__init__.py   |  1 +
 openerp/addons/base/ir/ir_logging.py | 52 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 openerp/addons/base/ir/ir_logging.py

diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index b3df5bcbccb..9aa1e7c42a2 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -39,6 +39,7 @@ import ir_mail_server
 import ir_fields
 import ir_qweb
 import ir_http
+import ir_logging
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/base/ir/ir_logging.py b/openerp/addons/base/ir/ir_logging.py
new file mode 100644
index 00000000000..66708aa729a
--- /dev/null
+++ b/openerp/addons/base/ir/ir_logging.py
@@ -0,0 +1,52 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import logging
+
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
+class ir_logging(osv.Model):
+    _name = 'ir.logging'
+
+    EXCEPTIONS_TYPE = [
+        ('client', 'Client'),
+        ('server', 'Server')
+    ]
+
+    _columns = {
+        'name': fields.char('Name', required=True),
+        'type': fields.selection(EXCEPTIONS_TYPE, string='Type', required=True, select=True),
+        'dbname': fields.char('Database Name'),
+        'level': fields.char('Level'),
+        'message': fields.text('Message', required=True),
+        'exception': fields.text('Exception'),
+        'path': fields.char('Path', required=True),
+        'func': fields.char('Function', required=True),
+        'line': fields.char('Line', required=True),
+    }
+
+    def call_function(self, cr, uid, ids, context=None):
+        logger = logging.getLogger()
+        logger.error("I think there is an error")
+        try:
+            raise Exception("I want to kill your process...")
+        except Exception, ex:
+            logger.exception("Please log me into the database")
+        return True
\ No newline at end of file

From 047d071a48630e3db2922d404d3d7f5395a88245 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 28 Feb 2014 17:11:47 +0100
Subject: [PATCH 015/175] [IMP] Add a new Logging Handler, where we will store
 in the database of OpenERP. this database can be overrided via the
 --log-pgsql-database

bzr revid: stw@openerp.com-20140228161147-s9nnrfq2tc94vq5p
---
 openerp/http.py             |  12 ++---
 openerp/loggers/__init__.py |   1 +
 openerp/loggers/handlers.py | 100 ++++++++++++++++++++++++++++++++++++
 openerp/netsvc.py           |  51 ++++++++++++++----
 openerp/tools/config.py     |  24 ++++++---
 5 files changed, 162 insertions(+), 26 deletions(-)
 create mode 100644 openerp/loggers/__init__.py
 create mode 100644 openerp/loggers/handlers.py

diff --git a/openerp/http.py b/openerp/http.py
index ea1e82ed4c6..92fe03a6232 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -111,15 +111,9 @@ def dispatch_rpc(service_name, method, params):
                 log(rpc_request, logging.DEBUG, logline, replace_request_password(params), depth=1)
 
         return result
-    except openerp.osv.orm.except_orm:
-        raise
-    except openerp.exceptions.AccessError:
-        raise
-    except openerp.exceptions.AccessDenied:
-        raise
-    except openerp.exceptions.Warning:
-        raise
-    except openerp.exceptions.RedirectWarning:
+    except (openerp.osv.orm.except_orm, openerp.exceptions.AccessError, \
+            openerp.exceptions.AccessDenied, openerp.exceptions.Warning, \
+            openerp.exceptions.RedirectWarning):
         raise
     except openerp.exceptions.DeferredException, e:
         _logger.exception(openerp.tools.exception_to_unicode(e))
diff --git a/openerp/loggers/__init__.py b/openerp/loggers/__init__.py
new file mode 100644
index 00000000000..19b76b55b64
--- /dev/null
+++ b/openerp/loggers/__init__.py
@@ -0,0 +1 @@
+from handlers import PostgreSQLHandler
\ No newline at end of file
diff --git a/openerp/loggers/handlers.py b/openerp/loggers/handlers.py
new file mode 100644
index 00000000000..763aa079195
--- /dev/null
+++ b/openerp/loggers/handlers.py
@@ -0,0 +1,100 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import contextlib
+import datetime
+import logging
+import threading
+
+import psycopg2
+
+from openerp import tools 
+
+# The PostgreSQL Handler for the logging module, will be used by OpenERP to store the logs 
+# in the database, --log-pgsql-database=YOUR_DBNAME
+# By default the system will use the current database
+
+class PostgreSQLHandler(logging.Handler):
+    @contextlib.contextmanager
+    def create_connection(self):
+        db_name = None
+
+        db_name_from_cli = tools.config['log_pgsql_database']
+        if not db_name_from_cli:
+            # If there is no database, and only in this case, we are going to use the database 
+            # from the current thread and create a connection to this database.
+
+            current_thread = threading.current_thread()
+
+            db_name_from_thread = getattr(current_thread, 'dbname', None)
+            if isinstance(db_name_from_thread, basestring):
+                db_name = db_name_from_thread
+        else:
+            db_name = db_name_from_cli
+
+        if not db_name:
+            return
+
+        parameters = {
+            'user': tools.config['db_user'] or None,
+            'password': tools.config['db_password'] or None,
+            'host': tools.config['db_host'] or None,
+            'port': tools.config['db_port'] or None,
+            'database': db_name,
+        }
+        try:
+            connection = psycopg2.connect(**parameters)
+
+            if connection:
+                yield connection
+        except Exception, ex:  # Use a specific exception
+            print ex
+
+    def emit(self, record):
+        # We use a context manager to be tolerant to the errors (error of connections,...)
+        with self.create_connection() as conn:
+            exception = False
+            if record.exc_info:
+                exception = record.exc_text
+
+            now = datetime.datetime.utcnow()
+
+            current_thread = threading.current_thread()
+            uid = getattr(current_thread, 'uid', False)
+            dbname = getattr(current_thread, 'dbname', False)
+
+            parameters = (
+                now, uid, now, uid, 'server', dbname, record.name, 
+                logging.getLevelName(record.levelno), record.msg, exception,
+                record.filename, record.funcName, record.lineno
+            )
+
+            with conn.cursor() as cursor:
+                cursor.execute("""
+                    INSERT INTO ir_logging(
+                        create_date, create_uid, write_date, write_uid, 
+                        type, dbname, name, level, message, exception, path, func,
+                        line
+                    )
+                    VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+                    """,
+                    parameters
+                )
+                conn.commit()
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index f19162cde5a..250cd52a1d1 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -29,6 +29,7 @@ import threading
 
 import tools
 import openerp
+import openerp.loggers
 
 _logger = logging.getLogger(__name__)
 
@@ -85,6 +86,19 @@ class ColoredFormatter(DBFormatter):
         record.levelname = COLOR_PATTERN % (30 + fg_color, 40 + bg_color, record.levelname)
         return DBFormatter.format(self, record)
 
+import platform
+def is_posix_operating_system():
+    return os.name == 'posix'
+
+def is_windows_operating_system():
+    return os.name == 'nt'
+
+def is_linux_operating_system():
+    return is_posix_operating_system() and platform.system() == 'Linux'
+
+def is_macosx_operating_system():
+    return is_posix_operating_system() and platform.system() == 'Darwin'
+
 def init_logger():
     from tools.translate import resetlocale
     resetlocale()
@@ -94,24 +108,32 @@ def init_logger():
 
     if tools.config['syslog']:
         # SysLog Handler
-        if os.name == 'nt':
+        if is_windows_operating_system():
             handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
-        else:
+        elif is_linux_operating_system():
             handler = logging.handlers.SysLogHandler('/dev/log')
-        format = '%s %s' % (release.description, release.version) \
-                + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
+        elif is_macosx_operating_system():  # There is no /dev/log on OSX
+            handler = logging.handlers.SysLogHandler('/var/run/log')
+        else:
+            raise Exception("There is no syslog handler for this Operating System: %s", platform.system())
+
+        format = '%s %s' % (release.description, release.version) + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
 
     elif tools.config['logfile']:
         # LogFile Handler
         logf = tools.config['logfile']
         try:
+            # We check we have the right location for the log files
             dirname = os.path.dirname(logf)
             if dirname and not os.path.isdir(dirname):
                 os.makedirs(dirname)
+
             if tools.config['logrotate'] is not False:
-                handler = logging.handlers.TimedRotatingFileHandler(logf,'D',1,30)
-            elif os.name == 'posix':
+                handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
+
+            elif is_posix_operating_system():
                 handler = logging.handlers.WatchedFileHandler(logf)
+
             else:
                 handler = logging.handlers.FileHandler(logf)
         except Exception:
@@ -125,12 +147,14 @@ def init_logger():
     # behind Apache with mod_wsgi, handler.stream will have type mod_wsgi.Log,
     # which has no fileno() method. (mod_wsgi.Log is what is being bound to
     # sys.stderr when the logging.StreamHandler is being constructed above.)
-    if isinstance(handler, logging.StreamHandler) \
-        and hasattr(handler.stream, 'fileno') \
-        and os.isatty(handler.stream.fileno()):
+    def has_fileno(stream):
+        return hasattr(stream, 'fileno') and os.isatty(stream.fileno())
+
+    if isinstance(handler, logging.StreamHandler) and has_fileno(handler.stream):
         formatter = ColoredFormatter(format)
     else:
         formatter = DBFormatter(format)
+
     handler.setFormatter(formatter)
 
     # Configure handlers
@@ -141,7 +165,9 @@ def init_logger():
     logging_configurations = DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig
     for logconfig_item in logging_configurations:
         loggername, level = logconfig_item.split(':')
+
         level = getattr(logging, level, logging.INFO)
+        
         logger = logging.getLogger(loggername)
         logger.handlers = []
         logger.setLevel(level)
@@ -149,6 +175,13 @@ def init_logger():
         if loggername != '':
             logger.propagate = False
 
+    # magic ;-)
+    # we manage the connection in the postgresqlhandler
+    postgresqlHandler = openerp.loggers.handlers.PostgreSQLHandler()
+    postgresqlHandler.setLevel(logging.WARNING)
+    logger = logging.getLogger()
+    logger.addHandler(postgresqlHandler)
+
     for logconfig_item in logging_configurations:
         _logger.debug('logger level set: "%s"', logconfig_item)
 
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 07435075f8d..ab1eab8a52a 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -72,9 +72,10 @@ class configmanager(object):
         }
 
         # Not exposed in the configuration file.
-        self.blacklist_for_save = set(
-            ['publisher_warranty_url', 'load_language', 'root_path',
-            'init', 'save', 'config', 'update', 'stop_after_init'])
+        self.blacklist_for_save = set([
+            'publisher_warranty_url', 'load_language', 'root_path',
+            'init', 'save', 'config', 'update', 'stop_after_init'
+        ])
 
         # dictionary mapping option destination (keys in self.options) to MyOptions.
         self.casts = {}
@@ -83,7 +84,10 @@ class configmanager(object):
         self.config_file = fname
         self.has_ssl = check_ssl()
 
-        self._LOGLEVELS = dict([(getattr(loglevels, 'LOG_%s' % x), getattr(logging, x)) for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'NOTSET')])
+        self._LOGLEVELS = dict([
+            (getattr(loglevels, 'LOG_%s' % x), getattr(logging, x)) 
+            for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'NOTSET')
+        ])
 
         version = "%s %s" % (release.description, release.version)
         self.parser = parser = optparse.OptionParser(version=version, option_class=MyOption)
@@ -176,12 +180,16 @@ class configmanager(object):
         group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
         group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
+        group.add_option('--log-pgsql-database', dest='log_pgsql_database', help="database where OpenERP will store the exceptions", my_default=False)
         # For backward-compatibility, map the old log levels to something
         # quite close.
-        levels = ['info', 'debug_rpc', 'warn', 'test', 'critical',
-            'debug_sql', 'error', 'debug', 'debug_rpc_answer', 'notset']
-        group.add_option('--log-level', dest='log_level', type='choice', choices=levels,
-            my_default='info', help='specify the level of the logging. Accepted values: ' + str(levels) + ' (deprecated option).')
+        levels = [
+            'info', 'debug_rpc', 'warn', 'test', 'critical',
+            'debug_sql', 'error', 'debug', 'debug_rpc_answer', 'notset'
+        ]
+        group.add_option('--log-level', dest='log_level', type='choice',
+                         choices=levels, my_default='info',
+                         help='specify the level of the logging. Accepted values: %s (deprecated option).' % (levels,))
 
         parser.add_option_group(group)
 

From 2569e07191422bbd3535ded11825425de4247dd1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 12:39:46 +0100
Subject: [PATCH 016/175] [IMP] website: snippet don't use snipet id

bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
---
 .../src/js/website.snippets.animation.js      |  11 +-
 .../static/src/js/website.snippets.editor.js  | 899 +++++++++---------
 .../website/static/src/xml/website.editor.xml |   2 +-
 addons/website/views/snippets.xml             | 178 ++--
 4 files changed, 553 insertions(+), 537 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index bc2ea064731..01e4c5239cb 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -5,13 +5,18 @@
     if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
-    website.snippet.start_animation = function () {
+    website.snippet.start_animation = function ($target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
             var selector = "[data-snippet-id='"+k+"']";
             if (Animation.prototype.selector) {
                 selector += ", " + Animation.prototype.selector;
             }
+            if ($target) {
+                if ($target.is(selector)) selector = $target;
+                else continue;
+            }
+
             $(selector).each(function() {
                 var $snipped_id = $(this);
                 if (    !$snipped_id.parents("#oe_snippets").length &&
@@ -32,7 +37,7 @@
             }
         });
     };
-    $(document).ready(website.snippet.start_animation);
+    $(document).ready(function () {website.snippet.start_animation();});
 
 
     website.snippet.animationRegistry = {};
@@ -67,7 +72,7 @@
     });
 
     website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({
-        parallax: ".parallax",
+        selector: ".parallax",
         start: function () {
             var self = this;
             setTimeout(function () {self.set_values();});
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 23c5956ebf4..addd610e47b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -167,6 +167,9 @@
                             'snippet-style-id' : style_id,
                             'selector': $style.data('selector'),
                             '$el': $style,
+                            'selector-siblings': $style.data('selector-siblings'),
+                            'selector-children': $style.data('selector-children'),
+                            'selector-vertical-children': $style.data('selector-vertical-children')
                         };
                     });
                     $styles.addClass("hidden");
@@ -219,12 +222,19 @@
                     return;
                 }
                 snipped_event_flag = true;
+                var selector = [];
+                for (var k in website.snippet.styles) {
+                    selector.push(website.snippet.styles[k].selector);
+                }
+                selector = selector.join(",");
+
                 setTimeout(function () {snipped_event_flag = false;}, 0);
                 var $target = $(event.srcElement);
-                if (!$target.attr("data-snippet-id")) {
-                    $target = $target.parents("[data-snippet-id]:first");
+
+                if (!$target.is(selector)) {
+                    $target = $target.parents(selector).first();
                 }
-                if (!$target.attr("data-oe-model") && !$target.parents("[data-oe-model]:first").length) {
+                if (!self.dom_filter($target).length) {
                     $target = false;
                 }
                 if (self.$active_snipped_id && self.$active_snipped_id.is($target)) {
@@ -281,8 +291,7 @@
             if (typeof $snippet.data("snippet-editor") === 'undefined') {
                 var $targets = this.activate_overlay_zones($snippet);
                 if (!$targets.length) return;
-                var editor = website.snippet.editorRegistry[$snippet.data("snippet-id")] || website.snippet.editorRegistry.resize;
-                $snippet.data("snippet-editor", new editor(this, $snippet));
+                $snippet.data("snippet-editor", new website.snippet.Editor(this, $snippet));
             }
             this.cover_target($snippet.data('overlay'), $snippet);
         },
@@ -318,36 +327,50 @@
                 start: function(){
                     self.hide();
                     dropped = false;
+                    // snippet_selectors => to get selector-siblings, selector-children, selector-vertical-children
                     $snippet = $(this);
-                    snipped_id = $snippet.data('snippet-id');
+                    $toInsert = $snippet.find('.oe_snippet_body').clone();
+                    $toInsert.removeClass('oe_snippet_body');
+
+                    var selector = [];
+                    var selector_siblings = [];
+                    var selector_children = [];
+                    var selector_vertical_children = [];
+                    for (var k in website.snippet.styles) {
+                        if ($toInsert.is(website.snippet.styles[k].selector)) {
+                            selector.push(website.snippet.styles[k].selector);
+                            if (website.snippet.styles[k]['selector-siblings'])
+                                selector_siblings.push(website.snippet.styles[k]['selector-siblings']);
+                            if (website.snippet.styles[k]['selector-children'])
+                                selector_children.push(website.snippet.styles[k]['selector-children']);
+                            if (website.snippet.styles[k]['selector-vertical-children'])
+                                selector_vertical_children.push(website.snippet.styles[k]['selector-vertical-children']);
+                        }
+                    }
+
                     action = $snippet.find('.oe_snippet_body').size() ? 'insert' : 'mutate';
+
                     if( action === 'insert'){
-                        if (!$snippet.data('selector-siblings') && !$snippet.data('selector-children') && !$snippet.data('selector-vertical-children')) {
+                        if (!selector_siblings.length && !selector_children.length && !selector_vertical_children.length) {
                             console.debug($snippet.data("snippet-id") + " have oe_snippet_body class and have not for insert action"+
                                 "data-selector-siblings, data-selector-children or data-selector-vertical-children tag for mutate action");
                             return;
                         }
+                        console.log(selector_siblings);
+                        console.log(selector_children);
+                        console.log(selector_vertical_children);
                         self.activate_insertion_zones({
-                            siblings: $snippet.data('selector-siblings'),
-                            children:   $snippet.data('selector-children'),
-                            vertical_children:   $snippet.data('selector-vertical-children')
+                            siblings: selector_siblings.join(","),
+                            children: selector_children.join(","),
+                            vertical_children: selector_vertical_children.join(","),
                         });
 
-                        $toInsert = $snippet.find('.oe_snippet_body').clone();
-                        $toInsert.removeClass('oe_snippet_body');
-                        $toInsert.data('src-snippet-id', snipped_id);
-                        if (!$toInsert.data('snippet-id')) {
-                            $toInsert.attr('data-snippet-id', snipped_id);
-                        } else {
-                            snipped_id = $toInsert.data('snippet-id');
-                        }
-
                     } else if( action === 'mutate' ){
                         if (!$snippet.data('selector')) {
                             console.debug($snippet.data("snippet-id") + " have not oe_snippet_body class and have not data-selector tag");
                             return;
                         }
-                        var $targets = self.activate_overlay_zones($snippet.data('selector'));
+                        var $targets = self.activate_overlay_zones(selector_children.join(","));
                         $targets.each(function(){
                             var $clone = $(this).data('overlay').clone();
                              $clone.addClass("oe_drop_zone").data('target', $(this));
@@ -382,56 +405,31 @@
                     }
 
                     $('.oe_drop_zone').droppable('destroy').remove();
+                    
                     if (dropped) {
                         var $target = false;
-                        if(action === 'insert'){
-                            $target = $toInsert;
+                        $target = $toInsert;
 
-                            website.snippet.start_animation();
+                        setTimeout(function () {
+                            $("#oe_snippets").trigger('snippet-dropped', $target);
+
+                            // after rte
+                            website.snippet.start_animation($target);
 
                             self.create_overlay($target);
                             if ($target.data("snippet-editor")) {
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 
-                            $target.find("[data-snippet-id]").each(function () {
-                                var $snippet = $(this);
-                                var snippet_id = $snippet.data("data-snippet-id");
-                                self.create_overlay($snippet);
-                                if ($snippet.data("snippet-editor")) {
-                                    $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
-                                }
-                            });
-
-                        } else {
-                            $target = $(this).data('target');
-
-                            self.create_overlay($target);
-                            if (website.snippet.editorRegistry[snipped_id]) {
-                                var snippet = new website.snippet.editorRegistry[snipped_id](self, $target);
-                                snippet.drop_and_build_snippet($target);
+                            for (var k in website.snippet.styles) {
+                                $target.find(website.snippet.styles[k].selector).each(function () {
+                                    var $snippet = $(this);
+                                    self.create_overlay($snippet);
+                                    if ($snippet.data("snippet-editor")) {
+                                        $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
+                                    }
+                                });
                             }
-                        }
-                        setTimeout(function () {
-                            $("#oe_snippets").trigger('snippet-dropped', $target);
-
-                            // reset snippet for rte
-                            $target.removeData("snippet-editor");
-                            if ($target.data("overlay")) {
-                                $target.data("overlay").remove();
-                                $target.removeData("overlay");
-                            }
-                            self.create_overlay($target);
-                            $target.find("[data-snippet-id]").each(function () {
-                                var $snippet = $(this);
-                                $snippet.removeData("snippet-editor");
-                                if ($snippet.data("overlay")) {
-                                    $snippet.data("overlay").remove();
-                                    $snippet.removeData("overlay");
-                                }
-                                self.create_overlay($snippet);
-                            });
-                            // end
 
                             self.make_active($target);
                         },0);
@@ -598,8 +596,8 @@
     website.snippet.styleRegistry = {};
     website.snippet.StyleEditor = openerp.Class.extend({
         // initialisation (don't overwrite)
-        init: function (parent, $target, snippet_id) {
-            this.parent = parent;
+        init: function (BuildingBlock, $target, snippet_id) {
+            this.BuildingBlock = BuildingBlock;
             this.$target = $target;
             var styles = this.$target.data("snippet-style-ids") || {};
             styles[snippet_id] = this;
@@ -664,6 +662,13 @@
         // start is call just after the init
         start: function () {
         },
+        /*
+        *  drop_and_build_snippet
+        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
+        *  (after the insertion of this.$body, if this.$body exists)
+        */
+        drop_and_build_snippet: function ($target) {
+        },
         /* select
         *  called when a user select an item
         *  variables: np = {$next, $prev}
@@ -715,7 +720,6 @@
         }
     });
 
-
     website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
         _get_bg: function () {
             return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
@@ -781,217 +785,171 @@
             this.$el.find('li:has(li[data-class].active)').addClass("active");
         }
     });
+    website.snippet.styleRegistry.slider = website.snippet.StyleEditor.extend({
+        drop_and_build_snippet: function() {
+            var id = $(".carousel").length;
+            this.id = "myCarousel" + id;
+            this.$target.attr("id", this.id);
+            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
+            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
 
-
-    website.snippet.editorRegistry = {};
-    website.snippet.Editor = openerp.Class.extend({
-        init: function (parent, dom) {
-            this.parent = parent;
-            this.$target = $(dom);
-            this.$overlay = this.$target.data('overlay');
-            this.snippet_id = this.$target.data("snippet-id");
-            this._readXMLData();
-            this.load_style_options();
-            this.get_parent_block();
-            this.start();
+            this.rebind_event();
         },
-
-        /*
-        *  _readXMLData
-        *  Read data XML and set value into:
-        *  this.$el :
-        *       all xml data
-        *  this.$overlay :
-        *       Dom hover the $target who content options
-        *  this.$editor :
-        *       content of .oe_snippet_options
-        *       Displayed into the overlay options on focus
-        */
-        _readXMLData: function() {
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
             var self = this;
-            this.$el = this.parent.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
-            this.$editor = this.$el.find(".oe_snippet_options");
-            var $options = this.$overlay.find(".oe_overlay_options");
-            this.$editor.prependTo($options.find(".oe_options ul"));
-            if ($options.find(".oe_options ul li").length) {
-                $options.find(".oe_options").removeClass("hidden");
-            }
+            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
+                self.$target.carousel(+$(this).data('slide-to')); });
+
+            this.$target.attr('contentEditable', 'false');
+            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
         },
-
-
-        // activate drag and drop for the snippets in the snippet toolbar
-        _drag_and_drop: function(){
-            var self = this;
-            this.dropped = false;
-            this.$overlay.draggable({
-                greedy: true,
-                appendTo: 'body',
-                cursor: "move",
-                handle: ".oe_snippet_move",
-                cursorAt: {
-                    left: 18,
-                    top: 14
-                },
-                helper: function() {
-                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
-                    $clone.find(".oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle").remove();
-                    $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
-                    $clone.appendTo("body").removeClass("hidden");
-                    return $clone;
-                },
-                start: _.bind(self._drag_and_drop_start, self),
-                stop: _.bind(self._drag_and_drop_stop, self)
-            });
-        },
-        _drag_and_drop_after_insert_dropzone: function (){},
-        _drag_and_drop_active_drop_zone: function ($zones){
-            var self = this;
-            $zones.droppable({
-                over:   function(){
-                    $(".oe_drop_zone.hide").removeClass("hide");
-                    $(this).addClass("hide").first().after(self.$target);
-                    self.dropped = true;
-                },
-                out:    function(){
-                    $(this).removeClass("hide");
-                    self.$target.detach();
-                    self.dropped = false;
-                },
-            });
-        },
-        _drag_and_drop_start: function (){
-            var self = this;
-            self.parent.hide();
-            self.parent.editor_busy = true;
-            self.size = {
-                width: self.$target.width(),
-                height: self.$target.height()
-            };
-            self.$target.after("<div class='oe_drop_clone' style='display: none;'/>");
-            self.$target.detach();
-            self.$overlay.addClass("hidden");
-
-            self.parent.activate_insertion_zones({
-                siblings: self.$el ? self.$el.data('selector-siblings') : false,
-                children:   self.$el ? self.$el.data('selector-children') : false,
-                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
-            });
-
-            $("body").addClass('move-important');
-
-            self._drag_and_drop_after_insert_dropzone();
-            self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
-        },
-        _drag_and_drop_stop: function (){
-            var self = this;
-            if (!self.dropped) {
-                $(".oe_drop_clone").after(self.$target);
-            }
-            self.$overlay.removeClass("hidden");
-            $("body").removeClass('move-important');
-            $('.oe_drop_zone').droppable('destroy').remove();
-            $(".oe_drop_clone, .oe_drop_to_remove").remove();
-            self.parent.editor_busy = false;
-            self.get_parent_block();
-            setTimeout(function () {self.parent.create_overlay(self.$target);},0);
-        },
-
-        load_style_options: function () {
-            var self = this;
-            var $styles = this.$overlay.find('.oe_options');
-            var $ul = $styles.find('ul:first');
-            _.each(website.snippet.styles, function (val) {
-                if (!self.parent.dom_filter(val.selector).is(self.$target)) {
-                    return;
-                }
-                var Editor = website.snippet.styleRegistry[val['snippet-style-id']] || website.snippet.StyleEditor;
-                var editor = new Editor(self, self.$target, val['snippet-style-id']);
-                $ul.prepend(editor.$el.addClass("snippet-style-" + val['snippet-style-id']));
-            });
-
-            if ($ul.find("li").length) {
-                $styles.removeClass("hidden");
-            }
-        },
-
-        get_parent_block: function () {
-            var self = this;
-            var $button = this.$overlay.find('.oe_snippet_parent');
-            var $parent = this.$target.parents("[data-snippet-id]:first");
-            if ($parent.length) {
-                $button.removeClass("hidden");
-                $button.off("click").on('click', function (event) {
-                    event.preventDefault();
-                    setTimeout(function () {
-                        self.parent.make_active($parent);
-                    }, 0);
-                });
-            } else {
-                $button.addClass("hidden");
-            }
-        },
-
-        /*
-        *  start
-        *  This method is called after init and _readXMLData
-        */
-        start: function () {
-            var self = this;
-            this.$overlay.on('click', '.oe_snippet_clone', _.bind(this.on_clone, this));
-            this.$overlay.on('click', '.oe_snippet_remove', _.bind(this.on_remove, this));
-            this._drag_and_drop();
-        },
-
-        on_clone: function () {
-            var $clone = this.$target.clone(false);
-            this.$target.after($clone);
-            return false;
-        },
-
-        on_remove: function () {
-            this.onBlur();
-            var index = _.indexOf(this.parent.snippets, this.$target.get(0));
-            delete this.parent.snippets[index];
-            this.$target.remove();
-            this.$overlay.remove();
-            return false;
-        },
-
-        /*
-        *  drop_and_build_snippet
-        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
-        *  (after the insertion of this.$body, if this.$body exists)
-        */
-        drop_and_build_snippet: function ($target) {
-        },
-
-        /* onFocus
-        *  This method is called when the user click inside the snippet in the dom
-        */
-        onFocus : function () {
-            this.$overlay.addClass('oe_active');
-        },
-
-        /* onFocus
-        *  This method is called when the user click outside the snippet in the dom, after a focus
-        */
-        onBlur : function () {
-            this.$overlay.removeClass('oe_active');
-        },
-
-        /* clean_for_save
-        *  function called just before save vue
-        */
         clean_for_save: function () {
-            this.$target.removeAttr('contentEditable')
-                .find('*').removeAttr('contentEditable');
-            this.$target.removeAttr('attributeEditable')
-                .find('*').removeAttr('attributeEditable');
+            this._super();
+            this.$target.find(".item").removeClass("next prev left right");
+            if(!this.$target.find(".item.active").length) {
+                this.$target.find(".item:first").addClass("active");
+            }
+        },
+        start : function () {
+            var self = this;
+            this._super();
+            this.id = this.$target.attr("id");
+            this.$inner = this.$target.find('.carousel-inner');
+            this.$indicators = this.$target.find('.carousel-indicators');
+
+            this.$el.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
+            this.$el.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
+
+            this.$target.carousel('pause');
+            this.rebind_event();
+        },
+        on_add_slide: function () {
+            var self = this;
+            var cycle = this.$inner.find('.item').length;
+            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
+            var index = $active.index();
+            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
+            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
+
+            var $clone = this.$target.find(".item.active").clone();
+
+            // insert
+            $clone.removeClass('active').insertAfter($active);
+            setTimeout(function() {
+                self.$target.carousel().carousel(++index);
+                self.rebind_event();
+            },0);
+            return $clone;
+        },
+        on_remove_slide: function () {
+            if (this.remove_process) {
+                return;
+            }
+            var self = this;
+            var new_index = 0;
+            var cycle = this.$inner.find('.item').length - 1;
+            var index = this.$inner.find('.item.active').index();
+
+            if (cycle > 0) {
+                this.remove_process = true;
+                var $el = this.$inner.find('.item.active');
+                self.$target.on('slid.bs.carousel', function (event) {
+                    $el.remove();
+                    self.$indicators.find("li:last").remove();
+                    self.$target.off('slid.bs.carousel');
+                    self.rebind_event();
+                    self.remove_process = false;
+                    if (cycle == 1) {
+                        self.on_remove_slide(event);
+                    }
+                });
+                setTimeout(function () {
+                    self.$target.carousel( index > 0 ? --index : cycle );
+                }, 500);
+            } else {
+                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
+            }
+        },
+    });
+    website.snippet.styleRegistry.carousel = website.snippet.styleRegistry.slider.extend({
+        getSize: function () {
+            this.grid = this._super();
+            this.grid.size = 8;
+            return this.grid;
+        },
+        clean_for_save: function () {
+            this._super();
+            this.$target.css("background-image", "");
+            this.$target.removeClass(this._class);
+        },
+        load_style_options : function () {
+            this._super();
+            $(".snippet-style-size li[data-class='']").remove();
+        },
+        start : function () {
+            var self = this;
+            this._super();
+
+            // set background and prepare to clean for save
+            var add_class = function (c){
+                if (c) self._class = (self._class || "").replace(new RegExp("[ ]+" + c.replace(" ", "|[ ]+")), '') + ' ' + c;
+                return self._class || "";
+            };
+            this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
+                var $active = self.$target.find(".item.active");
+                if (style['snippet-style-id'] === "size") return;
+                if (style['snippet-style-id'] === "background") {
+                    $active.css("background-image", self.$target.css("background-image"));
+                }
+                if (np.$prev) {
+                    $active.removeClass(np.$prev.data("class"));
+                }
+                if (np.$next) {
+                    $active.addClass(np.$next.data("class"));
+                    add_class(np.$next.data("class"));
+                }
+            });
+            this.$target.on('slid', function () { // slide.bs.carousel
+                var $active = self.$target.find(".item.active");
+                self.$target
+                    .css("background-image", $active.css("background-image"))
+                    .removeClass(add_class($active.attr("class")))
+                    .addClass($active.attr("class"))
+                    .trigger("snippet-style-reset");
+
+                self.$target.carousel("pause");
+            });
+            this.$target.trigger('slid');
+        },
+        on_add_slide: function () {
+            var $clone = this._super();
+
+            // choose an other background
+            var bg = this.$target.data("snippet-style-ids").background;
+            if (!bg) return $clone;
+
+            var $styles = bg.$el.find("li[data-class]:not(.oe_custom_bg)");
+            var styles_index = $styles.index($styles.filter(".active")[0]);
+            var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
+            $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
+            $clone.addClass($select.data("class") || "");
+
+            return $clone;
+        },
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
+            var self = this;
+            this.$target.find('.carousel-control').off('click').on('click', function () {
+                self.$target.carousel( $(this).data('slide')); });
+
+            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image').attr('attributeEditable', 'true');
+            this._super();
         },
     });
 
-
-    website.snippet.editorRegistry.resize = website.snippet.Editor.extend({
+    website.snippet.styleRegistry.resize = website.snippet.StyleEditor.extend({
         start: function () {
             var self = this;
             this._super();
@@ -1057,7 +1015,7 @@
                     var regClass = new RegExp("\\s*" + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
                 }
 
-                self.parent.editor_busy = true;
+                self.BuildingBlock.editor_busy = true;
 
                 var cursor = $handle.css("cursor")+'-important';
                 var $body = $(document.body);
@@ -1071,7 +1029,7 @@
                         if (dy <= 0) dy = resize;
                         self.$target.css("height", dy+"px");
                         self.on_resize(compass, null, dy);
-                        self.parent.cover_target(self.$overlay, self.$target);
+                        self.BuildingBlock.cover_target(self.$overlay, self.$target);
                         return;
                     }
                     var dd = event['page'+XY] - xy + resize[1][begin];
@@ -1094,7 +1052,7 @@
 
                     if (change) {
                         self.on_resize(compass, beginClass, current);
-                        self.parent.cover_target(self.$overlay, self.$target);
+                        self.BuildingBlock.cover_target(self.$overlay, self.$target);
                     }
                 };
 
@@ -1102,7 +1060,7 @@
                     $body.unbind('mousemove', body_mousemove);
                     $body.unbind('mouseup', body_mouseup);
                     $body.removeClass(cursor);
-                    self.parent.editor_busy = false;
+                    self.BuildingBlock.editor_busy = false;
                     self.$target.removeClass("resize_editor_busy");
                 };
                 $body.mousemove(body_mousemove);
@@ -1110,14 +1068,7 @@
             });
         },
         getSize: function () {
-            var grid = [0,4,8,16,32,48,64,92,128];
-            this.grid = {
-                // list of class (Array), grid (Array), default value (INT)
-                n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
-                s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
-                // INT if the user can resize the snippet (resizing per INT px)
-                size: null
-            };
+            this.grid = {};
             return this.grid;
         },
 
@@ -1163,8 +1114,21 @@
             this.change_cursor();
         }
     });
-
-    website.snippet.editorRegistry.colmd = website.snippet.editorRegistry.resize.extend({
+    website.snippet.styleRegistry["margin-y"] = website.snippet.styleRegistry.resize.extend({
+        getSize: function () {
+            this.grid = this._super();
+            var grid = [0,4,8,16,32,48,64,92,128];
+            this.grid = {
+                // list of class (Array), grid (Array), default value (INT)
+                n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
+                s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
+                // INT if the user can resize the snippet (resizing per INT px)
+                size: null
+            };
+            return this.grid;
+        },
+    });
+    website.snippet.styleRegistry["margin-x"] = website.snippet.styleRegistry.resize.extend({
         getSize: function () {
             this.grid = this._super();
             var width = this.$target.parents(".row:first").first().outerWidth();
@@ -1229,7 +1193,7 @@
                     return false;
                 } else {
                     if (!$parent.data("snippet-editor")) {
-                        this.parent.create_overlay($parent);
+                        this.BuildingBlock.create_overlay($parent);
                     }
                     $parent.data("snippet-editor").on_remove();
                 }
@@ -1262,170 +1226,15 @@
             this._super(compass, beginClass, current);
         },
     });
-
-    website.snippet.editorRegistry.slider = website.snippet.editorRegistry.resize.extend({
-        drop_and_build_snippet: function() {
-            var id = $(".carousel").length;
-            this.id = "myCarousel" + id;
-            this.$target.attr("id", this.id);
-            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
-            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
-
-            this.rebind_event();
-        },
-        // rebind event to active carousel on edit mode
-        rebind_event: function () {
-            var self = this;
-            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
-                self.$target.carousel(+$(this).data('slide-to')); });
-
-            this.$target.attr('contentEditable', 'false');
-            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
-        },
-        clean_for_save: function () {
-            this._super();
-            this.$target.find(".item").removeClass("next prev left right");
-            if(!this.$target.find(".item.active").length) {
-                this.$target.find(".item:first").addClass("active");
-            }
-        },
-        start : function () {
-            var self = this;
-            this._super();
-            this.id = this.$target.attr("id");
-            this.$inner = this.$target.find('.carousel-inner');
-            this.$indicators = this.$target.find('.carousel-indicators');
-
-            this.$editor.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
-            this.$editor.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
-
-            this.$target.carousel('pause');
-            this.rebind_event();
-        },
-        on_add_slide: function () {
-            var self = this;
-            var cycle = this.$inner.find('.item').length;
-            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
-            var index = $active.index();
-            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
-            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
-
-            var $clone = this.$el.find(".item.active").clone();
-
-            // insert
-            $clone.removeClass('active').insertAfter($active);
-            setTimeout(function() {
-                self.$target.carousel().carousel(++index);
-                self.rebind_event();
-            },0);
-            return $clone;
-        },
-        on_remove_slide: function () {
-            if (this.remove_process) {
-                return;
-            }
-            var self = this;
-            var new_index = 0;
-            var cycle = this.$inner.find('.item').length - 1;
-            var index = this.$inner.find('.item.active').index();
-
-            if (cycle > 0) {
-                this.remove_process = true;
-                var $el = this.$inner.find('.item.active');
-                self.$target.on('slid.bs.carousel', function (event) {
-                    $el.remove();
-                    self.$indicators.find("li:last").remove();
-                    self.$target.off('slid.bs.carousel');
-                    self.rebind_event();
-                    self.remove_process = false;
-                    if (cycle == 1) {
-                        self.on_remove_slide(event);
-                    }
-                });
-                setTimeout(function () {
-                    self.$target.carousel( index > 0 ? --index : cycle );
-                }, 500);
-            } else {
-                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
-            }
-        },
-    });
-
-    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.slider.extend({
+    website.snippet.styleRegistry["resize"] = website.snippet.styleRegistry.resize.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
             return this.grid;
         },
-        clean_for_save: function () {
-            this._super();
-            this.$target.css("background-image", "");
-            this.$target.removeClass(this._class);
-        },
-        load_style_options : function () {
-            this._super();
-            $(".snippet-style-size li[data-class='']").remove();
-        },
-        start : function () {
-            var self = this;
-            this._super();
-
-            // set background and prepare to clean for save
-            var add_class = function (c){
-                if (c) self._class = (self._class || "").replace(new RegExp("[ ]+" + c.replace(" ", "|[ ]+")), '') + ' ' + c;
-                return self._class || "";
-            };
-            this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
-                var $active = self.$target.find(".item.active");
-                if (style['snippet-style-id'] === "size") return;
-                if (style['snippet-style-id'] === "background") {
-                    $active.css("background-image", self.$target.css("background-image"));
-                }
-                if (np.$prev) {
-                    $active.removeClass(np.$prev.data("class"));
-                }
-                if (np.$next) {
-                    $active.addClass(np.$next.data("class"));
-                    add_class(np.$next.data("class"));
-                }
-            });
-            this.$target.on('slid', function () { // slide.bs.carousel
-                var $active = self.$target.find(".item.active");
-                self.$target
-                    .css("background-image", $active.css("background-image"))
-                    .removeClass(add_class($active.attr("class")))
-                    .addClass($active.attr("class"))
-                    .trigger("snippet-style-reset");
-
-                self.$target.carousel();
-            });
-            this.$target.trigger('slid');
-        },
-        on_add_slide: function () {
-            var $clone = this._super();
-
-            // choose an other background
-            var $styles = this.$target.data("snippet-style-ids").background.$el.find("li[data-class]:not(.oe_custom_bg)");
-            var styles_index = $styles.index($styles.filter(".active")[0]);
-            var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
-            $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
-            $clone.addClass($select.data("class") || "");
-
-            return $clone;
-        },
-        // rebind event to active carousel on edit mode
-        rebind_event: function () {
-            var self = this;
-            this.$target.find('.carousel-control').off('click').on('click', function () {
-                self.$target.carousel( $(this).data('slide')); });
-
-            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
-            this.$target.find('.carousel-image').attr('attributeEditable', 'true');
-            this._super();
-        },
     });
 
-    website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({
+    website.snippet.styleRegistry.parallax = website.snippet.StyleEditor.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -1446,7 +1255,7 @@
         },
         scroll: function () {
             var self = this;
-            var $ul = this.$editor.find('ul[name="parallax-scroll"]');
+            var $ul = this.$el.find('ul[name="parallax-scroll"]');
             var $li = $ul.find("li");
             var speed = this.$target.data('scroll-background-ratio') || 0.6 ;
             $ul.find('[data-value="' + speed + '"]').addClass('active');
@@ -1468,13 +1277,211 @@
         }
     });
 
-    /*
-    * data-snippet-id automatically setted
-    * Don't need to add data-snippet-id="..." into the views
-    */
 
-    website.snippet.selector.push([".row > [class*='col-md-']", 'colmd']);
-    website.snippet.selector.push(['hr', 'hr']);
-    website.snippet.selector.push(['blockquote', 'quote']);
+    website.snippet.Editor = openerp.Class.extend({
+        init: function (BuildingBlock, dom) {
+            this.BuildingBlock = BuildingBlock;
+            this.$target = $(dom);
+            this.$overlay = this.$target.data('overlay');
+            this.snippet_id = this.$target.data("snippet-id");
+            this._readXMLData();
+            this.load_style_options();
+            this.get_parent_block();
+            this.start();
+        },
+
+        /*
+        *  _readXMLData
+        *  Read data XML and set value into:
+        *  this.$el :
+        *       all xml data
+        *  this.$overlay :
+        *       Dom hover the $target who content options
+        */
+        _readXMLData: function() {
+            var self = this;
+            this.$el = this.BuildingBlock.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
+            var $options = this.$overlay.find(".oe_overlay_options");
+            if ($options.find(".oe_options ul li").length) {
+                $options.find(".oe_options").removeClass("hidden");
+            }
+        },
+
+
+        // activate drag and drop for the snippets in the snippet toolbar
+        _drag_and_drop: function(){
+            var self = this;
+            this.dropped = false;
+            this.$overlay.draggable({
+                greedy: true,
+                appendTo: 'body',
+                cursor: "move",
+                handle: ".oe_snippet_move",
+                cursorAt: {
+                    left: 18,
+                    top: 14
+                },
+                helper: function() {
+                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
+                    $clone.find(".oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle").remove();
+                    $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
+                    $clone.appendTo("body").removeClass("hidden");
+                    return $clone;
+                },
+                start: _.bind(self._drag_and_drop_start, self),
+                stop: _.bind(self._drag_and_drop_stop, self)
+            });
+        },
+        _drag_and_drop_after_insert_dropzone: function (){},
+        _drag_and_drop_active_drop_zone: function ($zones){
+            var self = this;
+            $zones.droppable({
+                over:   function(){
+                    $(".oe_drop_zone.hide").removeClass("hide");
+                    $(this).addClass("hide").first().after(self.$target);
+                    self.dropped = true;
+                },
+                out:    function(){
+                    $(this).removeClass("hide");
+                    self.$target.detach();
+                    self.dropped = false;
+                },
+            });
+        },
+        _drag_and_drop_start: function (){
+            var self = this;
+            self.BuildingBlock.hide();
+            self.BuildingBlock.editor_busy = true;
+            self.size = {
+                width: self.$target.width(),
+                height: self.$target.height()
+            };
+            self.$target.after("<div class='oe_drop_clone' style='display: none;'/>");
+            self.$target.detach();
+            self.$overlay.addClass("hidden");
+
+            self.BuildingBlock.activate_insertion_zones({
+                siblings: self.$el ? self.$el.data('selector-siblings') : false,
+                children:   self.$el ? self.$el.data('selector-children') : false,
+                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
+            });
+
+            $("body").addClass('move-important');
+
+            self._drag_and_drop_after_insert_dropzone();
+            self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
+        },
+        _drag_and_drop_stop: function (){
+            var self = this;
+            if (!self.dropped) {
+                $(".oe_drop_clone").after(self.$target);
+            }
+            self.$overlay.removeClass("hidden");
+            $("body").removeClass('move-important');
+            $('.oe_drop_zone').droppable('destroy').remove();
+            $(".oe_drop_clone, .oe_drop_to_remove").remove();
+            self.BuildingBlock.editor_busy = false;
+            self.get_parent_block();
+            setTimeout(function () {self.BuildingBlock.create_overlay(self.$target);},0);
+        },
+
+        load_style_options: function () {
+            var self = this;
+            var $styles = this.$overlay.find('.oe_options');
+            var $ul = $styles.find('ul:first');
+            this.styles = {};
+            _.each(website.snippet.styles, function (val) {
+                if (!self.$target.is(val.selector)) {
+                    return;
+                }
+                var style = val['snippet-style-id'];
+                var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
+                var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
+                $ul.append(editor.$el.addClass("snippet-style-" + style));
+            });
+
+            if ($ul.find("li").length) {
+                $styles.removeClass("hidden");
+            }
+        },
+
+        get_parent_block: function () {
+            var self = this;
+            var $button = this.$overlay.find('.oe_snippet_parent');
+            var $parent = this.$target.parents("[data-snippet-id]:first");
+            if ($parent.length) {
+                $button.removeClass("hidden");
+                $button.off("click").on('click', function (event) {
+                    event.preventDefault();
+                    setTimeout(function () {
+                        self.BuildingBlock.make_active($parent);
+                    }, 0);
+                });
+            } else {
+                $button.addClass("hidden");
+            }
+        },
+
+        /*
+        *  start
+        *  This method is called after init and _readXMLData
+        */
+        start: function () {
+            var self = this;
+            this.$overlay.on('click', '.oe_snippet_clone', _.bind(this.on_clone, this));
+            this.$overlay.on('click', '.oe_snippet_remove', _.bind(this.on_remove, this));
+            this._drag_and_drop();
+        },
+
+        on_clone: function () {
+            var $clone = this.$target.clone(false);
+            this.$target.after($clone);
+            return false;
+        },
+
+        on_remove: function () {
+            this.onBlur();
+            var index = _.indexOf(this.BuildingBlock.snippets, this.$target.get(0));
+            delete this.BuildingBlock.snippets[index];
+            this.$target.remove();
+            this.$overlay.remove();
+            return false;
+        },
+
+        /*
+        *  drop_and_build_snippet
+        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
+        *  (after the insertion of this.$body, if this.$body exists)
+        */
+        drop_and_build_snippet: function ($target) {
+            for (var i in this.styles){
+                this.styles[i].drop_and_build_snippet($target);
+            }
+        },
+
+        /* onFocus
+        *  This method is called when the user click inside the snippet in the dom
+        */
+        onFocus : function () {
+            this.$overlay.addClass('oe_active');
+        },
+
+        /* onFocus
+        *  This method is called when the user click outside the snippet in the dom, after a focus
+        */
+        onBlur : function () {
+            this.$overlay.removeClass('oe_active');
+        },
+
+        /* clean_for_save
+        *  function called just before save vue
+        */
+        clean_for_save: function () {
+            this.$target.removeAttr('contentEditable')
+                .find('*').removeAttr('contentEditable');
+            this.$target.removeAttr('attributeEditable')
+                .find('*').removeAttr('attributeEditable');
+        },
+    });
 
 })();
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 6c1e387c958..8caac7c6683 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -97,7 +97,7 @@
                       target="fileframe"
                       class="col-sm-8">
                     <div class="text-center">
-                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f43c1c1bb80..08520bb2397 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -13,14 +13,7 @@
 
 <div id="snippet_structure" class="tab-pane fade in active">
 
-    <div data-snippet-id="carousel" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <li class="oe_snippet_options divider"></li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_banner.png"/>
             <span class="oe_snippet_thumbnail_title">Banner</span>
@@ -51,7 +44,7 @@
         </div>
     </div>
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
             <span class="oe_snippet_thumbnail_title">Text-Image</span>
@@ -79,7 +72,7 @@
     </div>
 
 
-    <div data-snippet-id="image-text" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
             <span class="oe_snippet_thumbnail_title">Image-Text</span>
@@ -107,7 +100,7 @@
     </div>
 
 
-    <div data-snippet-id="jumbotron" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
             <span class="oe_snippet_thumbnail_title">Big Message</span>
@@ -128,7 +121,7 @@
     </div>
 
 
-    <div data-snippet-id="text-block" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
             <span class="oe_snippet_thumbnail_title">Text Block</span>
@@ -166,7 +159,7 @@
     </div>
 
 
-    <div data-snippet-id="title" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_title.png"/>
             <span class="oe_snippet_thumbnail_title">Title</span>
@@ -183,7 +176,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="features" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_features.png"/>
             <span class="oe_snippet_thumbnail_title">Features</span>
@@ -214,7 +207,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
             <span class="oe_snippet_thumbnail_title">Big Picture</span>
@@ -246,7 +239,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_three_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Three Columns</span>
@@ -291,7 +284,7 @@
 
 <div id="snippet_content" class="tab-pane fade">
 
-    <div data-snippet-id="well" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_well.png"/>
             <span class="oe_snippet_thumbnail_title">Well</span>
@@ -303,7 +296,7 @@
     </div>
 
 
-    <div data-snippet-id="quote" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quote.png"/>
             <span class="oe_snippet_thumbnail_title">Quote</span>
@@ -318,7 +311,7 @@
     </div>
 
 
-    <div data-snippet-id="panel" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_panel.png"/>
             <span class="oe_snippet_thumbnail_title">Panel</span>
@@ -335,7 +328,7 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
             <span class="oe_snippet_thumbnail_title">Separator</span>
@@ -347,7 +340,7 @@
 
 <div id="snippet_feature" class="tab-pane fade">
 
-    <div data-snippet-id="portfolio" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_portfolio.png"/>
             <span class="oe_snippet_thumbnail_title">Portfolio</span>
@@ -380,7 +373,7 @@
     </div>
 
 
-    <div data-snippet-id="image-gallery" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_gallery.png"/>
             <span class="oe_snippet_thumbnail_title">Image Gallery</span>
@@ -422,7 +415,7 @@
     </div>
 
 
-    <div data-snippet-id="pricing" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
             <span class="oe_snippet_thumbnail_title">Comparisons</span>
@@ -528,7 +521,7 @@
     </div>
 
 
-    <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
             <span class="oe_snippet_thumbnail_title">Button</span>
@@ -545,7 +538,7 @@
     </div>
 
 
-    <div data-snippet-id="faq" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_faq.png"/>
             <span class="oe_snippet_thumbnail_title">FAQ</span>
@@ -592,7 +585,7 @@
     </div>
 
 
-    <div data-snippet-id="references" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_references.png"/>
             <span class="oe_snippet_thumbnail_title">References</span>
@@ -609,7 +602,7 @@
                         </h3>
                     </div>
                     <div class="col-md-4 col-md-offset-1 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
+                        <blockquote>
                             <p>
                                 Write a quote here from one of your customers. Quotes are a
                                 great way to build confidence in your products or services.
@@ -618,7 +611,7 @@
                         </blockquote>
                     </div>
                     <div class="col-md-4 col-md-offset-2 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
+                        <blockquote>
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
@@ -646,14 +639,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="slider" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <li class="oe_snippet_options divider"></li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quotes_slider.png"/>
             <span class="oe_snippet_thumbnail_title">Quotes Slider</span>
@@ -706,7 +692,7 @@
         </div>
     </div>
 
-    <div data-snippet-id="features-list" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_features.png"/>
             <span class="oe_snippet_thumbnail_title">Feature Grid</span>
@@ -766,22 +752,11 @@
 
 <div id="snippet_effect" class="tab-pane fade">
 
-    <div data-snippet-id="parallax" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/>
             <span class="oe_snippet_thumbnail_title">Parallax</span>
         </div>
-        <li class="oe_snippet_options dropdown-submenu">
-            <a tabindex="-1" href="#">Scroll Speed</a>
-            <ul class="dropdown-menu" name="parallax-scroll">
-                <li data-value="0"><a>Static</a></li>
-                <li data-value="0.3"><a>Very Slow</a></li>
-                <li data-value="0.6"><a>Slow</a></li>
-                <li data-value="1"><a>Fixed</a></li>
-                <li data-value="1.4"><a>Fast</a></li>
-                <li data-value="1.7"><a>Very Fast</a></li>
-            </ul>
-        </li>
         <section class="oe_snippet_body parallax"
                 style="height: 320px; background-image: url('/website/static/src/img/banner/mountains.jpg')"
                 data-scroll-background-ratio="0.3">
@@ -789,17 +764,17 @@
         </section>
     </div>
 
-    <div data-snippet-id="parallax_quote" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quotes_slider.png"/>
             <span class="oe_snippet_thumbnail_title">Parallax Slider</span>
         </div>
-        <section class="oe_snippet_body parallax" data-snippet-id="parallax"
+        <section class="oe_snippet_body parallax"
                  style="height: 320px; background-image: url('/website/static/src/img/parallax/quote.png')"
                 data-scroll-background-ratio="0.3">
             <div>
                 <div class="oe_structure">
-                    <div id="myQuoteCarousel" class="carousel quotecarousel slide mb0" data-snippet-id="slider">
+                    <div id="myQuoteCarousel" class="carousel quotecarousel slide mb0">
                         <!-- Indicators -->
                         <ol class="carousel-indicators mb0">
                             <li data-target="#myQuoteCarousel" data-slide-to="0" class="active"></li>
@@ -852,50 +827,20 @@
 
 </div>
 
-<!-- use to declare snippet for snippet editor -->
-<div id="snippet_hidden" class="hidden">
-
-    <div data-snippet-id='colmd' data-selector-vertical-children='.row'>
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_column.png"/>
-            <span class="oe_snippet_thumbnail_title">Add Column</span>
-        </div>
-        <div class="oe_snippet_body col-md-4">
-            <img class="img img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
-            <h4 class="mt16">Feature</h4>
-            <p>
-                Delete the above image or replace it with a picture
-                that illustrates your message. Click on the picture to
-                change it's <em>rounded corner</em> style.
-            </p>
-        </div>
-    </div>
-
-</div>
-
 <div id="snippet_styles" class="hidden">
 
-    <div data-snippet-style-id='text-style' data-selector="section">
+    <div data-snippet-style-id='blog-style'
+        data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
             <ul class="dropdown-menu">
-                <li data-class="readable"><a>Readability</a></li>
+                <li data-class="readable"><a>Blog Style</a></li>
             </ul>
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel-style' data-selector="div[data-snippet-id='carousel']">
-        <li class="dropdown-submenu" data-required="true">
-            <a tabindex="-1" href="#">Layout</a>
-            <ul class="dropdown-menu">
-                <li data-class="text_only"><a>Text Only</a></li>
-                <li data-class="image_text"><a>Image - Text</a></li>
-                <li data-class="text_image"><a>Text - Image</a></li>
-            </ul>
-        </li>
-    </div>
-
-    <div data-snippet-style-id='background' data-selector="section, section[data-snippet-id='parallax'], div[data-snippet-id='carousel'], div[data-snippet-id='slider']">
+    <div data-snippet-style-id='background'
+        data-selector="section, .carousel, .parallax">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu">
@@ -951,6 +896,65 @@
         </li>
     </div>
 
+    <div data-snippet-style-id='carousel'
+        data-selector=".carousel">
+        <li class="divider"></li>
+        <li>
+            <a href="#" class="button js_add">Add Slide</a>
+        </li>
+        <li>
+            <a href="#" class="button js_remove">Remove Slide</a>
+        </li>
+    </div>
+
+    <div data-snippet-style-id='carousel-style'
+        data-selector="div[data-snippet-id='carousel']">
+        <li class="dropdown-submenu" data-required="true">
+            <a tabindex="-1" href="#">Layout</a>
+            <ul class="dropdown-menu">
+                <li data-class="text_only"><a>Text Only</a></li>
+                <li data-class="image_text"><a>Image - Text</a></li>
+                <li data-class="text_image"><a>Text - Image</a></li>
+            </ul>
+        </li>
+    </div>
+
+    <div data-snippet-style-id='margin-y'
+        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr"
+        data-selector-children=".oe_structure, [data-oe-type=html]">
+    </div>
+
+    <div data-snippet-style-id='resize'
+        data-selector="section, .carousel, .parallax"
+        data-selector-children=".oe_structure, [data-oe-type=html]">
+    </div>
+
+    <div data-snippet-style-id='margin-x'
+        data-selector=".row > [class*='col-md-']"
+        data-selector-vertical-children='.row'>
+    </div>
+
+    <div data-snippet-style-id='content'
+        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-children=".content">
+    </div>
+
+    <div data-snippet-style-id='parallax'
+        data-selector=".parallax">
+        <li class="dropdown-submenu">
+            <a tabindex="-1" href="#">Scroll Speed</a>
+            <ul class="dropdown-menu" name="parallax-scroll">
+                <li data-value="0"><a>Static</a></li>
+                <li data-value="0.3"><a>Very Slow</a></li>
+                <li data-value="0.6"><a>Slow</a></li>
+                <li data-value="1"><a>Fixed</a></li>
+                <li data-value="1.4"><a>Fast</a></li>
+                <li data-value="1.7"><a>Very Fast</a></li>
+            </ul>
+        </li>
+    </div>
+
 </div>
 
     </div>

From 4a80c007e38cf27b8a2b3d2d2b28b1181448e749 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 13:19:45 +0100
Subject: [PATCH 017/175] [IMP] website: snippet selector

bzr revid: chm@openerp.com-20140303121945-d2ynze1vja5v0d7d
---
 .../static/src/js/website.snippets.editor.js  | 27 ++++++++++++++-----
 addons/website/views/snippets.xml             |  3 +--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index addd610e47b..891ebc079a8 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -356,9 +356,6 @@
                                 "data-selector-siblings, data-selector-children or data-selector-vertical-children tag for mutate action");
                             return;
                         }
-                        console.log(selector_siblings);
-                        console.log(selector_children);
-                        console.log(selector_vertical_children);
                         self.activate_insertion_zones({
                             siblings: selector_siblings.join(","),
                             children: selector_children.join(","),
@@ -1361,10 +1358,11 @@
             self.$overlay.addClass("hidden");
 
             self.BuildingBlock.activate_insertion_zones({
-                siblings: self.$el ? self.$el.data('selector-siblings') : false,
-                children:   self.$el ? self.$el.data('selector-children') : false,
-                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
+                siblings: self.selector_siblings,
+                children: self.selector_children,
+                vertical_children: self.selector_vertical_children,
             });
+            console.log(self);
 
             $("body").addClass('move-important');
 
@@ -1390,15 +1388,32 @@
             var $styles = this.$overlay.find('.oe_options');
             var $ul = $styles.find('ul:first');
             this.styles = {};
+            this.selector_siblings = [];
+            this.selector_children = [];
+            this.selector_vertical_children = [];
             _.each(website.snippet.styles, function (val) {
                 if (!self.$target.is(val.selector)) {
                     return;
                 }
+                if (val['selector-siblings']) self.selector_siblings.push(val['selector-siblings']);
+                if (val['selector-children']) self.selector_children.push(val['selector-children']);
+                if (val['selector-vertical-children']) self.selector_vertical_children.push(val['selector-vertical-children']);
+
                 var style = val['snippet-style-id'];
                 var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
                 var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
+            this.selector_siblings = this.selector_siblings.join(",");
+            if (this.selector_siblings === "")
+                this.selector_siblings = false;
+            this.selector_children = this.selector_children.join(",");
+            if (this.selector_children === "")
+                this.selector_children = false;
+            this.selector_vertical_children = this.selector_vertical_children.join(",");
+            if (this.selector_vertical_children === "")
+                this.selector_vertical_children = false;
+
 
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 08520bb2397..88f1c7a50bd 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -920,8 +920,7 @@
     </div>
 
     <div data-snippet-style-id='margin-y'
-        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr"
-        data-selector-children=".oe_structure, [data-oe-type=html]">
+        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>
 
     <div data-snippet-style-id='resize'

From 68749a06831a3f3e22c75b8647ecfdafe99429c0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 15:20:17 +0100
Subject: [PATCH 018/175] [IMP] website: snippet: remove data-snippet-id and
 add auto resize on resising option

bzr revid: chm@openerp.com-20140303142017-jcb3401wpiuvbc1n
---
 addons/website/data/website_demo.xml          |   4 +-
 addons/website/static/src/css/snippets.css    |   5 -
 addons/website/static/src/css/snippets.sass   |   4 -
 addons/website/static/src/css/website.css     |   9 +-
 addons/website/static/src/css/website.sass    |   7 +-
 .../src/js/website.snippets.animation.js      |   5 +-
 .../static/src/js/website.snippets.editor.js  | 115 ++++++++----------
 .../static/src/js/website.tour.banner.js      |   2 +-
 addons/website/views/snippets.xml             |  23 ++--
 9 files changed, 76 insertions(+), 98 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 8abf901fd89..63900506741 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -25,7 +25,7 @@
     <t t-set="additional_title">Partner Detail</t>
     <div id="wrap">
         <div class="oe_structure">
-            <section data-snippet-id="title">
+            <section>
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
@@ -73,7 +73,7 @@ response = request.website.render("website.template_partner_post", values)
     <t t-set="additional_title">Partners</t>
     <div id="wrap">
         <div class="oe_structure">
-            <section data-snippet-id="title">
+            <section>
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index fe9c18c0081..3f5373e57e4 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -608,8 +608,3 @@
   height: 16px;
   display: inline-block;
 }
-
-[data-snippet-id] {
-  min-height: 10px;
-  min-width: 10px;
-}
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index a06bba01dba..f9432b3749d 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -483,10 +483,6 @@
             height: 16px
             display: inline-block
 
-[data-snippet-id] 
-    min-height: 10px
-    min-width: 10px
-
 
 
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e47b7a41baa..78262bc7dd4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -280,12 +280,13 @@ ul.nav-stacked > li > a {
   background-size: 100%;
 }
 
-[data-snippet-id], .colmd, .hr, .blockquote {
+section, .carousel, .parallax, .row, .hr, .blockquote {
+  min-height: 30px;
   overflow: hidden;
 }
 
 @media (max-width: 400px) {
-  [data-snippet-id]:not([data-snippet-id="carousel"]) {
+  section, .parallax, .row, .hr, .blockquote {
     height: auto !important;
   }
 }
@@ -380,10 +381,10 @@ ul.nav-stacked > li > a {
 }
 
 /* Parallax Theme */
-div.carousel[data-snippet-id="slider"] .carousel-indicators li {
+div.carousel .carousel-indicators li {
   border: 1px solid grey;
 }
-div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
+div.carousel .carousel-indicators .active {
   background-color: grey;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 3cdfe37a896..680f26cef07 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -230,11 +230,12 @@ ul.nav-stacked > li > a
 .oe_img_bg
     background-size: 100%
 
-[data-snippet-id],.colmd,.hr,.blockquote
+section, .carousel, .parallax, .row, .hr, .blockquote
+    min-height: 30px
     overflow: hidden
 
 @media (max-width: 400px)
-    [data-snippet-id]:not([data-snippet-id="carousel"])
+    section, .parallax, .row, .hr, .blockquote
         height: auto !important
 
 .carousel-inner
@@ -312,7 +313,7 @@ ul.nav-stacked > li > a
 
 /* Parallax Theme */
 
-div.carousel[data-snippet-id="slider"]
+div.carousel
     .carousel-indicators
         li
             border: 1px solid grey
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 01e4c5239cb..e07e58e59e7 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -8,9 +8,10 @@
     website.snippet.start_animation = function ($target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
-            var selector = "[data-snippet-id='"+k+"']";
+            var selector = "";
             if (Animation.prototype.selector) {
-                selector += ", " + Animation.prototype.selector;
+                if (selector != "") selector += ", " 
+                selector += Animation.prototype.selector;
             }
             if ($target) {
                 if ($target.is(selector)) selector = $target;
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 891ebc079a8..94035d27544 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -36,7 +36,6 @@
             // FIXME: call clean_for_save on all snippets of the page, not only modified ones
             // important for banner of parallax that changes data automatically.
             this.snippets.clean_for_save();
-            remove_added_snippet_id();
             this._super();
         },
     });
@@ -49,38 +48,13 @@
                 })) {
             return;
         }
-        hack_to_add_snippet_id()
-    });
-
-    // puts $el at the same absolute position as $target
-    function hack_to_add_snippet_id () {
-        _.each(website.snippet.selector, function (val) {
-            $(val[0]).each(function() {
-                if (!$(this).is("[data-snippet-id]") && $(this).parents("[data-oe-model]").length) {
-                    $(this).attr("data-snippet-id", val[1]);
-                }
-            });
-        });
-    }
-    function remove_added_snippet_id () {
-        _.each(website.snippet.selector, function (val) {
-            $(val[0]).each(function() {
-                if ($(this).data("snippet-id") === val[1]) {
-                    $(this).removeAttr("data-snippet-id");
-                }
-            });
-        });
-    }
-
-    $(document).ready(function() {
-        hack_to_add_snippet_id();
     });
 
     // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
     // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
 
     if (!website.snippet) website.snippet = {};
-    website.snippet.styles = {};
+    website.snippet.templateOptions = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
@@ -92,7 +66,6 @@
                 $("<div id='oe_manipulators'></div>").appendTo('body');
             }
             this.$active_snipped_id = false;
-            hack_to_add_snippet_id();
             this.snippets = [];
 
             observer.observe(document.body, {
@@ -159,12 +132,12 @@
                 .then(function (html) {
                     var $html = $(html);
 
-                    var $styles = $html.find("[data-snippet-style-id]");
+                    var $styles = $html.find("[data-snippet-option-id]");
                     $styles.each(function () {
                         var $style = $(this);
-                        var style_id = $style.data('snippet-style-id');
-                        website.snippet.styles[style_id] = {
-                            'snippet-style-id' : style_id,
+                        var style_id = $style.data('snippet-option-id');
+                        website.snippet.templateOptions[style_id] = {
+                            'snippet-option-id' : style_id,
                             'selector': $style.data('selector'),
                             '$el': $style,
                             'selector-siblings': $style.data('selector-siblings'),
@@ -223,8 +196,8 @@
                 }
                 snipped_event_flag = true;
                 var selector = [];
-                for (var k in website.snippet.styles) {
-                    selector.push(website.snippet.styles[k].selector);
+                for (var k in website.snippet.templateOptions) {
+                    selector.push(website.snippet.templateOptions[k].selector);
                 }
                 selector = selector.join(",");
 
@@ -336,15 +309,15 @@
                     var selector_siblings = [];
                     var selector_children = [];
                     var selector_vertical_children = [];
-                    for (var k in website.snippet.styles) {
-                        if ($toInsert.is(website.snippet.styles[k].selector)) {
-                            selector.push(website.snippet.styles[k].selector);
-                            if (website.snippet.styles[k]['selector-siblings'])
-                                selector_siblings.push(website.snippet.styles[k]['selector-siblings']);
-                            if (website.snippet.styles[k]['selector-children'])
-                                selector_children.push(website.snippet.styles[k]['selector-children']);
-                            if (website.snippet.styles[k]['selector-vertical-children'])
-                                selector_vertical_children.push(website.snippet.styles[k]['selector-vertical-children']);
+                    for (var k in website.snippet.templateOptions) {
+                        if ($toInsert.is(website.snippet.templateOptions[k].selector)) {
+                            selector.push(website.snippet.templateOptions[k].selector);
+                            if (website.snippet.templateOptions[k]['selector-siblings'])
+                                selector_siblings.push(website.snippet.templateOptions[k]['selector-siblings']);
+                            if (website.snippet.templateOptions[k]['selector-children'])
+                                selector_children.push(website.snippet.templateOptions[k]['selector-children']);
+                            if (website.snippet.templateOptions[k]['selector-vertical-children'])
+                                selector_vertical_children.push(website.snippet.templateOptions[k]['selector-vertical-children']);
                         }
                     }
 
@@ -418,8 +391,8 @@
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 
-                            for (var k in website.snippet.styles) {
-                                $target.find(website.snippet.styles[k].selector).each(function () {
+                            for (var k in website.snippet.templateOptions) {
+                                $target.find(website.snippet.templateOptions[k].selector).each(function () {
                                     var $snippet = $(this);
                                     self.create_overlay($snippet);
                                     if ($snippet.data("snippet-editor")) {
@@ -545,7 +518,7 @@
         // generate drop zones covering the elements selected by the selector
         // we generate overlay drop zones only to get an idea of where the snippet are, the drop
         activate_overlay_zones: function(selector){
-            var $targets = this.dom_filter(selector || '[data-snippet-id]');
+            var $targets = this.dom_filter(selector);
             var self = this;
 
             if (typeof selector !== 'string' && !$targets.length) {
@@ -590,18 +563,18 @@
     });
 
 
-    website.snippet.styleRegistry = {};
-    website.snippet.StyleEditor = openerp.Class.extend({
+    website.snippet.options = {};
+    website.snippet.Option = openerp.Class.extend({
         // initialisation (don't overwrite)
         init: function (BuildingBlock, $target, snippet_id) {
             this.BuildingBlock = BuildingBlock;
             this.$target = $target;
-            var styles = this.$target.data("snippet-style-ids") || {};
+            var styles = this.$target.data("snippet-option-ids") || {};
             styles[snippet_id] = this;
-            this.$target.data("snippet-style-ids", styles);
+            this.$target.data("snippet-option-ids", styles);
             this.$overlay = this.$target.data('overlay');
-            this['snippet-style-id'] = snippet_id;
-            this.$el = website.snippet.styles[snippet_id].$el.find(">li").clone();
+            this['snippet-option-id'] = snippet_id;
+            this.$el = website.snippet.templateOptions[snippet_id].$el.find(">li").clone();
 
             this.required = this.$el.data("required");
 
@@ -717,7 +690,7 @@
         }
     });
 
-    website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
+    website.snippet.options.background = website.snippet.Option.extend({
         _get_bg: function () {
             return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
         },
@@ -782,7 +755,7 @@
             this.$el.find('li:has(li[data-class].active)').addClass("active");
         }
     });
-    website.snippet.styleRegistry.slider = website.snippet.StyleEditor.extend({
+    website.snippet.options.slider = website.snippet.Option.extend({
         drop_and_build_snippet: function() {
             var id = $(".carousel").length;
             this.id = "myCarousel" + id;
@@ -869,7 +842,7 @@
             }
         },
     });
-    website.snippet.styleRegistry.carousel = website.snippet.styleRegistry.slider.extend({
+    website.snippet.options.carousel = website.snippet.options.slider.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -895,8 +868,8 @@
             };
             this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
                 var $active = self.$target.find(".item.active");
-                if (style['snippet-style-id'] === "size") return;
-                if (style['snippet-style-id'] === "background") {
+                if (style['snippet-option-id'] === "size") return;
+                if (style['snippet-option-id'] === "background") {
                     $active.css("background-image", self.$target.css("background-image"));
                 }
                 if (np.$prev) {
@@ -923,7 +896,7 @@
             var $clone = this._super();
 
             // choose an other background
-            var bg = this.$target.data("snippet-style-ids").background;
+            var bg = this.$target.data("snippet-option-ids").background;
             if (!bg) return $clone;
 
             var $styles = bg.$el.find("li[data-class]:not(.oe_custom_bg)");
@@ -946,7 +919,7 @@
         },
     });
 
-    website.snippet.styleRegistry.resize = website.snippet.StyleEditor.extend({
+    website.snippet.options.marginAndResize = website.snippet.Option.extend({
         start: function () {
             var self = this;
             this._super();
@@ -1111,7 +1084,7 @@
             this.change_cursor();
         }
     });
-    website.snippet.styleRegistry["margin-y"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["margin-y"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             var grid = [0,4,8,16,32,48,64,92,128];
@@ -1125,7 +1098,7 @@
             return this.grid;
         },
     });
-    website.snippet.styleRegistry["margin-x"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["margin-x"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             var width = this.$target.parents(".row:first").first().outerWidth();
@@ -1223,15 +1196,24 @@
             this._super(compass, beginClass, current);
         },
     });
-    website.snippet.styleRegistry["resize"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["resize"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
             return this.grid;
         },
+        start: function () {
+            var self = this;
+            this._super();
+            this.$el.find(".js_size_auto").on('click', function (event){
+                self.$target.css("height", "");
+                self.BuildingBlock.cover_target(self.$overlay, self.$target);
+                return false;
+            });
+        },
     });
 
-    website.snippet.styleRegistry.parallax = website.snippet.StyleEditor.extend({
+    website.snippet.options.parallax = website.snippet.Option.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -1362,7 +1344,6 @@
                 children: self.selector_children,
                 vertical_children: self.selector_vertical_children,
             });
-            console.log(self);
 
             $("body").addClass('move-important');
 
@@ -1391,7 +1372,7 @@
             this.selector_siblings = [];
             this.selector_children = [];
             this.selector_vertical_children = [];
-            _.each(website.snippet.styles, function (val) {
+            _.each(website.snippet.templateOptions, function (val) {
                 if (!self.$target.is(val.selector)) {
                     return;
                 }
@@ -1399,8 +1380,8 @@
                 if (val['selector-children']) self.selector_children.push(val['selector-children']);
                 if (val['selector-vertical-children']) self.selector_vertical_children.push(val['selector-vertical-children']);
 
-                var style = val['snippet-style-id'];
-                var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
+                var style = val['snippet-option-id'];
+                var Editor = website.snippet.options[style] || website.snippet.Option;
                 var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 1d4a0c0f752..97568e37f35 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -47,7 +47,7 @@
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   '#wrap [data-snippet-id=carousel]:first .carousel-caption',
+                    element:   '#wrap .carousel:first .carousel-caption',
                     placement: 'top',
                     title:     _("Customize banner's text"),
                     content:   _("Click in the text and start editing it."),
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 88f1c7a50bd..e9cb694a358 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -827,9 +827,9 @@
 
 </div>
 
-<div id="snippet_styles" class="hidden">
+<div id="snippet_options" class="hidden">
 
-    <div data-snippet-style-id='blog-style'
+    <div data-snippet-option-id='blog-style'
         data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
@@ -839,7 +839,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='background'
+    <div data-snippet-option-id='background'
         data-selector="section, .carousel, .parallax">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
@@ -896,7 +896,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel'
+    <div data-snippet-option-id='carousel'
         data-selector=".carousel">
         <li class="divider"></li>
         <li>
@@ -907,7 +907,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel-style'
+    <div data-snippet-option-id='carousel-style'
         data-selector="div[data-snippet-id='carousel']">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Layout</a>
@@ -919,27 +919,30 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='margin-y'
+    <div data-snippet-option-id='margin-y'
         data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>
 
-    <div data-snippet-style-id='resize'
+    <div data-snippet-option-id='resize'
         data-selector="section, .carousel, .parallax"
         data-selector-children=".oe_structure, [data-oe-type=html]">
+        <li>
+            <a href="#" class="button js_size_auto">Size Automatic</a>
+        </li>
     </div>
 
-    <div data-snippet-style-id='margin-x'
+    <div data-snippet-option-id='margin-x'
         data-selector=".row > [class*='col-md-']"
         data-selector-vertical-children='.row'>
     </div>
 
-    <div data-snippet-style-id='content'
+    <div data-snippet-option-id='content'
         data-selector="p, h1, h2, h3, blockquote, .well, .panel"
         data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
         data-selector-children=".content">
     </div>
 
-    <div data-snippet-style-id='parallax'
+    <div data-snippet-option-id='parallax'
         data-selector=".parallax">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Scroll Speed</a>

From 7cf77276fbad07f9757255bf08adc927f80e0036 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 5 Mar 2014 18:54:11 +0100
Subject: [PATCH 019/175] [IMP] website snippet: add Configurable follow
 snippet

bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
---
 addons/website/static/src/css/snippets.css    |  2 +-
 addons/website/static/src/css/snippets.sass   |  2 +-
 addons/website/static/src/js/website.js       |  2 +
 .../static/src/js/website.snippets.editor.js  | 13 +++++-
 addons/website_mail/models/__init__.py        |  1 +
 addons/website_mail/views/snippets.xml        | 45 +++++++++++++++++++
 addons/website_mail/views/website_mail.xml    |  1 +
 7 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 3f5373e57e4..4baa2b06f2d 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -342,7 +342,7 @@
   position: absolute;
   width: 100%;
   text-align: center;
-  top: -11px;
+  top: -20px;
   z-index: 1002;
 }
 .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a {
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index f9432b3749d..1be99e27f19 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -258,7 +258,7 @@
         position: absolute
         width: 100%
         text-align: center
-        top: -11px
+        top: -20px
         z-index: 1002
         .btn, a
             pointer-events: auto
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 671dfc14ee9..b99004243a2 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -229,11 +229,13 @@
             dialog.on('click', '.btn-primary', function () {
                 def.resolve(field.val(), field, dialog);
                 dialog.remove();
+                $('.modal-backdrop').remove();
             });
         });
         dialog.on('hidden.bs.modal', function () {
             def.reject();
             dialog.remove();
+            $('.modal-backdrop').remove();
         });
         if (field.is('input[type="text"], select')) {
             field.keypress(function (e) {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 94035d27544..b9b697f99a1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -566,8 +566,9 @@
     website.snippet.options = {};
     website.snippet.Option = openerp.Class.extend({
         // initialisation (don't overwrite)
-        init: function (BuildingBlock, $target, snippet_id) {
+        init: function (BuildingBlock, editor, $target, snippet_id) {
             this.BuildingBlock = BuildingBlock;
+            this.editor = editor;
             this.$target = $target;
             var styles = this.$target.data("snippet-option-ids") || {};
             styles[snippet_id] = this;
@@ -687,6 +688,11 @@
                 .first()
                 .addClass("active");
             this.$el.find('li:has(li[data-class].active)').addClass("active");
+        },
+        /* clean_for_save
+        *  function called just before save vue
+        */
+        clean_for_save: function () {
         }
     });
 
@@ -1382,7 +1388,7 @@
 
                 var style = val['snippet-option-id'];
                 var Editor = website.snippet.options[style] || website.snippet.Option;
-                var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
+                var editor = self.styles[style] = new Editor(self.BuildingBlock, self, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
             this.selector_siblings = this.selector_siblings.join(",");
@@ -1473,6 +1479,9 @@
         *  function called just before save vue
         */
         clean_for_save: function () {
+            for (var i in this.styles){
+                this.styles[i].clean_for_save();
+            }
             this.$target.removeAttr('contentEditable')
                 .find('*').removeAttr('contentEditable');
             this.$target.removeAttr('attributeEditable')
diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index e60de014149..fd8997c645f 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,3 +1,4 @@
 import mail_message
 import mail_thread
 import email_template
+import website
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 35932f6f7c3..3a1f8ab07bf 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -491,5 +491,50 @@
     </div>
 
 </template>
+
+
+<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe">
+
+    <xpath expr="//div[@id='snippet_content']" position="inside">
+        <div>
+            <div class="oe_snippet_thumbnail">
+                <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+                <span class="oe_snippet_thumbnail_title">Subscribe Button</span>
+            </div>
+
+            <div class="oe_snippet_body input-group js_follow"
+                      data-id="0"
+                      data-object="mail.group"
+                      data-follow="off">
+                <input
+                      type="email"
+                      name="email"
+                      class="js_follow_email form-control"
+                      t-att-value="email or ''"
+                      placeholder="your email..."/>
+                <span class="input-group-btn">
+                    <button href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</button>
+                    <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
+                </span>
+                <div class="alert alert-success hidden">Thanks for your subscription!</div>
+            </div>
+
+        </div>
+    </xpath>
+
+
+    <xpath expr="//div[@id='snippet_options']" position="inside">
+        <div data-snippet-option-id='subscribe'
+            data-selector=".js_follow"
+            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+            data-selector-children=".content">
+            <li>
+                <a href="#" class="button js_mailing_list">Select a mailing list</a>
+            </li>
+        </div>
+    </xpath>
+
+</template>
+
 </data>
 </openerp>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index e7a17c8f3db..4f128248bac 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -22,6 +22,7 @@
 
 <template id="head" inherit_id="website.layout" name="Mail customization">
     <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
         <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>

From 58a5f907584d4f06f19362b21aae6bd3816abe79 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 14:02:40 +0100
Subject: [PATCH 020/175] [IMP] website: dynamic website_mail snippet with js

bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
---
 .../src/js/website.snippets.animation.js      |  6 +-
 .../static/src/js/website.snippets.editor.js  |  2 +-
 addons/website/views/snippets.xml             | 20 ++++++-
 addons/website_mail/controllers/main.py       | 10 ++++
 .../static/src/css/website_mail.css           |  1 +
 .../static/src/js/website_mail.editor.js      | 37 ++++++++++++
 .../static/src/js/website_mail.js             | 58 ++++++++++++++-----
 addons/website_mail/views/snippets.xml        | 34 ++++++-----
 addons/website_mail/views/website_mail.xml    |  1 -
 9 files changed, 133 insertions(+), 36 deletions(-)
 create mode 100644 addons/website_mail/static/src/js/website_mail.editor.js

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index e07e58e59e7..2b6373ac226 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -38,7 +38,9 @@
             }
         });
     };
-    $(document).ready(function () {website.snippet.start_animation();});
+    $(document).ready(function () {
+        website.snippet.start_animation();
+    });
 
 
     website.snippet.animationRegistry = {};
@@ -110,7 +112,7 @@
             img.onload = function () {
                 var offset = 0;
                 var padding =  parseInt($(document.body).css("padding-top"));
-                if (speed < 1) {
+                if (speed > 1) {
                     var inner_offset = - self.$target.outerHeight() + this.height / this.width * document.body.clientWidth;
                     var outer_offset = self.$target.offset().top - (document.body.clientHeight - self.$target.outerHeight()) - padding;
                     offset = - outer_offset * speed + inner_offset;
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index b9b697f99a1..2c9d00c8e27 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -18,7 +18,7 @@
         },
         edit: function () {
             var self = this;
-            $("body").off('click');
+            $("[data-oe-model] *, [data-oe-type=html] *").off('click');
             window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
             this.snippets.appendTo(this.$el);
 
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index e9cb694a358..c2c9f9a55fe 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -829,6 +829,16 @@
 
 <div id="snippet_options" class="hidden">
 
+    <t t-call="website.snippet_options"/>
+
+</div>
+
+    </div>
+</div>
+</template>
+
+<template id="snippet_options">
+
     <div data-snippet-option-id='blog-style'
         data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
@@ -957,10 +967,14 @@
         </li>
     </div>
 
-</div>
-
+    <div data-snippet-option-id='content'
+        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-children=".content">
     </div>
-</div>
+
 </template>
+
+
 </data>
 </openerp>
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index f700fa7dc67..0da804a4f1c 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -56,3 +56,13 @@ class WebsiteMail(http.Controller):
         follower_ids = [p.id for p in obj.message_follower_ids]
 
         return partner_ids[0] in follower_ids and 1 or 0
+
+    @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
+    def call(self, model, id, **post):
+        public_id = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
+        value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
+        return {
+            'is_public': request.uid == public_id, 
+            'is_follower': value and value[0]['message_is_follower'] or False
+        }
+
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
index 5678442416c..25d88ebf191 100644
--- a/addons/website_mail/static/src/css/website_mail.css
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -1,4 +1,5 @@
 .js_follow[data-follow='on'] .js_follow_btn ,
+.js_follow[data-follow='on'] .js_follow_email,
 .js_follow[data-follow='off'] .js_unfollow_btn {
     display: none;
 }
\ No newline at end of file
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
new file mode 100644
index 00000000000..c67f0eba2b8
--- /dev/null
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -0,0 +1,37 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+    var _t = openerp._t;
+
+    website.snippet.options.subscribe = website.snippet.Option.extend({
+        on_prompt: function () {
+            var self = this;
+            return website.prompt({
+                id: "editor_new_subscribe_button",
+                window_title: _t("New Subscribe Button"),
+                select: _t("Mailing List"),
+                init: function (field) {
+                    return website.session.model('mail.group')
+                            .call('name_search', ['', [['public','=','public']]], { context: website.get_context() });
+                },
+            }).then(function (mail_group_id) {
+                self.$target.attr("data-id", mail_group_id);
+            });
+        },
+        drop_and_build_snippet: function() {
+            var self = this;
+            this._super();
+            this.on_prompt().fail(function () {
+                self.editor.on_remove();
+            });
+        },
+        start : function () {
+            var self = this;
+            this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
+            this._super();
+        },
+    });
+})();
+
+
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 862e061afd6..15f7e4381a0 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -1,30 +1,62 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
+        selector: ".js_follow",
+        start: function () {
+            var self = this;
+
+            openerp.jsonRpc('/website_mail/is_follower/', 'call', {
+                model: this.$target.data('object'),
+                id: +this.$target.data('id'),
+            }).always(function (data) {
+
+                var $input = self.$target.find('input.js_follow_email');
+                if(data.is_public) {
+                    $input.removeClass("hidden");
+                } else {
+                    $input.addClass("hidden");
+                }
+
+                self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
+            });
+        },
+    });
+})();
+
 $(document).ready(function () {
 
-    $(document).on('click', '.js_follow_btn, .js_unfollow_btn', function (ev) {
+    $('.js_follow > .alert').addClass("hidden");
+    $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+
+    $('.js_follow_btn, .js_unfollow_btn').on('click', function (ev) {
         ev.preventDefault();
 
-        var self = this;
-        var $data = $(this).parents("div.js_follow");
-        var $email = $data.find(".js_follow_email");
+        var $follow = $(this).parents("div.js_follow");
+        var $email = $follow.find(".js_follow_email:visible");
 
         if ($email.length && !$email.val().match(/.+@.+/)) {
+            $follow.addClass('has-error');
             return false;
         }
 
-        var message_is_follower = $data.attr("data-follow") || "off";
-        $data.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
+        $email.removeClass('has-error');
+
+        var message_is_follower = $follow.attr("data-follow") || "off";
+        $follow.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
 
         openerp.jsonRpc('/website_mail/follow', 'call', {
-            'id': $data.data('id'),
-            'object': $data.data('object'),
+            'id': +$follow.data('id'),
+            'object': $follow.data('object'),
             'message_is_follower': message_is_follower,
             'email': $email.length ? $email.val() : false,
-        }).then(function (result) {
-            if (result) {
-                $data.find(" > *").toggleClass("hidden");
+        }).then(function (follow) {
+            if (follow) {
+                $follow.find(" > *").toggleClass("hidden");
             }
-            $data.attr("data-follow", result ? 'on' : 'off');
+            $follow.attr("data-follow", follow ? 'on' : 'off');
         });
     });
-
 });
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 3a1f8ab07bf..23c2046ecff 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -13,7 +13,7 @@
 <div id="snippet_email_structure" class="tab-pane fade in active">
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
             <span class="oe_snippet_thumbnail_title">Text Block</span>
@@ -63,7 +63,7 @@
     </div>
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
             <span class="oe_snippet_thumbnail_title">Text-Image</span>
@@ -104,7 +104,7 @@
     </div>
 
 
-    <div data-snippet-id="image-text" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
             <span class="oe_snippet_thumbnail_title">Image-Text</span>
@@ -145,7 +145,7 @@
     </div>
 
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/block_two_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Two Columns</span>            
@@ -185,7 +185,7 @@
     </div>
 
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/block_three_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Three Columns</span>            
@@ -236,7 +236,7 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
             <span class="oe_snippet_thumbnail_title">Separator</span>        
@@ -262,7 +262,7 @@
 <div id="snippet_email_feature" class="tab-pane fade">
 
 
-    <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
             <span class="oe_snippet_thumbnail_title">Big Picture</span>          
@@ -298,7 +298,7 @@
     </div>
 
 
-    <div data-snippet-id="pricing" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
             <span class="oe_snippet_thumbnail_title">Comparisons</span>         
@@ -389,7 +389,7 @@
     </div>
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
             <span class="oe_snippet_thumbnail_title">Big Message</span>
@@ -413,7 +413,7 @@
     </div>
 
 
-    <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
             <span class="oe_snippet_thumbnail_title">Button</span>   
@@ -482,7 +482,10 @@
 </div>
 
 
-<div id="snippet_styles" class="hidden">
+<div id="snippet_options" class="hidden">
+
+    <t t-call="website.snippet_options"/>
+
 </div>
 
 
@@ -510,11 +513,10 @@
                       type="email"
                       name="email"
                       class="js_follow_email form-control"
-                      t-att-value="email or ''"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <button href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</button>
-                    <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
+                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
                 </span>
                 <div class="alert alert-success hidden">Thanks for your subscription!</div>
             </div>
@@ -527,9 +529,9 @@
         <div data-snippet-option-id='subscribe'
             data-selector=".js_follow"
             data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-            data-selector-children=".content">
+           >
             <li>
-                <a href="#" class="button js_mailing_list">Select a mailing list</a>
+                <a href="#" class="button js_mailing_list">Change mailing list</a>
             </li>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 4f128248bac..2882125de67 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -9,7 +9,6 @@
         <input
               type="email" name="email"
               class="js_follow_email form-control"
-              t-att-value="email or ''"
               placeholder="your email..."
               groups="base.group_public"/>
         <span class="input-group-btn">

From 73446943f554bef9528e6892f5bf28484ce71eb7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 14:47:46 +0100
Subject: [PATCH 021/175] [FIX] website snippet: clean_for_save; display email
 in subscribe snippet

bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24
---
 .../static/src/js/website.snippets.editor.js  | 28 +++++++++----------
 addons/website_mail/controllers/main.py       |  4 +--
 .../static/src/js/website_mail.editor.js      |  3 ++
 .../static/src/js/website_mail.js             | 12 +++-----
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 2c9d00c8e27..f619dd10c03 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -31,10 +31,6 @@
             return this._super.apply(this, arguments);
         },
         save: function () {
-            this.snippets.make_active(false);
-
-            // FIXME: call clean_for_save on all snippets of the page, not only modified ones
-            // important for banner of parallax that changes data automatically.
             this.snippets.clean_for_save();
             this._super();
         },
@@ -55,6 +51,7 @@
 
     if (!website.snippet) website.snippet = {};
     website.snippet.templateOptions = {};
+    website.snippet.globalSelector = "";
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
@@ -132,6 +129,7 @@
                 .then(function (html) {
                     var $html = $(html);
 
+                    var selector = [];
                     var $styles = $html.find("[data-snippet-option-id]");
                     $styles.each(function () {
                         var $style = $(this);
@@ -144,8 +142,10 @@
                             'selector-children': $style.data('selector-children'),
                             'selector-vertical-children': $style.data('selector-vertical-children')
                         };
+                        selector.push($style.data('selector'));
                     });
                     $styles.addClass("hidden");
+                    website.snippet.globalSelector = selector.join(",");
 
                     self.$snippets = $html.find(".tab-content > div > div").addClass("oe_snippet");
                     self.$el.append($html);
@@ -195,17 +195,12 @@
                     return;
                 }
                 snipped_event_flag = true;
-                var selector = [];
-                for (var k in website.snippet.templateOptions) {
-                    selector.push(website.snippet.templateOptions[k].selector);
-                }
-                selector = selector.join(",");
 
                 setTimeout(function () {snipped_event_flag = false;}, 0);
                 var $target = $(event.srcElement);
 
-                if (!$target.is(selector)) {
-                    $target = $target.parents(selector).first();
+                if (!$target.is(website.snippet.globalSelector)) {
+                    $target = $target.parents(website.snippet.globalSelector).first();
                 }
                 if (!self.dom_filter($target).length) {
                     $target = false;
@@ -231,13 +226,16 @@
             }
         },
         clean_for_save: function () {
-            for (var k in this.snippets) {
-                if (!this.snippets.hasOwnProperty(k)) { continue; }
-                var editor = $(this.snippets[k]).data("snippet-editor");
+            var self = this;
+            $(website.snippet.globalSelector).each(function () {
+                var $snippet = $(this);
+                self.make_active($snippet);
+                self.make_active(false);
+                var editor = $snippet.data("snippet-editor");
                 if (editor) {
                     editor.clean_for_save();
                 }
-            }
+            });
         },
         make_active: function ($snippet) {
             if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) {
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 0da804a4f1c..601e1387f0a 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -59,10 +59,10 @@ class WebsiteMail(http.Controller):
 
     @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
     def call(self, model, id, **post):
-        public_id = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
+        email = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context).partner_id.email
         value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
         return {
-            'is_public': request.uid == public_id, 
+            'email': email, 
             'is_follower': value and value[0]['message_is_follower'] or False
         }
 
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index c67f0eba2b8..bef6eedfef4 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -31,6 +31,9 @@
             this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
             this._super();
         },
+        clean_for_save: function () {
+            this.$target.addClass("hidden");
+        },
     });
 })();
 
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 15f7e4381a0..e72cf0bc9b6 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -12,15 +12,11 @@
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
             }).always(function (data) {
-
-                var $input = self.$target.find('input.js_follow_email');
-                if(data.is_public) {
-                    $input.removeClass("hidden");
-                } else {
-                    $input.addClass("hidden");
-                }
-
+                self.$target.find('input.js_follow_email')
+                    .val(data.email ? data.email : "")
+                    .attr("disabled", data.email.length ? "disabled" : false);
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
+                self.$target.removeClass("hidden");
             });
         },
     });

From 5f3f09329fed083dd3df604301329a5e4b3f44bc Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 15:03:23 +0100
Subject: [PATCH 022/175] [IMP] website: snippet :
 website.snippet.animationRegistry.follow

bzr revid: chm@openerp.com-20140306140323-o2e77a66eu28bddu
---
 .../src/js/website.snippets.animation.js      |  8 +--
 .../static/src/js/website.snippets.editor.js  |  4 +-
 .../static/src/js/website_mail.js             | 70 +++++++++----------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 2b6373ac226..933f4b8e6ed 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -5,7 +5,7 @@
     if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
-    website.snippet.start_animation = function ($target) {
+    website.snippet.start_animation = function (editable_mode, $target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
             var selector = "";
@@ -24,7 +24,7 @@
                         !$snipped_id.parent("body").length &&
                         !$snipped_id.data("snippet-view")) {
                     website.snippet.readyAnimation.push($snipped_id);
-                    $snipped_id.data("snippet-view", new Animation($snipped_id));
+                    $snipped_id.data("snippet-view", new Animation($snipped_id, editable_mode));
                 }
             });
         }
@@ -49,9 +49,9 @@
         $: function () {
             return this.$el.find.apply(this.$el, arguments);
         },
-        init: function (dom) {
+        init: function (dom, editable_mode) {
             this.$el = this.$target = $(dom);
-            this.start();
+            this.start(editable_mode);
         },
         /*
         *  start
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f619dd10c03..b615f8d60e5 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -25,7 +25,7 @@
             this.on('rte:ready', this, function () {
                 self.snippets.$button.removeClass("hidden");
                 website.snippet.stop_animation();
-                website.snippet.start_animation();
+                website.snippet.start_animation(true);
             });
 
             return this._super.apply(this, arguments);
@@ -382,7 +382,7 @@
                             $("#oe_snippets").trigger('snippet-dropped', $target);
 
                             // after rte
-                            website.snippet.start_animation($target);
+                            website.snippet.start_animation(true, $target);
 
                             self.create_overlay($target);
                             if ($target.data("snippet-editor")) {
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index e72cf0bc9b6..672a21324a8 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -5,9 +5,10 @@
 
     website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
         selector: ".js_follow",
-        start: function () {
+        start: function (editable_mode) {
             var self = this;
 
+            // set value and display button
             openerp.jsonRpc('/website_mail/is_follower/', 'call', {
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
@@ -18,41 +19,38 @@
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
                 self.$target.removeClass("hidden");
             });
+
+            // not if editable mode to allow designer to edit alert field
+            if (!editable_mode) {
+                $('.js_follow > .alert').addClass("hidden");
+                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
+                    event.preventDefault();
+                    self.on_click();
+                });
+            }
+        },
+        on_click: function () {
+            var self = this;
+            var $email = this.$target.find(".js_follow_email:visible");
+
+            if ($email.length && !$email.val().match(/.+@.+/)) {
+                this.$target.addClass('has-error');
+                return false;
+            }
+            this.$target.removeClass('has-error');
+
+            openerp.jsonRpc('/website_mail/follow', 'call', {
+                'id': +this.$target.data('id'),
+                'object': this.$target.data('object'),
+                'message_is_follower': this.$target.attr("data-follow") || "off",
+                'email': $email.length ? $email.val() : false,
+            }).then(function (follow) {
+                if (follow) {
+                    self.$target.find(" > *").toggleClass("hidden");
+                }
+                self.$target.attr("data-follow", follow ? 'on' : 'off');
+            });
         },
     });
 })();
-
-$(document).ready(function () {
-
-    $('.js_follow > .alert').addClass("hidden");
-    $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
-
-    $('.js_follow_btn, .js_unfollow_btn').on('click', function (ev) {
-        ev.preventDefault();
-
-        var $follow = $(this).parents("div.js_follow");
-        var $email = $follow.find(".js_follow_email:visible");
-
-        if ($email.length && !$email.val().match(/.+@.+/)) {
-            $follow.addClass('has-error');
-            return false;
-        }
-
-        $email.removeClass('has-error');
-
-        var message_is_follower = $follow.attr("data-follow") || "off";
-        $follow.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
-
-        openerp.jsonRpc('/website_mail/follow', 'call', {
-            'id': +$follow.data('id'),
-            'object': $follow.data('object'),
-            'message_is_follower': message_is_follower,
-            'email': $email.length ? $email.val() : false,
-        }).then(function (follow) {
-            if (follow) {
-                $follow.find(" > *").toggleClass("hidden");
-            }
-            $follow.attr("data-follow", follow ? 'on' : 'off');
-        });
-    });
-});

From b6b0a26777146a08f0d748933fcc04b3ac688bae Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 15:38:56 +0100
Subject: [PATCH 023/175] [FIX] website_mail

bzr revid: chm@openerp.com-20140306143856-1b9q9zhgqtwr6brf
---
 addons/website_mail/models/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index fd8997c645f..e60de014149 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,4 +1,3 @@
 import mail_message
 import mail_thread
 import email_template
-import website

From 29faa56d8e1c9ea49ae6cc8724f88cc65a22ad8f Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 17:11:04 +0100
Subject: [PATCH 024/175] [FIX] website tour

bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
---
 .../website/static/src/js/website.tour.banner.js | 16 ++++++++--------
 addons/website/static/src/js/website.tour.js     |  2 +-
 .../static/src/js/website.tour.test.admin.js     |  2 +-
 addons/website/views/snippets.xml                | 10 ++--------
 .../static/src/js/website.tour.blog.js           |  4 ++--
 .../static/src/js/website.tour.event.js          |  4 ++--
 .../static/src/js/website.tour.shop.js           |  2 +-
 7 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 97568e37f35..ff3ed030f76 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -39,7 +39,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Banner"),
                     content:   _t("Drag the Banner block and drop it in your page."),
@@ -47,14 +47,14 @@
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   '#wrap .carousel:first .carousel-caption',
+                    element:   '#wrap .carousel:first .carousel-caption > div',
                     placement: 'top',
-                    title:     _("Customize banner's text"),
-                    content:   _("Click in the text and start editing it."),
+                    title:     _t("Customize banner's text"),
+                    content:   _t("Click in the text and start editing it."),
                     popover:   { next: _t("Continue") },
                 },
                 {
-                    element:   '.oe_overlay_options .oe_options',
+                    element:   '.oe_overlay_options .oe_options:visible',
                     placement: 'left',
                     title:     _t("Customize the banner"),
                     content:   _t("Customize any block through this menu. Try to change the background of the banner."),
@@ -69,7 +69,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'features',
+                    snippet:   '#snippet_structure .oe_snippet:eq(6)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop This Block"),
                     content:   _t("Drag the <em>'Features'</em> block and drop it below the banner."),
@@ -85,8 +85,8 @@
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
-                    title:     _("Good Job!"),
-                    content:   _("Well done, you created your homepage."),
+                    title:     _t("Good Job!"),
+                    content:   _t("Well done, you created your homepage."),
                     popover:   { next: _t("Continue") },
                 },
                 {
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 2416cb511f1..33fe11f5e81 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -205,7 +205,7 @@ website.Tour = openerp.Class.extend({
 
             if (!step.element) step.orphan = true;
             if (step.snippet) {
-                step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
+                step.element = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
             }
 
         }
diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
index 787f05beb23..01f4448abb2 100644
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ b/addons/website/static/src/js/website.tour.test.admin.js
@@ -57,7 +57,7 @@
                 },
                 {
                     title:     'add snippets',
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                 },
                 {
                     title:     'try to save',
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index c2c9f9a55fe..53e2d87186d 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -947,8 +947,8 @@
     </div>
 
     <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector="blockquote, .well, .panel"
+        data-selector-siblings="blockquote, .well, .panel"
         data-selector-children=".content">
     </div>
 
@@ -967,12 +967,6 @@
         </li>
     </div>
 
-    <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-children=".content">
-    </div>
-
 </template>
 
 
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index e76e793dfda..3470e2e383b 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Block"),
                     content:   _t("Drag this block and drop it in your page."),
@@ -79,7 +79,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag this block and drop it below the image block."),
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index a9e40a5f65b..ef013398acb 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Image-Text' block and drop it in your page."),
@@ -80,7 +80,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Text Block' in your event page."),
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 24dd5fd2d66..adb4a9e556c 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -109,7 +109,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'big-picture',
+                    snippet:   '#snippet_structure .oe_snippet:eq(7)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Big Picture' block and drop it in your page."),

From 34f05212b78d94c7ac5c8ee09be4ddd9b84fe968 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 17:24:20 +0100
Subject: [PATCH 025/175] [FIX] website: snippet & bootstrap for event view

bzr revid: chm@openerp.com-20140306162420-rvrjia8cx6y8yxd1
---
 addons/website/static/src/css/website.css  | 1 +
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 78262bc7dd4..fb6dd4552b1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -119,6 +119,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: auto;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 680f26cef07..787dca1257f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: auto
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 

From 74bb1d6e9554afd2bd49db3ce4d9a98526c4f0a7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 7 Mar 2014 11:13:25 +0100
Subject: [PATCH 026/175] [FIX] website tour

bzr revid: chm@openerp.com-20140307101325-qrpn41ue1yxbfgcs
---
 addons/website/static/src/js/website.tour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 33fe11f5e81..a17115d2184 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -377,7 +377,7 @@ website.Tour = openerp.Class.extend({
 
             if (step.snippet) {
             
-                var selector = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
+                var selector = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
                 self.autoDragAndDropSnippet(selector);
             
             } else if (step.element.match(/#oe_snippets .* \.oe_snippet_thumbnail/)) {

From a6fdc988ec58903c5db9c6f23eca795ed6d1cb54 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 7 Mar 2014 18:54:49 +0530
Subject: [PATCH 027/175] [ADD] : module website_mail_group

bzr revid: aja@tinyerp.com-20140307132449-zy216yv5kmt3o0zw
---
 addons/mail/mail_message.py                   |   2 +-
 addons/mail/mail_thread.py                    |   3 +-
 addons/website_mail_group/__init__.py         |   2 +
 addons/website_mail_group/__openerp__.py      |  23 ++++
 .../controllers/__init__.py                   |   3 +
 addons/website_mail_group/controllers/main.py | 104 +++++++++++++++
 .../data/website_mail_group_data.xml          |   4 +
 .../data/website_mail_group_demo.xml          |   5 +
 addons/website_mail_group/models/__init__.py  |   1 +
 .../website_mail_group/models/mail_group.py   |  25 ++++
 .../security/ir.model.access.csv              |   0
 .../static/src/css/website_mail_group.css     |   0
 .../views/website_mail_group.xml              | 120 ++++++++++++++++++
 .../views/website_mail_group_backend.xml      |   5 +
 14 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 addons/website_mail_group/__init__.py
 create mode 100644 addons/website_mail_group/__openerp__.py
 create mode 100644 addons/website_mail_group/controllers/__init__.py
 create mode 100644 addons/website_mail_group/controllers/main.py
 create mode 100644 addons/website_mail_group/data/website_mail_group_data.xml
 create mode 100644 addons/website_mail_group/data/website_mail_group_demo.xml
 create mode 100644 addons/website_mail_group/models/__init__.py
 create mode 100644 addons/website_mail_group/models/mail_group.py
 create mode 100644 addons/website_mail_group/security/ir.model.access.csv
 create mode 100644 addons/website_mail_group/static/src/css/website_mail_group.css
 create mode 100644 addons/website_mail_group/views/website_mail_group.xml
 create mode 100644 addons/website_mail_group/views/website_mail_group_backend.xml

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 40a51df91d2..2b10ce46b85 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -181,6 +181,7 @@ class mail_message(osv.Model):
         'subject': fields.char('Subject'),
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
+        'parent_message': fields.char('Immediate Parent', select=1, readonly=1),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'to_read': fields.function(_get_to_read, fnct_search=_search_to_read,
             type='boolean', string='To read',
@@ -834,7 +835,6 @@ class mail_message(osv.Model):
         if context is None:
             context = {}
         default_starred = context.pop('default_starred', False)
-
         if 'email_from' not in values:  # needed to compute reply_to
             values['email_from'] = self._get_default_from(cr, uid, context=context)
         if 'message_id' not in values:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c72ef8a77cb..a306d1160e7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1259,6 +1259,7 @@ class mail_thread(osv.AbstractModel):
             parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
+            msg_dict['parent_message'] = message.get('In-Reply-To')
 
         if message.get('References') and 'parent_id' not in msg_dict:
             parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
@@ -1866,4 +1867,4 @@ class mail_thread(osv.AbstractModel):
         message_obj.write(cr, uid, msg_ids_comment, {"res_id" : new_res_id, "model" : new_model}, context=context)
         message_obj.write(cr, uid, msg_ids_not_comment, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
         
-        return True
\ No newline at end of file
+        return True
diff --git a/addons/website_mail_group/__init__.py b/addons/website_mail_group/__init__.py
new file mode 100644
index 00000000000..9f86759e32b
--- /dev/null
+++ b/addons/website_mail_group/__init__.py
@@ -0,0 +1,2 @@
+import controllers
+import models
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
new file mode 100644
index 00000000000..f90d654036f
--- /dev/null
+++ b/addons/website_mail_group/__openerp__.py
@@ -0,0 +1,23 @@
+{
+    'name': 'Mailing List Archive',
+    'category': 'Website',
+    'summary': '',
+    'version': '1.0',
+    'description': """
+OpenERP Mail Group : Mailing List Archive
+==================
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website','mail'],
+    'data': [
+        'views/website_mail_group.xml',
+        'views/website_mail_group_backend.xml',
+        'data/website_mail_group_data.xml',
+    ],
+    'demo': [
+        'data/website_mail_group_demo.xml'
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'installable': True,
+}
diff --git a/addons/website_mail_group/controllers/__init__.py b/addons/website_mail_group/controllers/__init__.py
new file mode 100644
index 00000000000..e11f9ba81bb
--- /dev/null
+++ b/addons/website_mail_group/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
new file mode 100644
index 00000000000..8f36503aa32
--- /dev/null
+++ b/addons/website_mail_group/controllers/main.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import SUPERUSER_ID
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+import werkzeug
+import datetime
+import time
+
+from openerp.tools.translate import _
+
+class MailGroup(http.Controller):
+    _thread_per_page = 10
+
+    @http.route([
+        "/groups",
+    ], type='http', auth="public", website=True)
+    def view(self, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        user_obj = request.registry.get('res.users')
+        group_ids = group_obj.search(cr, SUPERUSER_ID, [], context=context)
+        values = {
+            'groups': group_obj.browse(cr, uid, group_ids, context),
+        }
+        return request.website.render('website_mail_group.mail_groups', values)
+
+    @http.route([
+        "/groups/follow/<int:group_id>",
+    ], type='http', auth="public", website=True)
+    def follow(self, group_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
+        return werkzeug.utils.redirect('/groups')
+
+    @http.route([
+        "/groups/unfollow/<int:group_id>",
+    ], type='http', auth="public", website=True)
+    def unfollow(self, group_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
+        return werkzeug.utils.redirect('/groups')
+
+    @http.route([
+        "/groups/<int:group_id>/",
+        "/groups/<int:group_id>/page/<int:page>/"
+    ], type='http', auth="public", website=True)
+    def thread(self, group_id, page=1, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        thread_obj = request.registry.get('mail.message')
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'),('model','=','mail.group'),('res_id','=',group_id),('parent_message','=',False)])
+        group_ids = group_obj.search(cr, SUPERUSER_ID, [])
+        pager = request.website.pager(
+            url='/groups/%s/' % group_id,
+            total=len(thread_ids),
+            page=page,
+            step=self._thread_per_page,
+        )
+        pager_begin = (page - 1) * self._thread_per_page
+        pager_end = page * self._thread_per_page
+        thread_ids = thread_ids[pager_begin:pager_end]
+        values = {
+            'groups': group_obj.browse(cr, uid, group_ids, context),
+            'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
+            'active_group': group_obj.browse(cr, uid, group_id, context),
+            'pager': pager,
+        }
+        return request.website.render('website_mail_group.group_thread_list', values)
+
+    @http.route([
+        "/groups/thread/<int:message_id>",
+    ], type='http', auth="public", website=True)
+    def get_thread(self, message_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        thread_obj = request.registry.get('mail.message')
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message_id)])
+        values = {
+            'main_thread' : thread_obj.browse(cr, uid, message_id, context),
+            'child_thread' : thread_obj.browse(cr, uid, child_ids, context),
+        }
+        return request.website.render('website_mail_group.group_thread', values)
diff --git a/addons/website_mail_group/data/website_mail_group_data.xml b/addons/website_mail_group/data/website_mail_group_data.xml
new file mode 100644
index 00000000000..b020c6a30ae
--- /dev/null
+++ b/addons/website_mail_group/data/website_mail_group_data.xml
@@ -0,0 +1,4 @@
+<openerp>
+    <data>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
new file mode 100644
index 00000000000..ebc084668b7
--- /dev/null
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/models/__init__.py b/addons/website_mail_group/models/__init__.py
new file mode 100644
index 00000000000..ea8be51acde
--- /dev/null
+++ b/addons/website_mail_group/models/__init__.py
@@ -0,0 +1 @@
+import mail_group
diff --git a/addons/website_mail_group/models/mail_group.py b/addons/website_mail_group/models/mail_group.py
new file mode 100644
index 00000000000..66a7481fb52
--- /dev/null
+++ b/addons/website_mail_group/models/mail_group.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+import uuid
+import time
+import datetime
diff --git a/addons/website_mail_group/security/ir.model.access.csv b/addons/website_mail_group/security/ir.model.access.csv
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_mail_group/static/src/css/website_mail_group.css b/addons/website_mail_group/static/src/css/website_mail_group.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
new file mode 100644
index 00000000000..a3abfaf605a
--- /dev/null
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <template id="header" inherit_id="website.layout" name="Header Mail Groups Link">
+        <xpath expr="//header//ul[@id='top_menu']/li" position="before">
+            <li>
+                <a href="/groups">Mail Groups</a>
+            </li>
+        </xpath>
+    </template>
+    <template id="mail_groups" name="My Groups">
+        <t t-call="website.layout">
+            <div class="row">
+                <div class="container">
+                    <div class="col-md-3 col-md-push-1">
+                        <t t-call="website_mail_group.navigation_menu"/>
+                    </div>
+                    <div class="col-md-8">
+                        <t t-foreach="groups" t-as="group">
+                            <div class="col-md-6" style="min-height: 150px">
+                                <div class="col-md-3 col-md-pull-1">
+                                    <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
+                                </div>
+                                <div class="col-md-8">
+                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                    <br/>
+                                    <small t-esc="group.description"/>
+                                    <br/>
+                                    <t t-if="group.message_is_follower">
+                                        <a class="btn btn-primary" t-attf-href="/groups/unfollow/#{ group.id }">UnFollow</a>
+                                    </t>
+                                    <t t-if="not group.message_is_follower">
+                                        <a class="btn btn-default" t-attf-href="/groups/follow/#{ group.id }">Join Group</a>
+                                    </t>
+                                </div>
+                            </div>
+                        </t>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+    <template id="navigation_menu">
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="groups" t-as="group">
+                <li t-if="group.message_is_follower"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
+            </t>
+        </ul>
+    </template>
+    <template id="group_thread_list">
+        <t t-call="website.layout">
+            <section class="container">
+                <div class="row">
+                    <div class="col-md-12 col-md-push-3">
+                        <t t-call="website.pager"/>
+                    </div>
+                </div>
+            </section>
+            <section class="container">
+                <div class="row">
+                    <div class="col-md-3">
+                        <t t-call="website_mail_group.navigation_menu"/>
+                    </div>
+                    <div class="col-md-8">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" t-esc="active_group.name"/>
+                            <table class="table table-bordered">
+                                <tbody>
+                                    <t t-foreach="thread_list" t-as="thread">
+                                        <tr>
+                                            <td>
+                                                <a t-attf-href="/groups/thread/#{thread.id}" t-esc="thread.subject"></a>
+                                                <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
+                                                <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
+                                            </td>
+                                        </tr>
+                                    </t>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </t>
+    </template>
+    <template id="group_thread">
+        <t t-call="website.layout">
+            <t t-set="head">
+                <link rel='stylesheet' href='/website_mail_group/static/src/css/website_mail_group.css'/>
+            </t>
+            <div class="row mt32">
+                <div class="container">
+                    <div class="col-md-1 mt0">
+                        <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
+                    </div>
+                    <div class="col-md-11">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" t-esc="main_thread.subject"/>
+                            <div class="panel-body">
+                                <t t-raw="main_thread.body"/>
+                            </div>
+                        </div>
+                    </div>
+                    <t t-foreach="child_thread" t-as="message">
+                        <div class="col-md-1 mt0">
+                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                        </div>
+                        <div class="col-md-11">
+                            <div class="panel panel-default">
+                                <div class="panel-heading panel-line" t-esc="message.subject"/>
+                                <t t-raw="message.body"/>
+                            </div>
+                        </div>
+                    </t>
+                </div>
+            </div>
+        </t>
+    </template>
+</data>
+</openerp>
diff --git a/addons/website_mail_group/views/website_mail_group_backend.xml b/addons/website_mail_group/views/website_mail_group_backend.xml
new file mode 100644
index 00000000000..cc8d30d080d
--- /dev/null
+++ b/addons/website_mail_group/views/website_mail_group_backend.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    </data>
+</openerp>

From cff80a9a0c6c3824b138db533665eb1bc1031bd4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 10 Mar 2014 12:11:37 +0100
Subject: [PATCH 028/175] [IMP] Add views for the ir.logging object

bzr revid: stw@openerp.com-20140310111137-04axbgdajd9jloxg
---
 openerp/addons/base/__openerp__.py         |  1 +
 openerp/addons/base/ir/ir_logging_view.xml | 65 ++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 openerp/addons/base/ir/ir_logging_view.xml

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 3c3c290f986..57ce6b31e32 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -57,6 +57,7 @@ The kernel of OpenERP, needed for all installation.
         'ir/ir_values_view.xml',
         'ir/osv_memory_autovacuum.xml',
         'ir/ir_model_report.xml',
+        'ir/ir_logging_view.xml',
         'workflow/workflow_view.xml',
         'module/module_view.xml',
         'module/module_data.xml',
diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
new file mode 100644
index 00000000000..d23e45f1d14
--- /dev/null
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="ir_logging_form_view">
+            <field name="model">ir.logging</field>
+            <field name="arch" type="xml">
+                <form string="Log" version="7.0">
+                    <sheet>
+                        <field name="name" />
+                        <field name="type" />
+                        <field name="dbname" />
+                        <field name="level" />
+                        <field name="message" />
+                        <field name="exception" />
+                        <field name="path" />
+                        <field name="func" />
+                        <field name="line" />
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="ir_logging_tree_view">
+            <field name="model">ir.logging</field>
+            <field name="arch" type="xml">
+                <tree string="Logs" version="7.0">
+                    <field name="level" />
+                    <field name="type" />
+                    <field name="dbname" />
+                    <field name="name" />
+                    <field name="path" />
+                    <field name="func" />
+                    <field name="line" />
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="ir_logging_search_view">
+            <field name="model">ir.logging</field>
+            <field name="arch" type="xml">
+                <search string="Logs">
+                    <field name="name" />
+                    <field name="level" />
+                    <field name="dbname" />
+                    <field name="type" />
+
+                    <group expand="0" string="Group By...">
+                        <filter string="Database" domain="[]" context="{'group_by': 'dbname'}" />
+                        <filter string="Level" domain="[]" context="{'group_by': 'level'}" />
+                        <filter string="Type" domain="[]" context="{'group_by': 'type'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="ir_logging_all_act">
+            <field name="name">Logging</field>
+            <field name="res_model">ir.logging</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="ir_logging_search_view" />
+        </record>
+
+        <menuitem parent="base.menu_custom" id="ir_logging_all_menu" action="ir_logging_all_act" />
+
+    </data>
+</openerp>
\ No newline at end of file

From 3f25397dfa037aac3e4c81d4a4b49594bf5e51c8 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 10 Mar 2014 17:17:48 +0530
Subject: [PATCH 029/175] [IMP] : code

bzr revid: aja@tinyerp.com-20140310114748-gnlktp3dngnccbl3
---
 addons/website_mail_group/controllers/main.py | 63 ++++++++-----------
 .../static/src/js/website_mail_group.js       | 26 ++++++++
 .../views/website_mail_group.xml              | 21 +++----
 3 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 addons/website_mail_group/static/src/js/website_mail_group.js

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 8f36503aa32..b57c8e22379 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -19,14 +19,9 @@
 #
 ##############################################################################
 
-from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-import werkzeug
-import datetime
-import time
 
-from openerp.tools.translate import _
 
 class MailGroup(http.Controller):
     _thread_per_page = 10
@@ -35,45 +30,38 @@ class MailGroup(http.Controller):
         "/groups",
     ], type='http', auth="public", website=True)
     def view(self, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        user_obj = request.registry.get('res.users')
-        group_ids = group_obj.search(cr, SUPERUSER_ID, [], context=context)
+        group_ids = group_obj.search(cr, uid, [], context=context)
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
         }
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route([
-        "/groups/follow/<int:group_id>",
-    ], type='http', auth="public", website=True)
-    def follow(self, group_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+        "/groups/subscription",
+    ], type='json', auth="public", website=True)
+    def subscription(self, group_id=0, action=False ,**post):
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
-        return werkzeug.utils.redirect('/groups')
+        if action:
+            group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
+        else:
+            group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
+        return []
 
     @http.route([
-        "/groups/unfollow/<int:group_id>",
+        "/groups/<model('mail.group'):group>/",
+        "/groups/<model('mail.group'):group>/page/<int:page>/"
     ], type='http', auth="public", website=True)
-    def unfollow(self, group_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
-        group_obj = request.registry.get('mail.group')
-        group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
-        return werkzeug.utils.redirect('/groups')
-
-    @http.route([
-        "/groups/<int:group_id>/",
-        "/groups/<int:group_id>/page/<int:page>/"
-    ], type='http', auth="public", website=True)
-    def thread(self, group_id, page=1, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+    def thread(self, group, page=1, **post):
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('type','=','email'),('model','=','mail.group'),('res_id','=',group_id),('parent_message','=',False)])
-        group_ids = group_obj.search(cr, SUPERUSER_ID, [])
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_message','=',False)])
+        group_ids = group_obj.search(cr, uid, [])
         pager = request.website.pager(
-            url='/groups/%s/' % group_id,
+            url='/groups/%s/' % group.id,
             total=len(thread_ids),
             page=page,
             step=self._thread_per_page,
@@ -84,21 +72,20 @@ class MailGroup(http.Controller):
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
             'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
-            'active_group': group_obj.browse(cr, uid, group_id, context),
+            'active_group': group,
             'pager': pager,
         }
         return request.website.render('website_mail_group.group_thread_list', values)
 
     @http.route([
-        "/groups/thread/<int:message_id>",
+        "/groups/<model('mail.group'):group>/message/<model('mail.message'):message>",
     ], type='http', auth="public", website=True)
-    def get_thread(self, message_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
-        group_obj = request.registry.get('mail.group')
+    def get_thread(self, group, message, **post):
+        cr, uid, context = request.cr, request.uid, request.context
         thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message_id)])
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)])
         values = {
-            'main_thread' : thread_obj.browse(cr, uid, message_id, context),
-            'child_thread' : thread_obj.browse(cr, uid, child_ids, context),
+            'main_thread': message,
+            'child_thread': thread_obj.browse(cr, uid, child_ids, context),
         }
         return request.website.render('website_mail_group.group_thread', values)
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
new file mode 100644
index 00000000000..3b856d12684
--- /dev/null
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -0,0 +1,26 @@
+$(document).ready(function () {
+    $('a.js_group').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        var href = $link.attr("href");
+        var group_id = href.match(/subscription\/([0-9]+)/)[1];
+        var action = href.match(/action=(.*)/)[1] == 'follow' ? true : false;
+        openerp.jsonRpc("/groups/subscription/", 'call', {
+                    'group_id': parseInt(group_id),
+                    'action' : action,
+                })
+                .then(function (data) {
+                    if (action){
+                        $('li#'+ group_id).toggleClass('hidden visible');
+                        $('.unfollow_' + group_id).toggleClass('visible hidden');
+                        $('.follow_' + group_id).toggleClass('hidden visible');
+                    }
+                    else {
+                        $('li#'+ group_id).toggleClass('visible hidden');
+                        $('.unfollow_' + group_id).toggleClass('hidden visible');
+                        $('.follow_' + group_id).toggleClass('visible hidden');
+                    }
+                });
+        return false;
+    });
+});
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index a3abfaf605a..a87365ad803 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -10,6 +10,9 @@
     </template>
     <template id="mail_groups" name="My Groups">
         <t t-call="website.layout">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
+            </t>
             <div class="row">
                 <div class="container">
                     <div class="col-md-3 col-md-push-1">
@@ -26,12 +29,8 @@
                                     <br/>
                                     <small t-esc="group.description"/>
                                     <br/>
-                                    <t t-if="group.message_is_follower">
-                                        <a class="btn btn-primary" t-attf-href="/groups/unfollow/#{ group.id }">UnFollow</a>
-                                    </t>
-                                    <t t-if="not group.message_is_follower">
-                                        <a class="btn btn-default" t-attf-href="/groups/follow/#{ group.id }">Join Group</a>
-                                    </t>
+                                    <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                    <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
                                 </div>
                             </div>
                         </t>
@@ -41,9 +40,9 @@
         </t>
     </template>
     <template id="navigation_menu">
-        <ul class="nav nav-pills nav-stacked">
+        <ul class="nav nav-pills nav-stacked" id="group_follows">
             <t t-foreach="groups" t-as="group">
-                <li t-if="group.message_is_follower"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
+                <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
             </t>
         </ul>
     </template>
@@ -69,7 +68,7 @@
                                     <t t-foreach="thread_list" t-as="thread">
                                         <tr>
                                             <td>
-                                                <a t-attf-href="/groups/thread/#{thread.id}" t-esc="thread.subject"></a>
+                                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
                                                 <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
                                                 <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
                                             </td>
@@ -101,7 +100,7 @@
                             </div>
                         </div>
                     </div>
-                    <t t-foreach="child_thread" t-as="message">
+                    <div class="row" t-foreach="child_thread" t-as="message">
                         <div class="col-md-1 mt0">
                             <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
                         </div>
@@ -111,7 +110,7 @@
                                 <t t-raw="message.body"/>
                             </div>
                         </div>
-                    </t>
+                    </div>
                 </div>
             </div>
         </t>

From 7e8b25dbeeec3a8bef5f092fd74cc71da75943ad Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 14:54:34 +0100
Subject: [PATCH 030/175] [IMP] website: create share snippet. TODO: controller
 to send mail or mailto href

bzr revid: chm@openerp.com-20140310135434-7xt2sy89if9116l3
---
 addons/website/controllers/main.py            |  8 ++
 .../src/js/website.snippets.animation.js      | 37 ++++++++++
 addons/website/views/snippets.xml             | 73 ++++++++++++++++++-
 3 files changed, 115 insertions(+), 3 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 95c7ad82e2b..b155317d826 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -378,6 +378,14 @@ class Website(openerp.addons.web.controllers.main.Home):
             del response.headers['Content-Length']
 
         return response
+    
+    @http.route(['/website/current_user/'], type='json', auth="public", website=True)
+    def get_current_user(self, fields):
+        cr, uid, context = request.cr, request.uid, request.context
+        if request.registry["website"].get_public_user(cr, uid, context=context) != uid:
+            return request.registry["res.users"].read(cr, openerp.SUPERUSER_ID, [uid], fields, context=context)[0]
+        else:
+            return None
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 933f4b8e6ed..173cdf39a58 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -127,4 +127,41 @@
         }
     });
 
+    website.snippet.animationRegistry.share = website.snippet.Animation.extend({
+        selector: ".oe_share",
+        start: function () {
+            var self = this;
+            var url = encodeURIComponent(window.location.href);
+            var title = encodeURIComponent($("title").text());
+            this.$target.find(".oe_share_facebook").attr("href",
+                "https://www.facebook.com/sharer/sharer.php?u="+url);
+            this.$target.find(".oe_share_twitter").attr("href",
+                "https://twitter.com/intent/tweet?text="+title+"&related=&url="+url);
+            this.$target.find(".oe_share_linkedin").attr("href",
+                "http://www.linkedin.com/shareArticle?mini=true&url="+url+"&title="+title+"&summary=&source=");
+            this.$target.find(".oe_share_google").attr("href",
+                "https://plus.google.com/share?url="+url);
+            this.$target.find("a").click(function () {
+                window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+            });
+            
+            var $modal = this.$target.find(".oe_share_mail_modal");
+            var $from = $modal.find("input[name='from']").parent().parent();
+            this.$target.find(".oe_share_mail").off("click").click(function () {
+                // open popover
+                $modal.modal("show");
+            });
+            $modal.find("input[name='url']").attr("value", window.location.href);
+            openerp.jsonRpc('/website/current_user/', 'call', {
+                fields: ["email"]
+            }).then(function (result) {
+                if (result) $from.addClass("hidden");
+                else $from.removeClass("hidden");
+            });
+            $modal.find(".btn-primary").click(function () {
+                $modal.modal("hide");
+                console.log("valid");
+            });
+        },
+    });
 })();
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 53e2d87186d..f592286c8f7 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -336,6 +336,73 @@
         <hr class="oe_snippet_body"/>
     </div>
 
+
+    <div>
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+            <span class="oe_snippet_thumbnail_title">Share</span>
+        </div>
+        <div class="oe_snippet_body oe_share">
+            <h3>
+                Share 
+                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/OpenERP"><i class="fa fa-facebook-square"></i></a>
+                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/openerp"><i class="fa fa-twitter"></i></a>
+                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/company/openerp"><i class="fa fa-linkedin"></i></a>
+                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
+                <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
+            </h3>
+
+            <!-- Modal for Mail -->
+            <div class="oe_share_mail_modal modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <form class="form-horizontal" role="form">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                <h4 class="modal-title" id="myModalLabel">Share by Email</h4>
+                            </div>
+                            <div class="modal-body">
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">To</label>
+                                    <div class="col-sm-10">
+                                        <input type="email" class="form-control" name="to"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">From</label>
+                                    <div class="col-sm-10">
+                                        <input type="email" class="form-control" name="from"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">Subject</label>
+                                    <div class="col-sm-10">
+                                        <input type="text" class="form-control" name="subject"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">Summary</label>
+                                    <div class="col-sm-10">
+                                        <textarea class="form-control" rows="4" name="Summary"></textarea>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">URL</label>
+                                    <div class="col-sm-10">
+                                        <input readonly="readonly" value="" class="form-control" name="url"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary pull-right">Send Email</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
 </div>
 
 <div id="snippet_feature" class="tab-pane fade">
@@ -947,8 +1014,8 @@
     </div>
 
     <div data-snippet-option-id='content'
-        data-selector="blockquote, .well, .panel"
-        data-selector-siblings="blockquote, .well, .panel"
+        data-selector="blockquote, .well, .panel, .oe_share"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel, .oe_share"
         data-selector-children=".content">
     </div>
 
@@ -971,4 +1038,4 @@
 
 
 </data>
-</openerp>
+</openerp>
\ No newline at end of file

From 8694a48ef1a3e251a91d57b878d188503523aa84 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 15:19:47 +0100
Subject: [PATCH 031/175] [IMP] website: use mailto for share snippet insead of
 mail form

bzr revid: chm@openerp.com-20140310141947-zs9ltuzx48k5ej5x
---
 addons/website/controllers/main.py            |  8 ---
 .../src/js/website.snippets.animation.js      | 21 ++------
 addons/website/views/snippets.xml             | 49 -------------------
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b155317d826..95c7ad82e2b 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -378,14 +378,6 @@ class Website(openerp.addons.web.controllers.main.Home):
             del response.headers['Content-Length']
 
         return response
-    
-    @http.route(['/website/current_user/'], type='json', auth="public", website=True)
-    def get_current_user(self, fields):
-        cr, uid, context = request.cr, request.uid, request.context
-        if request.registry["website"].get_public_user(cr, uid, context=context) != uid:
-            return request.registry["res.users"].read(cr, openerp.SUPERUSER_ID, [uid], fields, context=context)[0]
-        else:
-            return None
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 173cdf39a58..8d7b634e177 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -143,25 +143,10 @@
                 "https://plus.google.com/share?url="+url);
             this.$target.find("a").click(function () {
                 window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+                return false;
             });
-            
-            var $modal = this.$target.find(".oe_share_mail_modal");
-            var $from = $modal.find("input[name='from']").parent().parent();
-            this.$target.find(".oe_share_mail").off("click").click(function () {
-                // open popover
-                $modal.modal("show");
-            });
-            $modal.find("input[name='url']").attr("value", window.location.href);
-            openerp.jsonRpc('/website/current_user/', 'call', {
-                fields: ["email"]
-            }).then(function (result) {
-                if (result) $from.addClass("hidden");
-                else $from.removeClass("hidden");
-            });
-            $modal.find(".btn-primary").click(function () {
-                $modal.modal("hide");
-                console.log("valid");
-            });
+            this.$target.find(".oe_share_mail").attr("href",
+                "mailto:?body="+url+"&subject="+title).off("click");
         },
     });
 })();
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f592286c8f7..35861331338 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -351,55 +351,6 @@
                 <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
                 <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
             </h3>
-
-            <!-- Modal for Mail -->
-            <div class="oe_share_mail_modal modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <form class="form-horizontal" role="form">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                <h4 class="modal-title" id="myModalLabel">Share by Email</h4>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">To</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="to"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">From</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="from"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Subject</label>
-                                    <div class="col-sm-10">
-                                        <input type="text" class="form-control" name="subject"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Summary</label>
-                                    <div class="col-sm-10">
-                                        <textarea class="form-control" rows="4" name="Summary"></textarea>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">URL</label>
-                                    <div class="col-sm-10">
-                                        <input readonly="readonly" value="" class="form-control" name="url"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-primary pull-right">Send Email</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 

From 9ee5a6d0a17d1393a8cc2dd7f1e1852326f831aa Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 15:30:55 +0100
Subject: [PATCH 032/175] [FIX] website_mail: remove frontend js and css from
 __openerp__

bzr revid: chm@openerp.com-20140310143055-nfrk745uth835qu7
---
 addons/website_mail/__openerp__.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index 74fe86c6193..8642f46f388 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -34,12 +34,6 @@
         'views/email_template_view.xml',
         'security/website_mail.xml',
     ],
-    'css': [
-        'static/src/css/website_mail.css',
-    ],
-    'js': [
-        'static/src/js/website_mail.js',
-    ],
     'qweb': [
         'static/src/xml/website_mail.xml'
     ],

From 22d1989d6ccb81908fbf7d13ba71abd853b9b20c Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 14:26:26 +0530
Subject: [PATCH 033/175] [ADD] : demo data

bzr revid: aja@tinyerp.com-20140311085626-phkz5012uvwagc94
---
 addons/website_mail_group/controllers/main.py |   4 +-
 .../data/website_mail_group_demo.xml          | 123 ++++++++++++++++++
 .../views/website_mail_group.xml              |  66 +++++-----
 3 files changed, 156 insertions(+), 37 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index b57c8e22379..996b5524ffd 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -58,7 +58,7 @@ class MailGroup(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_message','=',False)])
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_id','=',False)])
         group_ids = group_obj.search(cr, uid, [])
         pager = request.website.pager(
             url='/groups/%s/' % group.id,
@@ -83,7 +83,7 @@ class MailGroup(http.Controller):
     def get_thread(self, group, message, **post):
         cr, uid, context = request.cr, request.uid, request.context
         thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)])
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)], order='date')
         values = {
             'main_thread': message,
             'child_thread': thread_obj.browse(cr, uid, child_ids, context),
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
index ebc084668b7..366fa69ed6a 100644
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -1,5 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record model="mail.group" id="group_community">
+            <field name="name">Community</field>
+            <field name="description">Community team</field>
+        </record>
+        <record model="mail.group" id="group_community">
+            <field name="message_follower_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
+        </record>
+        <record id="msg_group_community_1" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Dear community,</p>
+                <p>We are organizing a serie of events to showcase the new features of OpenERP v8.
+                The events are visible on http://openerp.com/events
+                </p>
+                <p>The America Tour:</p>
+                <p>3/11: New York: </p>
+                <p>3/13: Montreal: <a href="http://www.eventbrite.com/event/10577717237">http://www.eventbrite.com/event/10577717237</a></p>
+                <p>3/18: Los Angeles: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
+                <p>3/20: San Francisco: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
+                <p>4/10: Chicago: <a href="http://www.eventbrite.com/event/10577414331">http://www.eventbrite.com/event/10577414331</a></p>
+                <p>4/17: Miami: <a href="http://www.eventbrite.com/event/10577616937">http://www.eventbrite.com/event/10577616937</a></p>
+                <p>The European Tour:</p>
+                <p>2/20: Gosselies - Belgium: <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783>http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783</a></p>
+                <p>2/21: Brussels - Belgium: <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143</a></p>
+                <p>3/10: Germany: <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071</a></p>
+                <p>3/18: Lisbon, Portugal: <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519</a></p>
+                <p>Please spread the news and lets meet there.</p>
+                <p>Thanks,</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Hi,<p>
+
+            <p>is there any event scheduled for Africa in near future?</p>
+
+            <p>Regards</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="parent_id" ref="msg_group_community_1"></field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_3" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Yes,<p>
+                <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="parent_id" ref="msg_group_community_1"></field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_4" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">OpenERP Marketing</field>
+            <field name="body"><![CDATA[<p>Dear community,</p>
+                <p>
+                    Over the past years, we did not invest a lot in marketing. We put most
+                    our efforts in R&D and Sales departements (starting from 2010) and
+                    services (started in 2012).
+                </p><p>
+                    Things are changing and we are now ready to invest a lot in marketing
+                    activities. I just wrote a "very draft" internal document to discuss the
+                    brand positioning of OpenERP:
+                    <a href="http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb">http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb</a>
+                </p><p>
+                    I would like to have your point of view on these marketing thoughts for
+                    OpenERP.
+                </p><p>
+                    Thanks,
+                </p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_5" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: OpenERP Marketing</field>
+            <field name="body"><![CDATA[<p>I just posted my feedback request about the OpenERP brand positioning on
+                HN, you can react there: <a href="https://news.ycombinator.com/item?id=7243726">
+                https://news.ycombinator.com/item?id=7243726</a>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="parent_id" ref="msg_group_community_4"></field>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_6" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: report_webkit future</field>
+            <field name="body"><![CDATA[<p>Hello,</p>
+                <p>I don't think there can be only one positioning for OpenERP.</p>
+                <p>Depending on the customer in front of me, I will present OpenERP as :</p>
+                <ol>
+                    <li>an Apps-consuming platform (like a cell phone)</li>
+                    <li>an ERP (in its traditional meaning)</li>
+                    <li>a business apps development framework</li>
+                </ol>
+                <p>
+                    OpenERP answers a wide range of needs, so you need to differentiate 
+                    the positioning based on the 3 axis above. In each of those axis,
+                    the competition is different and arguments toward OpenERP will be
+                    different as well.
+                </p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="parent_id" ref="msg_group_community_4"></field>
+            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index a87365ad803..18c7d47d01a 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -19,21 +19,19 @@
                         <t t-call="website_mail_group.navigation_menu"/>
                     </div>
                     <div class="col-md-8">
-                        <t t-foreach="groups" t-as="group">
-                            <div class="col-md-6" style="min-height: 150px">
-                                <div class="col-md-3 col-md-pull-1">
-                                    <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
-                                </div>
-                                <div class="col-md-8">
-                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
-                                    <br/>
-                                    <small t-esc="group.description"/>
-                                    <br/>
-                                    <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                                    <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
-                                </div>
+                        <div class="col-md-6" style="min-height: 150px" t-foreach="groups" t-as="group">
+                            <div class="col-md-3 col-md-pull-1">
+                                <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
                             </div>
-                        </t>
+                            <div class="col-md-8">
+                                <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                <br/>
+                                <small t-esc="group.description"/>
+                                <br/>
+                                <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -65,15 +63,13 @@
                             <div class="panel-heading" t-esc="active_group.name"/>
                             <table class="table table-bordered">
                                 <tbody>
-                                    <t t-foreach="thread_list" t-as="thread">
-                                        <tr>
-                                            <td>
-                                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
-                                                <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
-                                                <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
-                                            </td>
-                                        </tr>
-                                    </t>
+                                    <tr t-foreach="thread_list" t-as="thread">
+                                        <td>
+                                            <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
+                                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
+                                            <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -89,25 +85,25 @@
             </t>
             <div class="row mt32">
                 <div class="container">
-                    <div class="col-md-1 mt0">
-                        <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
-                    </div>
-                    <div class="col-md-11">
-                        <div class="panel panel-default">
-                            <div class="panel-heading" t-esc="main_thread.subject"/>
-                            <div class="panel-body">
-                                <t t-raw="main_thread.body"/>
+                    <div class="row">
+                        <div class="col-md-1">
+                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
+                        </div>
+                        <div class="col-md-11">
+                            <div class="panel panel-default">
+                                <div class="panel-heading" t-esc="main_thread.subject"/>
+                                <div class="panel-body" t-raw="main_thread.body"/>
                             </div>
                         </div>
                     </div>
                     <div class="row" t-foreach="child_thread" t-as="message">
-                        <div class="col-md-1 mt0">
-                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                        <div class="col-md-1">
+                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
                         </div>
                         <div class="col-md-11">
                             <div class="panel panel-default">
-                                <div class="panel-heading panel-line" t-esc="message.subject"/>
-                                <t t-raw="message.body"/>
+                                <div class="panel-heading" t-esc="message.subject"/>
+                                <div class="panel-body" t-raw="message.body"/>
                             </div>
                         </div>
                     </div>

From 7198fed6f80838dafa7d25fff368e0de16a2c168 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 14:59:24 +0530
Subject: [PATCH 034/175] [IMP]: demo data

bzr revid: aja@tinyerp.com-20140311092924-y0yauql0igx4aifr
---
 .../data/website_mail_group_demo.xml          | 138 ++++++++++++++----
 1 file changed, 107 insertions(+), 31 deletions(-)

diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
index 366fa69ed6a..2744986dcdd 100644
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -12,24 +12,74 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Dear community,</p>
-                <p>We are organizing a serie of events to showcase the new features of OpenERP v8.
-                The events are visible on http://openerp.com/events
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Dear community,
+                </p><p>
+                    We are organizing a serie of events to showcase the new 
+                    features of OpenERP v8.The events are visible on 
+                    http://openerp.com/events
+                </p><p>
+                    The America Tour:
+                </p><p>
+                    3/11: New York:
+                    <a href="http://www.eventbrite.com/event/10576455463">
+                        http://www.eventbrite.com/event/10576455463
+                    </a>
+                </p><p>
+                    3/13: Montreal: 
+                    <a href="http://www.eventbrite.com/event/10577717237">
+                        http://www.eventbrite.com/event/10577717237
+                    </a>
+                </p><p>
+                    3/18: Los Angeles: 
+                    <a href="http://www.eventbrite.com/event/10577185647">
+                        http://www.eventbrite.com/event/10577185647
+                    </a>
+                </p><p>
+                    3/20: San Francisco: 
+                    <a href="http://www.eventbrite.com/event/10577185647">
+                        http://www.eventbrite.com/event/10577185647
+                    </a>
+                </p><p>
+                    4/10: Chicago:
+                    <a href="http://www.eventbrite.com/event/10577414331">
+                        http://www.eventbrite.com/event/10577414331
+                    </a>
+                </p><p>
+                    4/17: Miami:
+                    <a href="http://www.eventbrite.com/event/10577616937">
+                        http://www.eventbrite.com/event/10577616937
+                    </a>
+                </p><p>
+                    The European Tour:
+                </p><p>
+                    2/20: Gosselies - Belgium:
+                    <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783">
+                        http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783
+                    </a>
+                </p><p>
+                    2/21: Brussels - Belgium:
+                    <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">
+                        http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143
+                    </a>
+                </p><p>
+                    3/10: Germany:
+                    <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">
+                        http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071
+                    </a>
+                </p><p>
+                    3/18: Lisbon, Portugal:
+                    <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">
+                        https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519
+                    </a>
+                </p><p>
+                    Please spread the news and lets meet there.
+                </p><p>
+                    Thanks,
                 </p>
-                <p>The America Tour:</p>
-                <p>3/11: New York: </p>
-                <p>3/13: Montreal: <a href="http://www.eventbrite.com/event/10577717237">http://www.eventbrite.com/event/10577717237</a></p>
-                <p>3/18: Los Angeles: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
-                <p>3/20: San Francisco: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
-                <p>4/10: Chicago: <a href="http://www.eventbrite.com/event/10577414331">http://www.eventbrite.com/event/10577414331</a></p>
-                <p>4/17: Miami: <a href="http://www.eventbrite.com/event/10577616937">http://www.eventbrite.com/event/10577616937</a></p>
-                <p>The European Tour:</p>
-                <p>2/20: Gosselies - Belgium: <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783>http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783</a></p>
-                <p>2/21: Brussels - Belgium: <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143</a></p>
-                <p>3/10: Germany: <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071</a></p>
-                <p>3/18: Lisbon, Portugal: <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519</a></p>
-                <p>Please spread the news and lets meet there.</p>
-                <p>Thanks,</p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_root"/>
@@ -39,11 +89,16 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Hi,<p>
-
-            <p>is there any event scheduled for Africa in near future?</p>
-
-            <p>Regards</p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Hi,
+                </p><p>
+                    is there any event scheduled for Africa in near future?
+                </p><p>
+                    Regards
+                </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="parent_id" ref="msg_group_community_1"></field>
@@ -54,8 +109,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Yes,<p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>Yes,<p>
                 <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="parent_id" ref="msg_group_community_1"></field>
@@ -66,7 +124,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">OpenERP Marketing</field>
-            <field name="body"><![CDATA[<p>Dear community,</p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>Dear community,</p>
                 <p>
                     Over the past years, we did not invest a lot in marketing. We put most
                     our efforts in R&D and Sales departements (starting from 2010) and
@@ -82,6 +142,7 @@
                 </p><p>
                     Thanks,
                 </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_root"/>
@@ -91,9 +152,17 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[<p>I just posted my feedback request about the OpenERP brand positioning on
-                HN, you can react there: <a href="https://news.ycombinator.com/item?id=7243726">
-                https://news.ycombinator.com/item?id=7243726</a>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    I just posted my feedback request 
+                    about the OpenERP brand positioning on
+                    HN, you can react there:
+                    <a href="https://news.ycombinator.com/item?id=7243726">
+                        https://news.ycombinator.com/item?id=7243726
+                    </a>
+                </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_demo"/>
@@ -103,10 +172,16 @@
         <record id="msg_group_community_6" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: report_webkit future</field>
-            <field name="body"><![CDATA[<p>Hello,</p>
-                <p>I don't think there can be only one positioning for OpenERP.</p>
-                <p>Depending on the customer in front of me, I will present OpenERP as :</p>
+            <field name="subject">Re: OpenERP Marketing</field>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Hello,
+                </p><p>
+                    I don't think there can be only one positioning for OpenERP.
+                </p><p>
+                    Depending on the customer in front of me, I will present OpenERP as :
+                </p>
                 <ol>
                     <li>an Apps-consuming platform (like a cell phone)</li>
                     <li>an ERP (in its traditional meaning)</li>
@@ -118,6 +193,7 @@
                     the competition is different and arguments toward OpenERP will be
                     different as well.
                 </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_demo"/>

From 79e55a06d629d0794fc5880323891c3b5be01fce Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 16:13:17 +0530
Subject: [PATCH 035/175] [IMP] : Group follow/unfollow button not visible
 without logged in

bzr revid: aja@tinyerp.com-20140311104317-ysrtonu691g7qqek
---
 addons/website_mail_group/__openerp__.py             |  1 +
 addons/website_mail_group/controllers/main.py        |  3 ++-
 .../security/website_mail_group.xml                  | 12 ++++++++++++
 .../website_mail_group/views/website_mail_group.xml  |  6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 addons/website_mail_group/security/website_mail_group.xml

diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index f90d654036f..5681dc31fd3 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -14,6 +14,7 @@ OpenERP Mail Group : Mailing List Archive
         'views/website_mail_group.xml',
         'views/website_mail_group_backend.xml',
         'data/website_mail_group_data.xml',
+        'security/website_mail_group.xml',
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 996b5524ffd..01ec8633d55 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -32,6 +32,7 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
+        
         group_ids = group_obj.search(cr, uid, [], context=context)
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
@@ -39,7 +40,7 @@ class MailGroup(http.Controller):
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route([
-        "/groups/subscription",
+        "/groups/subscription/",
     ], type='json', auth="public", website=True)
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
diff --git a/addons/website_mail_group/security/website_mail_group.xml b/addons/website_mail_group/security/website_mail_group.xml
new file mode 100644
index 00000000000..79d4390f6f9
--- /dev/null
+++ b/addons/website_mail_group/security/website_mail_group.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.rule" id="mail.mail_group_public_and_joined">
+            <field name="name">Mail.group: access only public and joined groups</field>
+            <field name="model_id" ref="mail.model_mail_group"/>
+            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_create" eval="False"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 18c7d47d01a..e6963200290 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -13,7 +13,7 @@
             <t t-set="head">
                 <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
             </t>
-            <div class="row">
+            <div class="row mt16">
                 <div class="container">
                     <div class="col-md-3 col-md-push-1">
                         <t t-call="website_mail_group.navigation_menu"/>
@@ -28,8 +28,8 @@
                                 <br/>
                                 <small t-esc="group.description"/>
                                 <br/>
-                                <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                                <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                                <a groups="base.group_user" t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                <a groups="base.group_user" t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
                             </div>
                         </div>
                     </div>

From 8da3b9e4d4f0b7cf430772a6484f2c1c25324ccb Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 11 Mar 2014 16:29:38 +0100
Subject: [PATCH 036/175] [FIX] Calendar, use date culture info for
 shortDateTime and axis in week view

bzr revid: jke@openerp.com-20140311152938-qdmf9xre758ri222
---
 .../static/src/js/web_calendar.js             | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index dce94604164..1041a2a9c24 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -21,6 +21,7 @@ openerp.web_calendar = function(instance) {
     }
 
     function get_fc_defaultOptions() {
+        shortTimeformat = Date.CultureInfo.formatPatterns.shortTime;
         return {
             weekNumberTitle: _t("W"),
             allDayText: _t("all-day"),
@@ -29,7 +30,17 @@ openerp.web_calendar = function(instance) {
             dayNames: Date.CultureInfo.dayNames,
             dayNamesShort: Date.CultureInfo.abbreviatedDayNames,
             firstDay: Date.CultureInfo.firstDayOfWeek,
-            weekNumbers: true
+            weekNumbers: true,
+            axisFormat : shortTimeformat.replace(/:mm/,'(:mm)'),
+            timeFormat : {
+               // for agendaWeek and agendaDay               
+               agenda: shortTimeformat + '{ - ' + shortTimeformat + '}', // 5:00 - 6:30
+                // for all other views
+                '': shortTimeformat.replace(/:mm/,'(:mm)')  // 7pm
+            },
+            weekMode : 'liquid',
+            aspectRatio: 1.8,
+            snapMinutes: 15,
         };
     }
 
@@ -258,17 +269,7 @@ openerp.web_calendar = function(instance) {
 
                 unselectAuto: false,
 
-                // Options
-                timeFormat : {
-                   // for agendaWeek and agendaDay
-                    agenda: 'h:mm{ - h:mm}', // 5:00 - 6:30
 
-                    // for all other views
-                    '': 'h(:mm)tt'  // 7pm
-                },
-                weekMode : 'liquid',
-                aspectRatio: 1.8,
-                snapMinutes: 15,
             });
         },
 

From 3f7d176a5571ce5ac96d6eca78df2ca749ab0fd4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 11 Mar 2014 16:53:09 +0100
Subject: [PATCH 037/175] [FIX] website_mail: very expensive copy/paste typo

bzr revid: odo@openerp.com-20140311155309-bs0frntkkhym8e2o
---
 addons/website_mail/models/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index c708d9c3e33..12c35f3e83f 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -54,7 +54,7 @@ class MailMessage(osv.Model):
             args = ['&', ('website_published', '=', True)] + list(args)
 
         return super(MailMessage, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-                                                context=context, count=False, access_rights_uid=access_rights_uid)
+                                                context=context, count=count, access_rights_uid=access_rights_uid)
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Add Access rules of mail.message for non-employee user:

From e47214eb9edb82b9dacd716c6057124813187ddb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 11 Mar 2014 16:57:50 +0100
Subject: [PATCH 038/175] [FIX] portal: another very expensive copy/paste typo

bzr revid: odo@openerp.com-20140311155750-mg9fb5f3so99lzeg
---
 addons/portal/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
index 4429df3be8b..8837c605233 100644
--- a/addons/portal/mail_message.py
+++ b/addons/portal/mail_message.py
@@ -42,7 +42,7 @@ class mail_message(osv.Model):
             args = [('subtype_id', '!=', False)] + list(args)
 
         return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-            context=context, count=False, access_rights_uid=access_rights_uid)
+            context=context, count=count, access_rights_uid=access_rights_uid)
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Add Access rules of mail.message for non-employee user:

From f75f09db9282467dc2a916bac4bcfb124f74c1eb Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 11 Mar 2014 17:04:19 +0100
Subject: [PATCH 039/175] [FIX] website_sale: set height for empty cell in grid

bzr revid: chm@openerp.com-20140311160419-a9d4dylm0spt4rf3
---
 addons/website_sale/views/website_sale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b8184a32d07..247c9127222 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -188,7 +188,7 @@
 
                       </td>
                       </t>
-                      <td t-if="not td_product"/>
+                      <td t-if="not td_product" class="oe-height-2"/>
                     </t>
                   </tr>
                 </tbody>

From 9dc0859c770925f6803a01794bef28c5bff8f621 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 11 Mar 2014 17:08:34 +0100
Subject: [PATCH 040/175] [FIX] Very expensive copy paste type

bzr revid: jke@openerp.com-20140311160834-vm0ixawo7alh3w5p
---
 addons/calendar/calendar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 784358dceed..c6ffbf13597 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1326,8 +1326,8 @@ class calendar_event(osv.Model):
         if not context.get('virtual_id', True):
             return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
 
-        # offset, limit, order and count must be treated separately as we may need to deal with virtual ids
-        res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
+        # offset, limit, order and count must be treated separately as we may need to deal with virtual ids        
+        res = super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
         res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context)
         if count:
             return len(res)

From 8a8f93a1011393d0a307cc824a45db4e23242811 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 11 Mar 2014 17:38:33 +0100
Subject: [PATCH 041/175] [REVERT] revert previous commit: this specific case
 was legit

bzr revid: chs@openerp.com-20140311163833-evzfw1z6fl8m63in
---
 addons/calendar/calendar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index c6ffbf13597..784358dceed 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1326,8 +1326,8 @@ class calendar_event(osv.Model):
         if not context.get('virtual_id', True):
             return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
 
-        # offset, limit, order and count must be treated separately as we may need to deal with virtual ids        
-        res = super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
+        # offset, limit, order and count must be treated separately as we may need to deal with virtual ids
+        res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
         res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context)
         if count:
             return len(res)

From 203cc0b5766ff41a08e286651993b09bbb4e0d00 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 11 Mar 2014 18:08:45 +0100
Subject: [PATCH 042/175] [FIX] Render mini calendar with correct
 date.cultureInfo according to user language

bzr revid: jke@openerp.com-20140311170845-sfm7txcllsmkk9wj
---
 .../web_calendar/static/src/js/web_calendar.js  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 1041a2a9c24..4c5473a2ed1 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -24,7 +24,13 @@ openerp.web_calendar = function(instance) {
         shortTimeformat = Date.CultureInfo.formatPatterns.shortTime;
         return {
             weekNumberTitle: _t("W"),
-            allDayText: _t("all-day"),
+            allDayText: _t("All day"),
+            buttonText : {
+                today:    _t("Today"),
+                month:    _t("Month"),
+                week:     _t("Week"),
+                day:      _t("Day")
+            },
             monthNames: Date.CultureInfo.monthNames,
             monthNamesShort: Date.CultureInfo.abbreviatedMonthNames,
             dayNames: Date.CultureInfo.dayNames,
@@ -294,11 +300,18 @@ openerp.web_calendar = function(instance) {
             var self = this;
              
             if (!this.sidebar && this.options.$sidebar) {
+                translate = get_fc_defaultOptions();
                 this.sidebar = new instance.web_calendar.Sidebar(this);
                 this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container'));
 
                 this.$small_calendar = self.$el.find(".oe_calendar_mini");
-                this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self) });
+                this.$small_calendar.datepicker({ 
+                    onSelect: self.calendarMiniChanged(self),
+                    dayNamesMin : translate.dayNamesShort,
+                    monthNames: translate.monthNamesShort,
+                    firstDay: translate.firstDay,
+                });
+
             
                 if (this.useContacts) {
                     //Get my Partner ID

From d9fcc1604500b6df079cd40beba7c368be992372 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 11 Mar 2014 18:13:56 +0100
Subject: [PATCH 043/175] [FIX] ir.logging: Raise an internal exception in the
 case where there is no defined database, but this exception is catched by the
 _internal_emit method and just ignore it to avoid a crash. Better solution,
 try to log on the standard handler.

bzr revid: stw@openerp.com-20140311171356-jghlh2w2pnxvtu2e
---
 openerp/loggers/handlers.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/openerp/loggers/handlers.py b/openerp/loggers/handlers.py
index 763aa079195..24be46085c8 100644
--- a/openerp/loggers/handlers.py
+++ b/openerp/loggers/handlers.py
@@ -31,6 +31,9 @@ from openerp import tools
 # in the database, --log-pgsql-database=YOUR_DBNAME
 # By default the system will use the current database
 
+class NoDatabaseError(Exception):
+    pass
+
 class PostgreSQLHandler(logging.Handler):
     @contextlib.contextmanager
     def create_connection(self):
@@ -50,7 +53,7 @@ class PostgreSQLHandler(logging.Handler):
             db_name = db_name_from_cli
 
         if not db_name:
-            return
+            raise NoDatabaseError("There is no defined database on this request")
 
         parameters = {
             'user': tools.config['db_user'] or None,
@@ -67,8 +70,7 @@ class PostgreSQLHandler(logging.Handler):
         except Exception, ex:  # Use a specific exception
             print ex
 
-    def emit(self, record):
-        # We use a context manager to be tolerant to the errors (error of connections,...)
+    def _internal_emit(self, record):
         with self.create_connection() as conn:
             exception = False
             if record.exc_info:
@@ -81,7 +83,7 @@ class PostgreSQLHandler(logging.Handler):
             dbname = getattr(current_thread, 'dbname', False)
 
             parameters = (
-                now, uid, now, uid, 'server', dbname, record.name, 
+                now, uid, now, uid, 'server', dbname, record.name,
                 logging.getLevelName(record.levelno), record.msg, exception,
                 record.filename, record.funcName, record.lineno
             )
@@ -89,12 +91,17 @@ class PostgreSQLHandler(logging.Handler):
             with conn.cursor() as cursor:
                 cursor.execute("""
                     INSERT INTO ir_logging(
-                        create_date, create_uid, write_date, write_uid, 
+                        create_date, create_uid, write_date, write_uid,
                         type, dbname, name, level, message, exception, path, func,
                         line
                     )
                     VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
-                    """,
-                    parameters
-                )
+                    """, parameters)
                 conn.commit()
+
+    def emit(self, record):
+        # We use a context manager to be tolerant to the errors (error of connections,...)
+        try:
+            self._internal_emit(record)
+        except NoDatabaseError:
+            pass

From 384f3980906f296f2c33ff7eb3b140dd7741f499 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 11 Mar 2014 18:19:41 +0100
Subject: [PATCH 044/175] [IMP] website: publish button use action for url to
 backend

bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
---
 addons/website/static/src/css/website.css     |  1 +
 addons/website/static/src/css/website.sass    |  1 +
 addons/website/views/website_templates.xml    |  2 +-
 .../views/website_blog_templates.xml          | 26 +++++++++----------
 addons/website_event/views/website_event.xml  |  5 ++++
 addons/website_sale/views/website_sale.xml    |  1 +
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 774be6ae09a..b0f118258f4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -119,6 +119,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: 100%;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 4796d88cbb8..233bd447566 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: 100%
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 580957b81d6..4b4cca1a19a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -364,7 +364,7 @@
                 </li>
                 <t t-raw="0"/>
                 <li t-if="publish_edit">
-                    <a t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (object._name, object.id)"
+                    <a t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{object._name}&amp;id=#{object.id}&amp;action=#{action}"
                     title='Edit in backend'>Edit</a>
                 </li>
             </ul>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 203dcc3bb71..179b1b49ff0 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -155,7 +155,19 @@
 <template id="blog_post_complete" name="Blog Post">
     <t t-call="website_blog.index">
 
-    <div class="container" id="title">
+    <t t-call="website.publish_management">
+        <t t-set="object" t-value="blog_post"/>
+        <t t-set="publish_edit" t-value="True"/>
+        <t t-set="action" t-value="'website_blog.action_blog_post'"/>
+        <li>
+            <form class="duplicate hidden" action="/blogpost/duplicate">
+                <input name="blog_post_id" t-att-value="blog_post.id"/>
+            </form>
+            <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
+        </li>
+    </t>
+
+    <div id="title">
         <h1 class="text-center" t-field="blog_post.name"/>
         <p class="post-meta text-muted text-center" name="blog_post_data">
             <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
@@ -167,18 +179,6 @@
             </span>
         </p>
     </div>
-    <div class="container">
-        <t t-call="website.publish_management">
-            <t t-set="object" t-value="blog_post"/>
-            <t t-set="publish_edit" t-value="True"/>
-            <li>
-                <form class="duplicate hidden" action="/blogpost/duplicate">
-                    <input name="blog_post_id" t-att-value="blog_post.id"/>
-                </form>
-                <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
-            </li>
-        </t>
-    </div>
 
     <div t-field="blog_post.content"/>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index e490b1a0687..20d3499cf4a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -189,6 +189,11 @@
                     </ol>
                 </div>
                 <div class="col-sm-5" groups="event.group_event_manager">
+                    <t t-call="website.publish_management">
+                      <t t-set="object" t-value="event"/>
+                      <t t-set="publish_edit" t-value="True"/>
+                      <t t-set="action" t-value="'event.action_event_view'"/>
+                    </t>
                 </div>
             </div>
         </div>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 31517b8bfbb..a3576b90c2c 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -293,6 +293,7 @@
                 <t t-call="website.publish_management">
                   <t t-set="object" t-value="product"/>
                   <t t-set="publish_edit" t-value="True"/>
+                  <t t-set="action" t-value="'product.product_template_action'"/>
                 </t>
             </div>
           </div>

From e4c3847eb752f9e539abd9461cf2679445fba595 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 11 Mar 2014 18:35:19 +0100
Subject: [PATCH 045/175] [FIX] remove test commits

bzr revid: jke@openerp.com-20140311173519-kdk52vqcrl25r6g6
---
 addons/web/static/src/js/testing.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 1b75e136dbb..c4f5aeebd60 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -50,19 +50,12 @@ openerp.testing = {};
     testing.current_module = null;
     testing.templates = { };
     testing.add_template = function (name) {
-        try {
-            console.log(name + " loading ...");
-            var xhr = window.QWeb2.Engine.prototype.get_xhr();
-            console.log(name + " loaded ...");
-            xhr.open('GET', name, false);
-            xhr.send(null);
-            (testing.templates[testing.current_module] =
-                testing.templates[testing.current_module] || [])
-                    .push(xhr.responseXML);
-        }
-        catch(e) {
-            console.log(name + " ERRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRROOOOR");
-        }
+        var xhr = QWeb2.Engine.prototype.get_xhr();
+        xhr.open('GET', name, false);
+        xhr.send(null);
+        (testing.templates[testing.current_module] =
+            testing.templates[testing.current_module] || [])
+                .push(xhr.responseXML);
     };
     /**
      * Function which does not do anything

From 4d125a3b52f6141736a7c125482f6e8dff3809e6 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 10:34:40 +0100
Subject: [PATCH 046/175] [IMP] website: simplify code share button; wip: fix
 overlay

bzr revid: chm@openerp.com-20140312093440-4uzrpkguzu0fc5p5
---
 addons/website/static/src/css/snippets.css    |  3 +++
 addons/website/static/src/css/snippets.sass   |  2 ++
 .../src/js/website.snippets.animation.js      | 23 ++++++++-----------
 .../static/src/js/website.snippets.editor.js  |  1 +
 addons/website/views/snippets.xml             | 10 ++++----
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 1416f2f899f..48400b88d45 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -344,6 +344,9 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.readonly {
+  content: "";
+}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 8d337aadf3c..0c4abe362e2 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -252,6 +252,8 @@
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+        &.readonly
+            content: ""
 
     .icon.btn
         display: inline-block
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 55da2b9df66..56ad596d71a 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -134,23 +134,18 @@
     website.snippet.animationRegistry.share = website.snippet.Animation.extend({
         selector: ".oe_share",
         start: function () {
-            var self = this;
             var url = encodeURIComponent(window.location.href);
             var title = encodeURIComponent($("title").text());
-            this.$target.find(".oe_share_facebook").attr("href",
-                "https://www.facebook.com/sharer/sharer.php?u="+url);
-            this.$target.find(".oe_share_twitter").attr("href",
-                "https://twitter.com/intent/tweet?text="+title+"&related=&url="+url);
-            this.$target.find(".oe_share_linkedin").attr("href",
-                "http://www.linkedin.com/shareArticle?mini=true&url="+url+"&title="+title+"&summary=&source=");
-            this.$target.find(".oe_share_google").attr("href",
-                "https://plus.google.com/share?url="+url);
-            this.$target.find("a").click(function () {
-                window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
-                return false;
+            this.$target.find("a").each(function () {
+                var $a = $(this);
+                $a.attr("href", $(this).attr("href").replace("{url}", url).replace("{title}", title));
+                if ($a.attr("target") && $a.attr("target").match(/_blank/i)) {
+                    $a.click(function () {
+                        window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+                        return false;
+                    });
+                }
             });
-            this.$target.find(".oe_share_mail").attr("href",
-                "mailto:?body="+url+"&subject="+title).off("click");
         },
     });
 })();
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ce24f7e7780..f3c702e7be3 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -200,6 +200,7 @@
 
         bind_snippet_click_editor: function () {
             var self = this;
+            var snipped_event_flag;
             $("#wrapwrap").on('click', function (event) {
                 if (snipped_event_flag) {
                     return;
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index ebbece93f64..000383a512c 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -345,11 +345,11 @@
         <div class="oe_snippet_body oe_share">
             <h3>
                 Share 
-                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/OpenERP"><i class="fa fa-facebook-square"></i></a>
-                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/openerp"><i class="fa fa-twitter"></i></a>
-                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/company/openerp"><i class="fa fa-linkedin"></i></a>
-                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
-                <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
+                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/sharer/sharer.php?u={url}"><i class="fa fa-facebook-square"></i></a>
+                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/intent/tweet?text={title}&amp;url={url}"><i class="fa fa-twitter"></i></a>
+                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/shareArticle?mini=true&amp;url={url}&amp;title={title}&amp;"><i class="fa fa-linkedin"></i></a>
+                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/share?url={url}"><i class="fa fa-google-plus-square"></i></a>
+                <a href="mailto:?body={url}&amp;subject={title}"><i class="fa fa-envelope-o"></i></a>
             </h3>
         </div>
     </div>

From eb2913d5b3eab14f2766b6d6600f6b170f79d0cc Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 12 Mar 2014 11:16:29 +0100
Subject: [PATCH 047/175] [FIX] Remove test from saas-3 - Tech Saas & AL
 agreement

bzr revid: jke@openerp.com-20140312101629-dzf4620cobaeu22t
---
 addons/website_event_sale/tests/test_ui.py | 6 ++++--
 addons/website_sale/tests/test_ui.py       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 1e5d727de92..b73c75d3f91 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -5,6 +5,8 @@ def load_tests(loader, base, _):
         {'redirect': '/page/website.homepage'}))
     base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'),
         {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'}))
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'),
-        {'path': '/', 'user': None}))
+    # Test has been commented in SAAS-3 ONLY, it must be activated in trunk. 
+    # Log for test JS has been improved in trunk, so we stop to loss time in saas-3 and debug it directly in trunk.
+    # Tech Saas & AL agreement
+    # base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'), {'path': '/', 'user': None}))
     return base
\ No newline at end of file
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 394a9ca8e4f..9a9c5a3777a 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -7,6 +7,8 @@ def load_tests(loader, base, _):
         {'redirect': '/page/website.homepage'}))
     base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
         {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'}))
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
-        {'path': '/', 'user': None}))
+    # Test has been commented in SAAS-3 ONLY, it must be activated in trunk. 
+    # Log for test JS has been improved in trunk, so we stop to loss time in saas-3 and debug it directly in trunk.
+    # Tech Saas & AL agreement
+    # base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), {'path': '/', 'user': None}))
     return base
\ No newline at end of file

From d6fc0c259e510a1608caca785f91cdb3bb3fdb76 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 14:09:39 +0100
Subject: [PATCH 048/175] [FIX] website: snippet overlay position

bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
---
 addons/website/static/src/css/snippets.css    |  5 ++++-
 addons/website/static/src/css/snippets.sass   |  4 +++-
 .../static/src/js/website.snippets.editor.js  | 21 ++++++++-----------
 .../static/src/xml/website.snippets.xml       | 14 ++++++-------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 48400b88d45..4121b70ef2e 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -345,7 +345,10 @@
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
 .oe_overlay .oe_handle.readonly {
-  content: "";
+  cursor: auto !important;
+}
+.oe_overlay .oe_handle.readonly:before, .oe_overlay .oe_handle.readonly.size {
+  display: none !important;
 }
 .oe_overlay .icon.btn {
   display: inline-block;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 0c4abe362e2..d7442a5b0f7 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -253,7 +253,9 @@
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
         &.readonly
-            content: ""
+            cursor: auto !important
+            &:before, &.size
+                display: none !important
 
     .icon.btn
         display: inline-block
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f3c702e7be3..bc7c6db15d1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -180,10 +180,10 @@
                 'top': pos.top - mt - 5,
                 'left': pos.left
             });
-            $el.find(">.e,>.w").css({'height': $target.outerHeight() + mt + mb+1});
-            $el.find(">.s").css({'top': $target.outerHeight() + mt + mb});
-            $el.find(">.size").css({'top': $target.outerHeight() + mt});
-            $el.find(">.s,>.n").css({'width': $target.outerWidth()-2});
+            $el.find(".oe_handle.e,.oe_handle.w").css({'height': $target.outerHeight() + mt + mb+1});
+            $el.find(".oe_handle.s").css({'top': $target.outerHeight() + mt + mb});
+            $el.find(".oe_handle.size").css({'top': $target.outerHeight() + mt});
+            $el.find(".oe_handle.s,.oe_handle.n").css({'width': $target.outerWidth()-2});
         },
         show: function () {
             this.$el.removeClass("hidden");
@@ -969,16 +969,13 @@
         start: function () {
             var self = this;
             this._super();
-            var $box = $(openerp.qweb.render("website.snippets.resize"));
 
             var resize_values = this.getSize();
-            if (!resize_values.n) $box.find(".oe_handle.n").remove();
-            if (!resize_values.s) $box.find(".oe_handle.s").remove();
-            if (!resize_values.e) $box.find(".oe_handle.e").remove();
-            if (!resize_values.w) $box.find(".oe_handle.w").remove();
-            if (!resize_values.size) $box.find(".oe_handle.size").remove();
-
-            this.$overlay.append($box.find(".oe_handles").html());
+            if (resize_values.n) this.$overlay.find(".oe_handle.n").removeClass("readonly");
+            if (resize_values.s) this.$overlay.find(".oe_handle.s").removeClass("readonly");
+            if (resize_values.e) this.$overlay.find(".oe_handle.e").removeClass("readonly");
+            if (resize_values.w) this.$overlay.find(".oe_handle.w").removeClass("readonly");
+            if (resize_values.size) this.$overlay.find(".oe_handle.size").removeClass("readonly");
 
             this.$overlay.find(".oe_handle:not(:has(.oe_handle_button)), .oe_handle .oe_handle_button").on('mousedown', function (event){
                 event.preventDefault();
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index ae109139e3c..4a9769203ef 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -34,6 +34,13 @@
                     <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block">&amp;nbsp;<i class="fa fa-trash-o"></i>&amp;nbsp; </a>
                 </div>
             </div>
+            <div class='oe_handles'>
+                <div class='oe_handle n readonly'><div></div></div>
+                <div class='oe_handle e readonly'><div></div></div>
+                <div class='oe_handle w readonly'><div></div></div>
+                <div class='oe_handle size readonly'><div class="oe_handle_button size">Resize</div></div>
+                <div class='oe_handle s readonly'><div></div></div>
+            </div>
         </div>
     </t>
 
@@ -45,13 +52,6 @@
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
         <!-- custom data for the widget -->
-        <div class='oe_handles'>
-            <div class='oe_handle n'><div></div></div>
-            <div class='oe_handle e'><div></div></div>
-            <div class='oe_handle w'><div></div></div>
-            <div class='oe_handle size'><div class="oe_handle_button size">Resize</div></div>
-            <div class='oe_handle s'><div></div></div>
-        </div>
         <div class='oe_snippet_thumbnail'>Margin resize</div>
     </div>
 

From 78385a8949cb37b8ba23a520e15ff03e7334ce38 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Mar 2014 14:23:54 +0100
Subject: [PATCH 049/175] [FIX] auth_signup: move <script> tag inside <t t-set>

bzr revid: chs@openerp.com-20140312132354-66f486rj19fg0wi9
---
 addons/auth_signup/views/auth_signup_login.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index c7db687d24f..28d8deba48c 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -19,13 +19,13 @@
                     <t t-foreach="js" t-as="js_file">
                         <script type="text/javascript" t-att-src="js_file"></script>
                     </t>
+                    <script type="text/javascript">
+                        $(function() {
+                            var s = new openerp.init(<t t-raw="modules"/>);
+                            var login_form = new openerp.web.LoginForm($('.oe_signup_form'));
+                        });
+                    </script>
                 </t>
-                <script type="text/javascript">
-                    $(function() {
-                        var s = new openerp.init(<t t-raw="modules"/>);
-                        var login_form = new openerp.web.LoginForm($('.oe_signup_form'));
-                    });
-                </script>
 
                 <t t-set="reset_without_token" t-value="mode == 'reset' and not token"/>
 

From 187545a06ad742b05b7d4994c3fe9cc355016985 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 12 Mar 2014 15:31:02 +0100
Subject: [PATCH 050/175] [FIX] crm: lead to opp, do not force salesteam in
 mass convert

bzr revid: dle@openerp.com-20140312143102-0887zl1r4tc4yq6z
---
 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 33bdb46452d..c64406546c3 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -126,7 +126,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         leads = lead.browse(cr, uid, lead_ids, context=context)
         for lead_id in leads:
             partner_id = self._create_partner(cr, uid, lead_id.id, data.action, lead_id.partner_id.id, context=context)
-            res = lead.convert_opportunity(cr, uid, [lead_id.id], partner_id, [], team_id, context=context)
+            res = lead.convert_opportunity(cr, uid, [lead_id.id], partner_id, [], False, context=context)
         user_ids = vals.get('user_ids', False)
         if context.get('no_force_assignation'):
             leads_to_allocate = [lead_id.id for lead_id in leads if not lead_id.user_id]

From 5bf16082786c647dfd322a3157305f750c070136 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 12 Mar 2014 16:07:36 +0100
Subject: [PATCH 051/175] [FIX] crm_partner_assign: remove readonly of partner
 latitude and longitude, otherwise it is not possible to set the geolocation
 manually, and impossible to reset the geolocation if it is wrong

bzr revid: dle@openerp.com-20140312150736-r1orwkwzjy37tchp
---
 addons/crm_partner_assign/crm_lead_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index aa9638fd579..d47e9ac5cbc 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -15,10 +15,10 @@
                                     <div class="oe_title">
                                         <h3>
                                             <span class="oe_grey">( </span>
-                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <field name="partner_latitude" nolabel="1" class="oe_inline"/>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
                                             <span class="oe_grey">) </span>
@@ -88,10 +88,10 @@
                                     <div>
                                         <h3>
                                             <span class="oe_grey">( </span>
-                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <field name="partner_latitude" nolabel="1" class="oe_inline"/>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
                                             <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
                                             <span class="oe_grey">) </span>

From 387dc3c91129ef98f887f0e2c1fa20648c39d65a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 12 Mar 2014 16:54:53 +0100
Subject: [PATCH 052/175] [FIX] crm: crm to opp, get duplidated leads does not
 take losts and deads. + search algorithm imp

bzr revid: dle@openerp.com-20140312155453-fj9ngb988advvn8s
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index c64406546c3..0b1d46d9940 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -42,19 +42,22 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}}
 
     def _get_duplicated_leads(self, cr, uid, partner_id, email, context=None):
+        """
+        Search for opportunities that have the same partner and that arent done or cancelled
+        """
         lead_obj = self.pool.get('crm.lead')
-        results = []
-        if partner_id:
-            # Search for opportunities that have the same partner and that arent done or cancelled
-            ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), '|', ('stage_id.probability', '=', False), ('stage_id.probability', '<', '100')])
-            for id in ids:
-                results.append(id)
         email = re.findall(r'([^ ,<@]+@[^> ,]+)', email or '')
+        final_stage_domain = [('stage_id.probability', '<', 100), '|', ('stage_id.probability', '>', 0), ('stage_id.sequence', '<=', 1)]
+        partner_match_domain = []
         if email:
-            ids = lead_obj.search(cr, uid, [('email_from', '=ilike', email[0]), '|', ('stage_id.probability', '=', False), ('stage_id.probability', '<', '100')])
-            for id in ids:
-                results.append(id)
-        return list(set(results))
+            partner_match_domain.append(('email_from', '=ilike', email[0]))
+        if partner_id:
+            partner_match_domain.append(('partner_id', '=', partner_id))
+        if email and partner_id:
+            partner_match_domain.insert(0, '|')
+        if not partner_match_domain:
+            return []        
+        return lead_obj.search(cr, uid, partner_match_domain + final_stage_domain)
 
 
     def default_get(self, cr, uid, fields, context=None):

From e13ac3153f5c3b3c4687b2b9ed5e45528112762f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 12 Mar 2014 17:44:59 +0100
Subject: [PATCH 053/175] [FIX] crm: get duplicated leads use email_split from
 tools

bzr revid: dle@openerp.com-20140312164459-gi7ol7huxx3gcbxi
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 0b1d46d9940..347475d100f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp.tools import email_split
 import re
 
 class crm_lead2opportunity_partner(osv.osv_memory):
@@ -46,20 +47,18 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         Search for opportunities that have the same partner and that arent done or cancelled
         """
         lead_obj = self.pool.get('crm.lead')
-        email = re.findall(r'([^ ,<@]+@[^> ,]+)', email or '')
+        emails = set(email_split(email) + [email])
         final_stage_domain = [('stage_id.probability', '<', 100), '|', ('stage_id.probability', '>', 0), ('stage_id.sequence', '<=', 1)]
         partner_match_domain = []
-        if email:
-            partner_match_domain.append(('email_from', '=ilike', email[0]))
+        for email in emails:
+            partner_match_domain.append(('email_from', '=ilike', email))
         if partner_id:
             partner_match_domain.append(('partner_id', '=', partner_id))
-        if email and partner_id:
-            partner_match_domain.insert(0, '|')
+        partner_match_domain = ['|'] * (len(partner_match_domain) - 1) + partner_match_domain
         if not partner_match_domain:
             return []        
         return lead_obj.search(cr, uid, partner_match_domain + final_stage_domain)
 
-
     def default_get(self, cr, uid, fields, context=None):
         """
         Default get for name, opportunity_ids.

From 4093259ec2f6a527b6beb4c784903cd4ff415d18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 18:55:19 +0100
Subject: [PATCH 054/175] [WIP] website: fix css layout for themes

bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
---
 .../static/src/css/bootswatch/amelia.fix.css  | 21 +++++++++++++++++++
 addons/website/views/themes.xml               | 12 +++++++++++
 .../static/src/css/website_sale.css           |  5 ++---
 .../static/src/css/website_sale.sass          |  5 ++---
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 addons/website/static/src/css/bootswatch/amelia.fix.css

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
new file mode 100644
index 00000000000..f724abcbfc9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -0,0 +1,21 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #ad1d28;
+}
+.oe_product section {
+    background: rgba(16, 138, 147, 0.75) !important;
+}
+.oe_product section .oe_subdescription {
+    color: #DFD6F5;
+}
+ul.wizard li {
+    background: #debb27 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #debb27 !important;
+}
+ul.wizard .text-primary {
+    color: #ad1d28 !important;
+}
+ul.wizard .text-success {
+    color: #ffffff !important;
+}
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index f56ab2b5dd7..9480c9bd30d 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -206,72 +206,84 @@
     <template id="website.theme_amelia" name="Amelia" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_cerulean" name="Cerulean" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cerulean.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cerulean.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_cosmo" name="Cosmo" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_cyborg" name="Cyborg" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_flatly" name="Flatly" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_journal" name="Journal" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_readable" name="Readable" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_simplex" name="Simplex" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_slate" name="Slate" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_united" name="United" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/united.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_yeti" name="Yeti" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index d9880bd7025..6b09c973a73 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -54,10 +54,9 @@
   bottom: 0;
   overflow: hidden;
   padding: 0 15px 24px 0;
-  max-height: 110px;
   min-height: 56px;
   border-top: 1px solid rgba(255, 255, 255, 0.2);
-  background: rgba(100, 100, 100, 0.1);
+  background: rgba(255, 255, 255, 0.75);
   z-index: 5;
 }
 .oe_product .product_price {
@@ -74,7 +73,7 @@
   font-size: 0.8em;
   max-height: 42px;
   overflow: hidden;
-  margin-bottom: 30px;
+  margin-bottom: 10px;
 }
 
 .oe_mycart .input-group-addon {
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 7c5bde43509..28ca2f1eb88 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -48,10 +48,9 @@
         bottom: 0
         overflow: hidden
         padding: 0 15px 24px 0
-        max-height: 110px
         min-height: 56px
         border-top: 1px solid rgba(255,255,255,0.2)
-        background: rgba(100, 100, 100, 0.1)
+        background: rgba(255, 255, 255, 0.75)
         z-index: 5
     .product_price
         padding: 5px 0
@@ -65,7 +64,7 @@
         font-size: 0.8em
         max-height: 42px
         overflow: hidden
-        margin-bottom: 30px
+        margin-bottom: 10px
 
 .oe_mycart
     .input-group-addon

From 2b762083a35b7a8901fdd8339cd17989a19a168a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 13 Mar 2014 09:51:07 +0100
Subject: [PATCH 055/175] [FIX] website_sale: only display payment acquirers of
 the company of the quotation, or payment acquirers not linked to any company

bzr revid: dle@openerp.com-20140313085107-ie4ptew82p4rq9cy
---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index eaca3608aa7..3aaabb596f1 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -603,7 +603,7 @@ class Ecommerce(http.Controller):
         if tx:
             acquirer_ids = [tx.acquirer_id.id]
         else:
-            acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True)], context=context)
+            acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True), '|', ('company_id', '=', order.company_id.id), ('company_id', '=', False)], context=context)
         values['acquirers'] = payment_obj.browse(cr, uid, acquirer_ids, context=context)
         render_ctx = dict(context, submit_class='btn btn-primary', submit_txt='Pay Now')
         for acquirer in values['acquirers']:

From 633ceff7fc812a5fb9d18671c893ff91ffccc665 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 13 Mar 2014 14:55:05 +0530
Subject: [PATCH 056/175] [IMP] : join group button is visible to public user
 if public user will click on join group will ask to login [IMP] : button
 color [ADD] : 'Mailing List' menu in footer

bzr revid: aja@tinyerp.com-20140313092505-yr2uwmxafudtdju9
---
 addons/website_mail_group/controllers/main.py     |  3 +++
 .../static/src/js/website_mail_group.js           |  4 +++-
 .../views/website_mail_group.xml                  | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index e4387ba547b..dc0acce7644 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -45,6 +45,9 @@ class MailGroup(http.Controller):
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
+        public_uid = request.registry['website'].get_public_user(cr , uid, context)
+        if uid == public_uid:
+            return ['is_public']
         if action:
             group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
         else:
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
index 3b856d12684..651ed7fa6c3 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -4,12 +4,14 @@ $(document).ready(function () {
         var $link = $(ev.currentTarget);
         var href = $link.attr("href");
         var group_id = href.match(/subscription\/([0-9]+)/)[1];
-        var action = href.match(/action=(.*)/)[1] == 'follow' ? true : false;
+        var action = href.match(/action=(.*)/)[1] == 'subscribe' ? true : false;
         openerp.jsonRpc("/groups/subscription/", 'call', {
                     'group_id': parseInt(group_id),
                     'action' : action,
                 })
                 .then(function (data) {
+                    if(data[0])
+                        return window.location ='/web/login?redirect=/groups/';
                     if (action){
                         $('li#'+ group_id).toggleClass('hidden visible');
                         $('.unfollow_' + group_id).toggleClass('visible hidden');
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 6c6b23416ed..5000ca85a1d 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+    <template id="footer_mailing_list" inherit_id="website.layout" name="Footer Mailing List Link">
+        <xpath expr="//footer//div[@name='info']/ul" position="inside">
+            <li><a t-attf-href="/groups">Mailing List</a></li>
+        </xpath>
+    </template>
     <template id="mail_groups" name="My Groups">
         <t t-call="website.layout">
             <t t-set="head">
@@ -16,8 +21,8 @@
                         <div>
                             <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
                             <div t-esc="group.description" class="text-muted"/>
-                            <a groups="base.group_user" t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                            <a groups="base.group_user" t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                            <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
+                            <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
                         </div>
                     </div>
                 </div>
@@ -41,7 +46,7 @@
                         <ul class="nav nav-pills nav-stacked" id="group_follows">
                             <t t-foreach="groups" t-as="group">
                                 <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id">
-                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                    <a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/>
                                 </li>
                             </t>
                         </ul>
@@ -49,13 +54,13 @@
                     <div class="col-md-9">
                         <ul class="media-list">
                             <li t-foreach="thread_list" t-as="thread" class="media">
-                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" class="pull-left">
+                                <a t-attf-href="/groups/#{active_group.id}/message/#{ slug(thread) }" class="pull-left">
                                     <img class="img-rounded pull-right mt0" style="height: 40px"
                                         t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
                                 </a>
                                 <div class="media-body">
                                     <h4 class="media-heading">
-                                        <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"/>
+                                        <a t-attf-href="/groups/#{ slug(active_group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
                                         <br/>
                                         <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
                                     </h4>

From 0308b7968c85798c382553925ea92e683c7ad86d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:32:02 +0100
Subject: [PATCH 057/175] [IMP] don't allow HTML formatting in non-HTML fields

bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
---
 .../website/static/src/js/website.editor.js   | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 3965e1c3d1a..06dd48fa68c 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -346,14 +346,40 @@
             requires: 'widget',
 
             init: function (editor) {
+                var specials = {
+                    // Can't find the correct ACL rule to only allow img tags
+                    image: { content: '*' },
+                    html: { text: '*' },
+                    monetary: {
+                        text: {
+                            selector: 'span.oe_currency_value',
+                            allowedContent: { }
+                        }
+                    }
+                };
+                _(specials).each(function (editable, type) {
+                    editor.widgets.add(type, {
+                        draggable: false,
+                        editables: editable,
+                        upcast: function (el) {
+                            return  el.attributes['data-oe-type'] === type;
+
+                        }
+                    });
+                });
                 editor.widgets.add('oeref', {
-                    editables: { text: '*' },
                     draggable: false,
-
+                    editables: {
+                        text: {
+                            selector: '*',
+                            allowedContent: { }
+                        },
+                    },
                     upcast: function (el) {
-                        var matches = el.attributes['data-oe-type'] && el.attributes['data-oe-type'] !== 'monetary';
-                        if (!matches) { return false; }
-
+                        var type = el.attributes['data-oe-type'];
+                        if (!type || (type in specials)) {
+                            return false;
+                        }
                         if (el.attributes['data-oe-original']) {
                             while (el.children.length) {
                                 el.children[0].remove();
@@ -363,16 +389,9 @@
                             ));
                         }
                         return true;
-                    },
-                });
-                editor.widgets.add('monetary', {
-                    editables: { text: 'span.oe_currency_value' },
-                    draggable: false,
-
-                    upcast: function (el) {
-                        return el.attributes['data-oe-type'] === 'monetary';
                     }
                 });
+
                 editor.widgets.add('icons', {
                     draggable: false,
 

From cd0434fb2a7cb0d8828485117b89255788c00aea Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:37:07 +0100
Subject: [PATCH 058/175] [IMP] context-sensitivity of toolbar commands (kinda,
 attempted)

bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
---
 addons/website/static/src/js/website.editor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 06dd48fa68c..9e855e28569 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -106,6 +106,7 @@
                     },
                     canUndo: false,
                     editorFocus: true,
+                    context: 'a',
                 });
                 //noinspection JSValidateTypes
                 editor.addCommand('image', {
@@ -115,6 +116,7 @@
                     },
                     canUndo: false,
                     editorFocus: true,
+                    context: 'img',
                 });
 
                 editor.ui.addButton('Link', {
@@ -205,6 +207,7 @@
                     icon: '/website/static/src/img/bglink.png',
                     modes: { wysiwyg: true },
                     editorFocus: true,
+                    context: 'a',
                     panel: {
                         css: '/website/static/lib/bootstrap/css/bootstrap.css',
                         attributes: { 'role': 'listbox', 'aria-label': label },

From b1cd54f5e9854645137b50d6ca9969431a0f9cfa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:38:22 +0100
Subject: [PATCH 059/175] [FIX] CSS of link style pane

bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 9e855e28569..c89bf9ec2fb 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -209,7 +209,7 @@
                     editorFocus: true,
                     context: 'a',
                     panel: {
-                        css: '/website/static/lib/bootstrap/css/bootstrap.css',
+                        css: '/web/static/lib/bootstrap/css/bootstrap.css',
                         attributes: { 'role': 'listbox', 'aria-label': label },
                     },
 

From caa33bbbbfe6f204e38b8894494fa3fd99ced286 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:19 +0100
Subject: [PATCH 060/175] [FIX] website: edit banner image

bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ee07840b12d..0607691ccaa 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1436,7 +1436,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image, .carousel-inner .content > div').attr('contentEditable', 'true');
             this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },

From e9fc839785259ca56542d112a6c1f032eab8e2b8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 11:21:40 +0100
Subject: [PATCH 061/175] [FIX] website: css themes

bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
---
 .../static/src/css/bootswatch/amelia.fix.css       |  8 +++++++-
 .../static/src/css/bootswatch/cosmo.fix.css        |  7 +++++++
 .../static/src/css/bootswatch/cyborg.fix.css       | 12 ++++++++++++
 .../static/src/css/bootswatch/flatly.fix.css       |  3 +++
 .../static/src/css/bootswatch/journal.fix.css      |  6 ++++++
 .../static/src/css/bootswatch/readable.fix.css     |  3 +++
 .../static/src/css/bootswatch/simplex.fix.css      |  3 +++
 .../static/src/css/bootswatch/slate.fix.css        | 14 ++++++++++++++
 .../website/static/src/css/bootswatch/yeti.fix.css |  3 +++
 addons/website/static/src/css/website.css          |  1 +
 addons/website/static/src/css/website.sass         |  1 +
 addons/website/views/themes.xml                    |  5 +----
 .../website_sale/static/src/css/website_sale.css   |  1 -
 .../website_sale/static/src/css/website_sale.sass  |  1 -
 14 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 addons/website/static/src/css/bootswatch/cosmo.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/cyborg.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/flatly.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/journal.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/readable.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/simplex.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/slate.fix.css
 create mode 100644 addons/website/static/src/css/bootswatch/yeti.fix.css

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
index f724abcbfc9..38d71852a0a 100644
--- a/addons/website/static/src/css/bootswatch/amelia.fix.css
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -4,7 +4,7 @@
 .oe_product section {
     background: rgba(16, 138, 147, 0.75) !important;
 }
-.oe_product section .oe_subdescription {
+.oe_product section .text-info {
     color: #DFD6F5;
 }
 ul.wizard li {
@@ -19,3 +19,9 @@ ul.wizard .text-primary {
 ul.wizard .text-success {
     color: #ffffff !important;
 }
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before {
+    color: #79D5DB !important;
+}
+.input-group-addon .fa {
+    color: #444;
+}
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
new file mode 100644
index 00000000000..5801cc0d7a4
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -0,0 +1,7 @@
+#website-top-navbar button.btn-primary {
+    color: #fff;
+    border: 2px solid #0061c2;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
new file mode 100644
index 00000000000..43c8e5770f9
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -0,0 +1,12 @@
+.oe_product section {
+    background: rgba(40, 40, 40, 0.85) !important;
+}
+.oe_product section .text-info {
+    color: #BA66E4;
+}
+ul.wizard li {
+    background: #222 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #222 !important;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
new file mode 100644
index 00000000000..fe4a2e73ed1
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #2c3e50;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
new file mode 100644
index 00000000000..a7f93fa312f
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -0,0 +1,6 @@
+#website-top-navbar button.btn-primary {
+    border: 2px solid #e4332e;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/readable.fix.css b/addons/website/static/src/css/bootswatch/readable.fix.css
new file mode 100644
index 00000000000..8e22d318615
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/readable.fix.css
@@ -0,0 +1,3 @@
+.oe_product section .text-info {
+    color: #2A9CBE;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
new file mode 100644
index 00000000000..a61f8d98338
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -0,0 +1,14 @@
+.oe_product section {
+    background: rgba(40, 40, 45, 0.80) !important;
+}
+ul.wizard li {
+    background-image: -webkit-linear-gradient(#8a9196,#7a8288 60%,#788084) !important;
+    background-image: linear-gradient(#8a9196,#7a8288 60%,#788084 ) !important;
+    color: #ccc;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #7C8386 !important;
+}
+ul.wizard li.text-primary {
+    color: #fff;
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 81b40ce7aca..6f69f554bd1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,6 +120,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: 100%;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a9ae82cee3a..200401023a6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: 100%
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 9480c9bd30d..1b1cf1fe4d3 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -213,7 +213,6 @@
     <template id="website.theme_cerulean" name="Cerulean" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cerulean.min.css' t-ignore="true"/>
-            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cerulean.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
@@ -269,21 +268,19 @@
     <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
-            <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_united" name="United" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/united.min.css' t-ignore="true"/>
-            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_yeti" name="Yeti" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.min.css' t-ignore="true"/>
-            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 6b09c973a73..3e5e692304e 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -71,7 +71,6 @@
 }
 .oe_product .oe_subdescription {
   font-size: 0.8em;
-  max-height: 42px;
   overflow: hidden;
   margin-bottom: 10px;
 }
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 28ca2f1eb88..128b1a25d43 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -62,7 +62,6 @@
         height: 100%
     .oe_subdescription
         font-size: 0.8em
-        max-height: 42px
         overflow: hidden
         margin-bottom: 10px
 

From b92001f1d8759d6695ab2e2b19d8a41d2e859b6c Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 13 Mar 2014 12:00:02 +0100
Subject: [PATCH 062/175] [IMP] Calendar - Add redirect to calendar module
 after the install of it

bzr revid: jke@openerp.com-20140313110002-m645txvytcrb40lr
---
 addons/calendar/calendar_data.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index 4435e8a4324..ff93a29a634 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -2,6 +2,17 @@
 <openerp>
     <data noupdate="1">
     
+        <!-- After installation of the module, open the related menu -->
+        <record id="action_client_calendar_menu" model="ir.actions.client">
+            <field name="name">Open Calendar</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('calendar.mail_menu_calendar')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_calendar_menu"/>
+            <field name="state">open</field>
+        </record>
+
          <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="calendar.subtype_invitation" model="mail.message.subtype">
             <field name="name">Invitation</field>
@@ -401,7 +412,7 @@
                             </div>
                             <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
                                 <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
-                                <p style="margin-left:12px">this it a reminder for the event below : </p>
+                                <p style="margin-left:12px">That is a reminder for the event below : </p>
                             </div>
                             <div style="height: auto;margin-left:12px;margin-top:30px;">
                                 <table>

From 9496d823e9825be888ad83ae7ec34cfac3084113 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 14:05:56 +0100
Subject: [PATCH 063/175] [FIX] website: snippet dropdown options

bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
---
 .../static/src/js/website.snippets.editor.js  |  9 ++++++--
 .../static/src/xml/website.snippets.xml       |  2 +-
 addons/website/views/snippets.xml             | 22 +++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index bc7c6db15d1..8ff89466368 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -202,13 +202,17 @@
             var self = this;
             var snipped_event_flag;
             $("#wrapwrap").on('click', function (event) {
-                if (snipped_event_flag) {
+                if (snipped_event_flag || !event.srcElement) {
                     return;
                 }
                 snipped_event_flag = true;
 
                 setTimeout(function () {snipped_event_flag = false;}, 0);
-                var $target = $(event.srcElement || event.target);
+                var $target = $(event.srcElement);
+
+                if ($target.parents(".oe_overlay").length) {
+                    return;
+                }
 
                 if (!$target.is(website.snippet.globalSelector)) {
                     $target = $target.parents(website.snippet.globalSelector).first();
@@ -1445,6 +1449,7 @@
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
             }
+            this.$overlay.find('[data-toggle="dropdown"]').dropdown();
         },
 
         get_parent_block: function () {
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 4a9769203ef..511876b116d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -22,7 +22,7 @@
 
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
-            <div class="oe_overlay_options">
+            <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
                     <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><i class="fa fa-upload"></i></a>
                     <div class="dropdown oe_options hidden btn-group">
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 000383a512c..f91bd969c70 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -922,17 +922,6 @@
         </li>
     </div>
 
-    <div data-snippet-option-id='carousel'
-        data-selector=".carousel">
-        <li class="divider"></li>
-        <li>
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li>
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
-    </div>
-
     <div data-snippet-option-id='carousel-style'
         data-selector="div[data-snippet-id='carousel']">
         <li class="dropdown-submenu" data-required="true">
@@ -945,6 +934,17 @@
         </li>
     </div>
 
+    <div data-snippet-option-id='carousel'
+        data-selector=".carousel">
+        <li class="divider"></li>
+        <li>
+            <a href="#" class="button js_add">Add Slide</a>
+        </li>
+        <li>
+            <a href="#" class="button js_remove">Remove Slide</a>
+        </li>
+    </div>
+
     <div data-snippet-option-id='margin-y'
         data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>

From ba63094b9b4cf8436b0a69944285ec94431da14b Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 14:20:13 +0100
Subject: [PATCH 064/175] [FIX] website_sale,website_event: can't create
 product and event. Why: controller and route are strict mode, remove / at the
 end of the route

bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
---
 addons/website_event/controllers/main.py | 2 +-
 addons/website_sale/controllers/main.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index af7f77d080f..eb38e2dbe55 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -187,7 +187,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event.event_description_full", values)
 
-    @http.route('/event/add_event/', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/event/add_event', type='http', auth="user", multilang=True, methods=['POST'], website=True)
     def add_event(self, event_name="New Event", **kwargs):
         return self._add_event(event_name, request.context, **kwargs)
 
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 129643f0029..d8a314ad609 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -321,7 +321,7 @@ class Ecommerce(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
     def add_product(self, name=None, category=0, **post):
         if not name:
             name = _("New Product")

From aa412d99ec8dcbd5f49a45c051adcd483da83e2c Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 15:22:58 +0100
Subject: [PATCH 065/175] [FIX] website tour: create a stub for bootstrap tour
 in automatic/test mode

bzr revid: chm@openerp.com-20140313142258-wblpqpwp9oubboc9
---
 addons/website/static/src/js/website.tour.js | 16 ++++++++++++++++
 addons/website_sale/tests/test_ui.py         |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index a17115d2184..61b8f851339 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -3,9 +3,22 @@
 
 var website = openerp.website;
 
+// don't need template to use bootstrap Tour in automatic mode
 if (typeof QWeb2 !== "undefined")
 website.add_template_file('/website/static/src/xml/website.tour.xml');
 
+// don't need to use bootstrap Tour to launch an automatic tour
+function bootstrap_tour_stub () {
+    if (typeof Tour === "undefined") {
+        window.Tour = function Tour() {};
+        Tour.prototype.addSteps = function () {};
+        Tour.prototype.end = function () {};
+        Tour.prototype.goto = function () {};
+    }
+}
+
+
+
 if (website.EditorBar)
 website.EditorBar.include({
     tours: [],
@@ -175,6 +188,9 @@ website.Tour = openerp.Class.extend({
     },
 
     registerTour: function () {
+        if (this.automatic) {
+            bootstrap_tour_stub();
+        }
         this.tour = new Tour({
             name: this.id,
             storage: this.tourStorage,
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index b024e405a1c..fcb84773036 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -14,7 +14,7 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
     def test_02_admin_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin", inject=inject)
 
     def test_03_demo_checkout(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)

From c4a6bb75ff07f87f22c4aecb23a28c0e77e61c12 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Mar 2014 18:54:27 +0100
Subject: [PATCH 066/175] [FIX] calendar: rename leftover crm.meeting into
 calendar.event forgotten during previous commit

bzr revid: chs@openerp.com-20140313175427-wbzt8innt0d874xy
---
 addons/calendar/test/calendar_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/test/calendar_test.yml b/addons/calendar/test/calendar_test.yml
index 484fee31720..25c7a0092b9 100644
--- a/addons/calendar/test/calendar_test.yml
+++ b/addons/calendar/test/calendar_test.yml
@@ -68,7 +68,7 @@
 -
   I create a recuring rule for my event
 -
-  !record {model: crm.meeting, id: crm_meeting_sprintreview1}:
+  !record {model: calendar.event, id: calendar.event_sprintreview1}:
     name: Begin of month meeting
     date: !eval time.strftime('%Y-%m-%d 12:00:00')
     recurrency: true
@@ -76,7 +76,7 @@
 -
   I check that the attributes are set correctly
 -
-  !assert {model: crm.meeting, id: crm_meeting_sprintreview1}:
+  !assert {model: calendar.event, id: calendar.event_sprintreview1}:
     - rrule_type == 'monthly'
     - count == 12
     - select1 == 'day'

From 477a87e2b1127011bd41b6c05342b9163638ddf6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 13 Mar 2014 19:20:04 +0100
Subject: [PATCH 067/175] [FIX] web: widget selection on many2one in search
 view is deprecated, it was used in some cases but it is now pointless as the
 basic many2one handle these cases

bzr revid: dle@openerp.com-20140313182004-symalqn8m9offm14
---
 addons/web/static/src/js/search.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b667d135bdd..ae5f1bfb958 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -677,6 +677,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      * @returns instance.web.search.Field
      */
     make_field: function (item, field, parent) {
+        // M2O combined with selection widget is pointless and broken in search views,
+        // but has been used in the past for unsupported hacks -> ignore it
+        if (field.type === "many2one" && item.attrs.widget === "selection"){
+            item.attrs.widget = undefined;
+        }
         var obj = instance.web.search.fields.get_any( [item.attrs.widget, field.type]);
         if(obj) {
             return new (obj) (item, field, parent || this);

From 808e55d25c6705677e08976b00e0b519b579eb25 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 13 Mar 2014 19:40:43 +0100
Subject: [PATCH 068/175] [FIX] Revert commit 9208 - Calendar is a module auto
 install. So we dont need to redirect

bzr revid: jke@openerp.com-20140313184043-8vy1252h3wpghx12
---
 addons/calendar/calendar_data.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index ff93a29a634..268c4b96bed 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data noupdate="1">
     
-        <!-- After installation of the module, open the related menu -->
-        <record id="action_client_calendar_menu" model="ir.actions.client">
-            <field name="name">Open Calendar</field>
-            <field name="tag">reload</field>
-            <field name="params" eval="{'menu_id': ref('calendar.mail_menu_calendar')}"/>
-        </record>
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_client_calendar_menu"/>
-            <field name="state">open</field>
-        </record>
-
          <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="calendar.subtype_invitation" model="mail.message.subtype">
             <field name="name">Invitation</field>

From 55ec0feba2df2bf097e9e37b6231adc793e8b933 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 13 Mar 2014 20:48:01 +0100
Subject: [PATCH 069/175] [IMP] Subscribe data

bzr revid: fp@tinyerp.com-20140313194801-24f5f9s03rk663d6
---
 addons/website_mail/__openerp__.py                   |  1 +
 addons/website_mail/data/mail_groups.xml             | 12 ++++++++++++
 .../static/src/js/website_mail.editor.js             |  2 +-
 addons/website_mail/views/snippets.xml               |  6 ------
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 addons/website_mail/data/mail_groups.xml

diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index 8642f46f388..ec10f2268ca 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -32,6 +32,7 @@
         'views/website_mail.xml',
         'views/website_email_designer.xml',
         'views/email_template_view.xml',
+        'data/mail_groups.xml',
         'security/website_mail.xml',
     ],
     'qweb': [
diff --git a/addons/website_mail/data/mail_groups.xml b/addons/website_mail/data/mail_groups.xml
new file mode 100644
index 00000000000..0bc8d3e81d1
--- /dev/null
+++ b/addons/website_mail/data/mail_groups.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="mail.group" id="group_all_employees">
+            <field name="name">Newsletter</field>
+            <field name="public">public</field>
+            <field name="description">Public Newsletter.</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index bef6eedfef4..7a26920682b 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -9,7 +9,7 @@
             var self = this;
             return website.prompt({
                 id: "editor_new_subscribe_button",
-                window_title: _t("New Subscribe Button"),
+                window_title: _t("Add a Subscribe Button"),
                 select: _t("Mailing List"),
                 init: function (field) {
                     return website.session.model('mail.group')
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 23c2046ecff..75202fe99fd 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -478,18 +478,12 @@
             </table>
         </div>
     </div>
-
 </div>
 
-
 <div id="snippet_options" class="hidden">
-
     <t t-call="website.snippet_options"/>
-
 </div>
 
-
-
         </div>
     </div>
 

From 337b879e5135b57deb1bedcbfb971b449f63233b Mon Sep 17 00:00:00 2001
From: Amit Dodiya <ado@tinyerp.com>
Date: Fri, 14 Mar 2014 11:46:25 +0530
Subject: [PATCH 070/175] [FIX] project: users are able to create tasks on
 closed project which should not be allowed

bzr revid: ado@tinyerp.com-20140314061625-awngp5ndcu0lnjqq
---
 addons/project/project.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/project/project.py b/addons/project/project.py
index d7bc7113818..20718f5080c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -575,6 +575,15 @@ def Project():
             model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', vals.get('alias_model', 'project.task'))])
             vals.update(alias_model_id=model_ids[0])
         return super(project, self).write(cr, uid, ids, vals, context=context)
+    
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, uid, [('state', '!=', 'close'), ('name', operator, name)] + args, limit=limit, context=context)
+        return self.name_get(cr, uid, ids, context or {})
+
 
 class task(base_stage, osv.osv):
     _name = "project.task"
@@ -1125,6 +1134,10 @@ class task(base_stage, osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
+        if vals.get('project_id'):
+            project_record = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
+            if project_record.state == 'close':
+                raise osv.except_osv(_('Warning !'), _('You can not create tasks on closed project.'))
         if vals.get('project_id') and not context.get('default_project_id'):
             context['default_project_id'] = vals.get('project_id')
 

From 9bc57fdc08660ae426e0d5910af58ae3cbe432cb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 14 Mar 2014 06:36:54 +0000
Subject: [PATCH 071/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140314063654-damk0l1vy2i2bk34
---
 addons/l10n_be_invoice_bba/i18n/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
index f821806edcd..922af835626 100644
--- a/addons/l10n_be_invoice_bba/i18n/zh_CN.po
+++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.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-03-13 06:16+0000\n"
+"X-Launchpad-Export-Date: 2014-03-14 06:36+0000\n"
 "X-Generator: Launchpad (build 16963)\n"
 
 #. module: l10n_be_invoice_bba

From 51a0bb001bc496718c30e34701c82964ccb0cdc8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 12:35:10 +0100
Subject: [PATCH 072/175] [IMP] website snippet: add onfocus, onblur, onclone
 and onremove on snippet options; fix banner id

bzr revid: chm@openerp.com-20140314113510-dqj70i85z41q5j0k
---
 .../static/src/js/website.snippets.editor.js  | 76 +++++++++++++++----
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 8ff89466368..1fddc7b869b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -419,7 +419,7 @@
                                 $target.data("overlay").remove();
                                 $target.removeData("overlay");
                             }
-                            $target.find("[data-snippet-id]").each(function () {
+                            $target.find(website.snippet.globalSelector).each(function () {
                                 var $snippet = $(this);
                                 $snippet.removeData("snippet-editor");
                                 if ($snippet.data("overlay")) {
@@ -676,6 +676,30 @@
         // start is call just after the init
         start: function () {
         },
+        /* onFocus
+        *  This method is called when the user click inside the snippet in the dom
+        */
+        onFocus : function () {
+        },
+
+        /* onFocus
+        *  This method is called when the user click outside the snippet in the dom, after a focus
+        */
+        onBlur : function () {
+        },
+
+        /* on_clone
+        *  This method is called when the snippet is cloned ($clone is allready inserted)
+        */
+        on_clone: function ($clone) {
+        },
+
+        /* on_remove
+        *  This method is called when the snippet is removed (dom is removing after this call)
+        */
+        on_remove: function () {
+        },
+
         /*
         *  drop_and_build_snippet
         *  This method is called just after that a thumbnail is drag and dropped into a drop zone
@@ -806,23 +830,36 @@
     });
 
     website.snippet.options.slider = website.snippet.Option.extend({
+        unique_id: function () {
+            var id = 0;
+            $(".carousel").each(function () {
+                var cid = 1 + parseInt($(this).attr("id").replace(/[^0123456789]/g, ''),10);
+                if (id < cid) id = cid;
+            });
+            return "myCarousel" + id;
+        },
         drop_and_build_snippet: function() {
-            var id = $(".carousel").length;
-            this.id = "myCarousel" + id;
+            this.id = this.unique_id();
             this.$target.attr("id", this.id);
-            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
-            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
+            this.$target.find("[data-slide]").attr("href", "#" + this.id);
+            this.$target.find("[data-slide-to]").attr("data-target", "#" + this.id);
 
             this.rebind_event();
         },
+        on_clone: function ($clone) {
+            var id = this.unique_id();
+            $clone.attr("id", id);
+            $clone.find("[data-slide]").attr("href", "#" + id);
+            $clone.find("[data-slide-to]").attr("data-target", "#" + id);
+        },
         // rebind event to active carousel on edit mode
         rebind_event: function () {
             var self = this;
-            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
+            this.$target.find('.carousel-indicators [data-slide-to]').off('click').on('click', function () {
                 self.$target.carousel(+$(this).data('slide-to')); });
 
             this.$target.attr('contentEditable', 'false');
-            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
+            this.$target.find('.oe_structure, .content>.row, [data-slide]').attr('contentEditable', 'true');
         },
         clean_for_save: function () {
             this._super();
@@ -1187,25 +1224,22 @@
             this._super();
         },
         hide_remove_button: function() {
-            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden",
-                !this.$target.siblings().length && this.$target.parents("[data-snippet-id]:first").find("[data-snippet-id='colmd']").length > 1);
+            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
         },
         onFocus : function () {
             this._super();
             this.hide_remove_button();
         },
-        on_clone: function () {
-            var $clone = this.$target.clone(false);
+        on_clone: function ($clone) {
             var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
             $clone.attr("class", _class);
-            this.$target.after($clone);
             this.hide_remove_button();
             return false;
         },
         on_remove: function () {
             if (!this.$target.siblings().length) {
-                var $parent = this.$target.parents("[data-snippet-id]:first");
-                if($parent.find("[data-snippet-id='colmd']").length > 1) {
+                var $parent = this.$target.parents(".row:first");
+                if($parent.find("[class*='col-md']").length > 1) {
                     return false;
                 } else {
                     if (!$parent.data("snippet-editor")) {
@@ -1455,7 +1489,7 @@
         get_parent_block: function () {
             var self = this;
             var $button = this.$overlay.find('.oe_snippet_parent');
-            var $parent = this.$target.parents("[data-snippet-id]:first");
+            var $parent = this.$target.parents(website.snippet.globalSelector).first();
             if ($parent.length) {
                 $button.removeClass("hidden");
                 $button.off("click").on('click', function (event) {
@@ -1483,12 +1517,18 @@
         on_clone: function () {
             var $clone = this.$target.clone(false);
             this.$target.after($clone);
+            for (var i in this.styles){
+                this.styles[i].on_clone($clone);
+            }
             return false;
         },
 
         on_remove: function () {
             this.onBlur();
             var index = _.indexOf(this.BuildingBlock.snippets, this.$target.get(0));
+            for (var i in this.styles){
+                this.styles[i].on_remove();
+            }
             delete this.BuildingBlock.snippets[index];
             this.$target.remove();
             this.$overlay.remove();
@@ -1511,12 +1551,18 @@
         */
         onFocus : function () {
             this.$overlay.addClass('oe_active');
+            for (var i in this.styles){
+                this.styles[i].onFocus();
+            }
         },
 
         /* onFocus
         *  This method is called when the user click outside the snippet in the dom, after a focus
         */
         onBlur : function () {
+            for (var i in this.styles){
+                this.styles[i].onBlur();
+            }
             this.$overlay.removeClass('oe_active');
         },
 

From 5af434260fa6b57c3e80dffe48f101dda2fa42be Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 14 Mar 2014 12:39:55 +0100
Subject: [PATCH 073/175] [FIX] calendar: correct test: select1 field has been
 renamed

bzr revid: chs@openerp.com-20140314113955-acyplukwyu2f7142
---
 addons/calendar/test/calendar_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/test/calendar_test.yml b/addons/calendar/test/calendar_test.yml
index 25c7a0092b9..44290d8166f 100644
--- a/addons/calendar/test/calendar_test.yml
+++ b/addons/calendar/test/calendar_test.yml
@@ -79,6 +79,6 @@
   !assert {model: calendar.event, id: calendar.event_sprintreview1}:
     - rrule_type == 'monthly'
     - count == 12
-    - select1 == 'day'
+    - month_by == 'day'
     - byday == '1'
     - week_list == 'MO'

From 8b94f855b69628937b1a9d45e5d3cf17d48b41ae Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 14:46:42 +0100
Subject: [PATCH 074/175] [FIX] website theme css

bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
---
 .../static/src/css/bootswatch/cyborg.fix.css   | 18 ++++++++++++++++++
 .../static/src/css/bootswatch/simplex.fix.css  |  3 +++
 .../static/src/css/bootswatch/slate.fix.css    |  7 +++++++
 .../static/src/css/bootswatch/yeti.fix.css     |  3 +++
 addons/website/views/themes.xml                |  1 +
 5 files changed, 32 insertions(+)

diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
index 43c8e5770f9..e93b2aa8ded 100644
--- a/addons/website/static/src/css/bootswatch/cyborg.fix.css
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -9,4 +9,22 @@ ul.wizard li {
 }
 ul.wizard .chevron:before {
     border-left: 10px solid #222 !important;
+}
+.popover, .modal-content {
+    border: 1px solid rgba(200,200,200,0.5);
+}
+.close {
+    color: #fff;
+}
+.popover.bottom .arrow:after {
+    border-bottom-color: #333;
+}
+.popover.top .arrow:after {
+    border-top-color: #333;
+}
+.popover.left .arrow:after {
+    border-left-color: #333;
+}
+.popover.right .arrow:after {
+    border-right-color: #333;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index c87f0de237b..5d1df525449 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.fa {
+    font-family: FontAwesome !important;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
index a61f8d98338..c2e1a999b03 100644
--- a/addons/website/static/src/css/bootswatch/slate.fix.css
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -12,3 +12,10 @@ ul.wizard .chevron:before {
 ul.wizard li.text-primary {
     color: #fff;
 }
+.close {
+    color: #fff;
+}
+.popover  {
+    -webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+    box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index c87f0de237b..a2835886465 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.popover .close {
+    color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 1b1cf1fe4d3..82f5105adcd 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -268,6 +268,7 @@
     <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 

From 62f0b963afb10ad51c8959b1ef8996f7ffb57f18 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:19:10 +0100
Subject: [PATCH 075/175] [ADD] missing css file

bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
---
 addons/website/static/src/css/bootswatch/spacelab.fix.css | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 addons/website/static/src/css/bootswatch/spacelab.fix.css

diff --git a/addons/website/static/src/css/bootswatch/spacelab.fix.css b/addons/website/static/src/css/bootswatch/spacelab.fix.css
new file mode 100644
index 00000000000..6d01e9a2485
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/spacelab.fix.css
@@ -0,0 +1,8 @@
+.carousel .carousel-caption.content,
+.carousel .carousel-caption.content h1,
+.carousel .carousel-caption.content h2,
+.carousel .carousel-caption.content h3,
+.carousel .carousel-caption.content h4,
+.carousel .carousel-caption.content h5 {
+    color: #ccc;
+}
\ No newline at end of file

From 10af6ef1689b4cccf05d0a35cda10bb7f7d3437d Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:22:44 +0100
Subject: [PATCH 076/175] [rev] website: remove js fix from this branch

bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 0607691ccaa..ee07840b12d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1436,7 +1436,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-image, .carousel-inner .content > div').attr('contentEditable', 'true');
+            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
             this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },

From 8820d9f1886868bb4b874e96185535ebd9a6c35d Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 15:30:49 +0100
Subject: [PATCH 077/175] [FIX] website: can't edit baner image. Add
 contentEditable on image tag.

bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ee07840b12d..0607691ccaa 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1436,7 +1436,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image, .carousel-inner .content > div').attr('contentEditable', 'true');
             this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },

From 264186541b44d3fe4ec15aa4bc155e24d3e56179 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 16:04:46 +0100
Subject: [PATCH 078/175] [IMP] website: remove css .fa and write important in
 font fa in web branch

bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
---
 addons/website/static/src/css/bootswatch/simplex.fix.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index 5d1df525449..c87f0de237b 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,6 +1,3 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
-}
-.fa {
-    font-family: FontAwesome !important;
 }
\ No newline at end of file

From b220dc926ef6e317aca7899b15c8f1a2a40ed9bd Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 17:36:39 +0100
Subject: [PATCH 079/175] [FIX] website: can't see edit button because css with
 overflow hidden for all tag. Aplly css only on carousel, paralax and
 blockquote

bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
---
 addons/website/static/src/css/website.css  | 2 ++
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 310f6b8156e..a6e4c3eb916 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -283,6 +283,8 @@ ul.nav-stacked > li > a {
 
 section, .carousel, .parallax, .row, .hr, .blockquote {
   min-height: 30px;
+}
+.carousel, .parallax, .blockquote {
   overflow: hidden;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 563dcae95ec..d6fbd0ac7bf 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -233,6 +233,7 @@ ul.nav-stacked > li > a
 
 section, .carousel, .parallax, .row, .hr, .blockquote
     min-height: 30px
+.carousel, .parallax, .blockquote
     overflow: hidden
 
 @media (max-width: 400px)

From b9ff076c73f4ca8621569306d44bd1f877e5a987 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 17:42:44 +0100
Subject: [PATCH 080/175] [FIX] css: add important in .fa class for FontAwesome
 font. The font can't be overwrited by themes and custom css without important
 arguments

bzr revid: chm@openerp.com-20140314164244-siih3eo271govt27
---
 addons/web/static/lib/fontawesome/css/font-awesome.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css
index 048cff97398..7fa0e6f467b 100644
--- a/addons/web/static/lib/fontawesome/css/font-awesome.css
+++ b/addons/web/static/lib/fontawesome/css/font-awesome.css
@@ -13,7 +13,7 @@
 }
 .fa {
   display: inline-block;
-  font-family: FontAwesome;
+  font-family: FontAwesome !important;
   font-style: normal;
   font-weight: normal;
   line-height: 1;

From 7c8e468dee28aacd19c6a0a3299f7d8788caf09e Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Fri, 14 Mar 2014 17:56:41 +0100
Subject: [PATCH 081/175] [FIX] Convert offset aware into offset naive before
 to use timedelta. That remove traceback when we try to get notification
 (notif or mail) for a recurrent event

bzr revid: jke@openerp.com-20140314165641-6bwyxe3wej4upqzh
---
 addons/calendar/calendar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index adb0ef784d5..3dc1fa75b8d 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -456,7 +456,7 @@ class calendar_alarm_manager(osv.AbstractModel):
                 bFound = False
                 LastFound = False
                 for one_date in self.pool.get('calendar.event').get_recurrent_date_by_event(cr, uid, curEvent, context=context):
-                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S')
+                    in_date_format = one_date.replace(tzinfo=None)
                     LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, cron_interval, notif=False, context=context)
                     if LastFound:
                         for alert in LastFound:
@@ -490,7 +490,7 @@ class calendar_alarm_manager(osv.AbstractModel):
                 bFound = False
                 LastFound = False
                 for one_date in self.pool.get("calendar.event").get_recurrent_date_by_event(cr, uid, curEvent, context=context):
-                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S')
+                    in_date_format = one_date.replace(tzinfo=None)
                     LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, ajax_check_every_seconds, after=partner.calendar_last_notif_ack, mail=False, context=context)
                     if LastFound:
                         for alert in LastFound:

From 948799e259653a9e070b7e13409ab4d2ac1ff826 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 16 Mar 2014 05:42:24 +0000
Subject: [PATCH 082/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
---
 addons/project/i18n/zh_CN.po         | 16 ++++++++--------
 addons/sale/i18n/zh_CN.po            | 18 ++++++++++--------
 addons/web/i18n/ar.po                |  4 ++--
 addons/web/i18n/bg.po                |  4 ++--
 addons/web/i18n/bn.po                |  4 ++--
 addons/web/i18n/bs.po                |  4 ++--
 addons/web/i18n/ca.po                |  4 ++--
 addons/web/i18n/cs.po                |  6 +++---
 addons/web/i18n/da.po                |  4 ++--
 addons/web/i18n/de.po                |  4 ++--
 addons/web/i18n/en_AU.po             |  4 ++--
 addons/web/i18n/en_GB.po             |  4 ++--
 addons/web/i18n/es.po                |  4 ++--
 addons/web/i18n/es_CL.po             |  4 ++--
 addons/web/i18n/es_CR.po             |  4 ++--
 addons/web/i18n/es_DO.po             |  4 ++--
 addons/web/i18n/es_EC.po             |  4 ++--
 addons/web/i18n/es_MX.po             |  4 ++--
 addons/web/i18n/es_PE.po             |  4 ++--
 addons/web/i18n/et.po                |  4 ++--
 addons/web/i18n/eu.po                |  4 ++--
 addons/web/i18n/fa.po                |  4 ++--
 addons/web/i18n/fi.po                |  4 ++--
 addons/web/i18n/fr.po                |  4 ++--
 addons/web/i18n/fr_CA.po             |  4 ++--
 addons/web/i18n/gl.po                |  4 ++--
 addons/web/i18n/gu.po                |  4 ++--
 addons/web/i18n/he.po                |  4 ++--
 addons/web/i18n/hi.po                |  4 ++--
 addons/web/i18n/hr.po                |  4 ++--
 addons/web/i18n/hu.po                |  4 ++--
 addons/web/i18n/id.po                |  4 ++--
 addons/web/i18n/it.po                |  4 ++--
 addons/web/i18n/ja.po                |  4 ++--
 addons/web/i18n/ka.po                |  4 ++--
 addons/web/i18n/ko.po                |  4 ++--
 addons/web/i18n/lo.po                |  4 ++--
 addons/web/i18n/lt.po                |  4 ++--
 addons/web/i18n/lv.po                |  4 ++--
 addons/web/i18n/mk.po                |  4 ++--
 addons/web/i18n/mn.po                |  4 ++--
 addons/web/i18n/nb.po                |  4 ++--
 addons/web/i18n/nl.po                |  4 ++--
 addons/web/i18n/nl_BE.po             |  4 ++--
 addons/web/i18n/pl.po                |  4 ++--
 addons/web/i18n/pt.po                |  4 ++--
 addons/web/i18n/pt_BR.po             |  4 ++--
 addons/web/i18n/ro.po                |  4 ++--
 addons/web/i18n/ru.po                |  4 ++--
 addons/web/i18n/sk.po                |  4 ++--
 addons/web/i18n/sl.po                |  4 ++--
 addons/web/i18n/sq.po                |  4 ++--
 addons/web/i18n/sr@latin.po          |  4 ++--
 addons/web/i18n/sv.po                |  4 ++--
 addons/web/i18n/th.po                |  6 +++---
 addons/web/i18n/tr.po                |  4 ++--
 addons/web/i18n/uk.po                |  4 ++--
 addons/web/i18n/vi.po                |  4 ++--
 addons/web/i18n/zh_CN.po             |  4 ++--
 addons/web/i18n/zh_TW.po             |  4 ++--
 addons/web_calendar/i18n/ar.po       |  4 ++--
 addons/web_calendar/i18n/bg.po       |  4 ++--
 addons/web_calendar/i18n/bn.po       |  4 ++--
 addons/web_calendar/i18n/bs.po       |  4 ++--
 addons/web_calendar/i18n/ca.po       |  4 ++--
 addons/web_calendar/i18n/cs.po       |  4 ++--
 addons/web_calendar/i18n/da.po       |  4 ++--
 addons/web_calendar/i18n/de.po       |  4 ++--
 addons/web_calendar/i18n/en_AU.po    |  4 ++--
 addons/web_calendar/i18n/en_GB.po    |  4 ++--
 addons/web_calendar/i18n/es.po       |  4 ++--
 addons/web_calendar/i18n/es_CL.po    |  4 ++--
 addons/web_calendar/i18n/es_CR.po    |  4 ++--
 addons/web_calendar/i18n/es_DO.po    |  4 ++--
 addons/web_calendar/i18n/es_EC.po    |  4 ++--
 addons/web_calendar/i18n/es_MX.po    |  4 ++--
 addons/web_calendar/i18n/es_PE.po    |  4 ++--
 addons/web_calendar/i18n/et.po       |  4 ++--
 addons/web_calendar/i18n/eu.po       |  4 ++--
 addons/web_calendar/i18n/fa.po       |  4 ++--
 addons/web_calendar/i18n/fi.po       |  4 ++--
 addons/web_calendar/i18n/fr.po       |  4 ++--
 addons/web_calendar/i18n/fr_CA.po    |  4 ++--
 addons/web_calendar/i18n/gl.po       |  4 ++--
 addons/web_calendar/i18n/gu.po       |  4 ++--
 addons/web_calendar/i18n/hr.po       |  4 ++--
 addons/web_calendar/i18n/hu.po       |  4 ++--
 addons/web_calendar/i18n/id.po       |  4 ++--
 addons/web_calendar/i18n/it.po       |  4 ++--
 addons/web_calendar/i18n/ja.po       |  4 ++--
 addons/web_calendar/i18n/ka.po       |  4 ++--
 addons/web_calendar/i18n/ko.po       |  4 ++--
 addons/web_calendar/i18n/lt.po       |  4 ++--
 addons/web_calendar/i18n/mk.po       |  4 ++--
 addons/web_calendar/i18n/mn.po       |  4 ++--
 addons/web_calendar/i18n/nb.po       |  4 ++--
 addons/web_calendar/i18n/nl.po       |  4 ++--
 addons/web_calendar/i18n/nl_BE.po    |  4 ++--
 addons/web_calendar/i18n/pl.po       |  4 ++--
 addons/web_calendar/i18n/pt.po       |  4 ++--
 addons/web_calendar/i18n/pt_BR.po    |  4 ++--
 addons/web_calendar/i18n/ro.po       |  4 ++--
 addons/web_calendar/i18n/ru.po       |  4 ++--
 addons/web_calendar/i18n/sk.po       |  4 ++--
 addons/web_calendar/i18n/sl.po       |  4 ++--
 addons/web_calendar/i18n/sq.po       |  4 ++--
 addons/web_calendar/i18n/sr@latin.po |  4 ++--
 addons/web_calendar/i18n/sv.po       |  4 ++--
 addons/web_calendar/i18n/th.po       |  4 ++--
 addons/web_calendar/i18n/tr.po       |  4 ++--
 addons/web_calendar/i18n/uk.po       |  4 ++--
 addons/web_calendar/i18n/zh_CN.po    |  4 ++--
 addons/web_calendar/i18n/zh_TW.po    |  4 ++--
 addons/web_diagram/i18n/ar.po        |  4 ++--
 addons/web_diagram/i18n/bg.po        |  4 ++--
 addons/web_diagram/i18n/bn.po        |  4 ++--
 addons/web_diagram/i18n/bs.po        |  4 ++--
 addons/web_diagram/i18n/ca.po        |  4 ++--
 addons/web_diagram/i18n/cs.po        |  4 ++--
 addons/web_diagram/i18n/da.po        |  4 ++--
 addons/web_diagram/i18n/de.po        |  4 ++--
 addons/web_diagram/i18n/en_AU.po     |  4 ++--
 addons/web_diagram/i18n/en_GB.po     |  4 ++--
 addons/web_diagram/i18n/es.po        |  4 ++--
 addons/web_diagram/i18n/es_CL.po     |  4 ++--
 addons/web_diagram/i18n/es_CR.po     |  4 ++--
 addons/web_diagram/i18n/es_DO.po     |  4 ++--
 addons/web_diagram/i18n/es_EC.po     |  4 ++--
 addons/web_diagram/i18n/es_MX.po     |  4 ++--
 addons/web_diagram/i18n/es_PE.po     |  4 ++--
 addons/web_diagram/i18n/et.po        |  4 ++--
 addons/web_diagram/i18n/fa.po        |  4 ++--
 addons/web_diagram/i18n/fi.po        |  4 ++--
 addons/web_diagram/i18n/fr.po        |  4 ++--
 addons/web_diagram/i18n/gl.po        |  4 ++--
 addons/web_diagram/i18n/gu.po        |  4 ++--
 addons/web_diagram/i18n/hr.po        |  4 ++--
 addons/web_diagram/i18n/hu.po        |  4 ++--
 addons/web_diagram/i18n/id.po        |  4 ++--
 addons/web_diagram/i18n/it.po        |  4 ++--
 addons/web_diagram/i18n/ja.po        |  4 ++--
 addons/web_diagram/i18n/ka.po        |  4 ++--
 addons/web_diagram/i18n/ko.po        |  4 ++--
 addons/web_diagram/i18n/lt.po        |  4 ++--
 addons/web_diagram/i18n/mk.po        |  4 ++--
 addons/web_diagram/i18n/mn.po        |  4 ++--
 addons/web_diagram/i18n/nb.po        |  4 ++--
 addons/web_diagram/i18n/nl.po        |  4 ++--
 addons/web_diagram/i18n/nl_BE.po     |  4 ++--
 addons/web_diagram/i18n/pl.po        |  4 ++--
 addons/web_diagram/i18n/pt.po        |  4 ++--
 addons/web_diagram/i18n/pt_BR.po     |  4 ++--
 addons/web_diagram/i18n/ro.po        |  4 ++--
 addons/web_diagram/i18n/ru.po        |  4 ++--
 addons/web_diagram/i18n/sl.po        |  4 ++--
 addons/web_diagram/i18n/sq.po        |  4 ++--
 addons/web_diagram/i18n/sr@latin.po  |  4 ++--
 addons/web_diagram/i18n/sv.po        |  4 ++--
 addons/web_diagram/i18n/th.po        |  4 ++--
 addons/web_diagram/i18n/tr.po        |  4 ++--
 addons/web_diagram/i18n/zh_CN.po     |  4 ++--
 addons/web_diagram/i18n/zh_TW.po     |  4 ++--
 addons/web_gantt/i18n/ar.po          |  4 ++--
 addons/web_gantt/i18n/bg.po          |  4 ++--
 addons/web_gantt/i18n/bn.po          |  4 ++--
 addons/web_gantt/i18n/bs.po          |  4 ++--
 addons/web_gantt/i18n/ca.po          |  4 ++--
 addons/web_gantt/i18n/cs.po          |  4 ++--
 addons/web_gantt/i18n/da.po          |  4 ++--
 addons/web_gantt/i18n/de.po          |  4 ++--
 addons/web_gantt/i18n/en_AU.po       |  4 ++--
 addons/web_gantt/i18n/en_GB.po       |  4 ++--
 addons/web_gantt/i18n/es.po          |  4 ++--
 addons/web_gantt/i18n/es_CL.po       |  4 ++--
 addons/web_gantt/i18n/es_CR.po       |  4 ++--
 addons/web_gantt/i18n/es_DO.po       |  4 ++--
 addons/web_gantt/i18n/es_EC.po       |  4 ++--
 addons/web_gantt/i18n/es_MX.po       |  4 ++--
 addons/web_gantt/i18n/et.po          |  4 ++--
 addons/web_gantt/i18n/fa.po          |  4 ++--
 addons/web_gantt/i18n/fi.po          |  4 ++--
 addons/web_gantt/i18n/fr.po          |  4 ++--
 addons/web_gantt/i18n/gl.po          |  4 ++--
 addons/web_gantt/i18n/gu.po          |  4 ++--
 addons/web_gantt/i18n/he.po          |  4 ++--
 addons/web_gantt/i18n/hr.po          |  4 ++--
 addons/web_gantt/i18n/hu.po          |  4 ++--
 addons/web_gantt/i18n/it.po          |  4 ++--
 addons/web_gantt/i18n/ja.po          |  4 ++--
 addons/web_gantt/i18n/ka.po          |  4 ++--
 addons/web_gantt/i18n/ko.po          |  4 ++--
 addons/web_gantt/i18n/lo.po          |  4 ++--
 addons/web_gantt/i18n/lt.po          |  4 ++--
 addons/web_gantt/i18n/mk.po          |  4 ++--
 addons/web_gantt/i18n/mn.po          |  4 ++--
 addons/web_gantt/i18n/nb.po          |  4 ++--
 addons/web_gantt/i18n/nl.po          |  4 ++--
 addons/web_gantt/i18n/nl_BE.po       |  4 ++--
 addons/web_gantt/i18n/pl.po          |  4 ++--
 addons/web_gantt/i18n/pt.po          |  4 ++--
 addons/web_gantt/i18n/pt_BR.po       |  4 ++--
 addons/web_gantt/i18n/ro.po          |  4 ++--
 addons/web_gantt/i18n/ru.po          |  4 ++--
 addons/web_gantt/i18n/sl.po          |  4 ++--
 addons/web_gantt/i18n/sq.po          |  4 ++--
 addons/web_gantt/i18n/sr@latin.po    |  4 ++--
 addons/web_gantt/i18n/sv.po          |  4 ++--
 addons/web_gantt/i18n/th.po          |  4 ++--
 addons/web_gantt/i18n/tr.po          |  4 ++--
 addons/web_gantt/i18n/zh_CN.po       |  4 ++--
 addons/web_graph/i18n/ar.po          |  4 ++--
 addons/web_graph/i18n/bg.po          |  4 ++--
 addons/web_graph/i18n/bn.po          |  4 ++--
 addons/web_graph/i18n/bs.po          |  4 ++--
 addons/web_graph/i18n/ca.po          |  4 ++--
 addons/web_graph/i18n/cs.po          |  4 ++--
 addons/web_graph/i18n/da.po          |  4 ++--
 addons/web_graph/i18n/de.po          |  4 ++--
 addons/web_graph/i18n/en_AU.po       |  4 ++--
 addons/web_graph/i18n/en_GB.po       |  4 ++--
 addons/web_graph/i18n/es.po          |  4 ++--
 addons/web_graph/i18n/es_CL.po       |  4 ++--
 addons/web_graph/i18n/es_CR.po       |  4 ++--
 addons/web_graph/i18n/es_DO.po       |  4 ++--
 addons/web_graph/i18n/es_EC.po       |  4 ++--
 addons/web_graph/i18n/es_MX.po       |  4 ++--
 addons/web_graph/i18n/et.po          |  4 ++--
 addons/web_graph/i18n/fa.po          |  4 ++--
 addons/web_graph/i18n/fi.po          |  4 ++--
 addons/web_graph/i18n/fr.po          |  4 ++--
 addons/web_graph/i18n/fr_CA.po       |  4 ++--
 addons/web_graph/i18n/gl.po          |  4 ++--
 addons/web_graph/i18n/gu.po          |  4 ++--
 addons/web_graph/i18n/he.po          |  4 ++--
 addons/web_graph/i18n/hr.po          |  4 ++--
 addons/web_graph/i18n/hu.po          |  4 ++--
 addons/web_graph/i18n/it.po          |  4 ++--
 addons/web_graph/i18n/ja.po          |  4 ++--
 addons/web_graph/i18n/ka.po          |  4 ++--
 addons/web_graph/i18n/ko.po          |  4 ++--
 addons/web_graph/i18n/lt.po          |  4 ++--
 addons/web_graph/i18n/mk.po          |  4 ++--
 addons/web_graph/i18n/mn.po          |  4 ++--
 addons/web_graph/i18n/nb.po          |  4 ++--
 addons/web_graph/i18n/nl.po          |  4 ++--
 addons/web_graph/i18n/nl_BE.po       |  4 ++--
 addons/web_graph/i18n/pl.po          |  4 ++--
 addons/web_graph/i18n/pt.po          |  4 ++--
 addons/web_graph/i18n/pt_BR.po       |  4 ++--
 addons/web_graph/i18n/ro.po          |  4 ++--
 addons/web_graph/i18n/ru.po          |  4 ++--
 addons/web_graph/i18n/sl.po          |  4 ++--
 addons/web_graph/i18n/sq.po          |  4 ++--
 addons/web_graph/i18n/sr@latin.po    |  4 ++--
 addons/web_graph/i18n/sv.po          |  4 ++--
 addons/web_graph/i18n/th.po          |  4 ++--
 addons/web_graph/i18n/tr.po          |  4 ++--
 addons/web_graph/i18n/zh_CN.po       |  4 ++--
 addons/web_kanban/i18n/ar.po         |  4 ++--
 addons/web_kanban/i18n/bg.po         |  4 ++--
 addons/web_kanban/i18n/bn.po         |  4 ++--
 addons/web_kanban/i18n/bs.po         |  4 ++--
 addons/web_kanban/i18n/ca.po         |  4 ++--
 addons/web_kanban/i18n/cs.po         |  4 ++--
 addons/web_kanban/i18n/da.po         |  4 ++--
 addons/web_kanban/i18n/de.po         |  4 ++--
 addons/web_kanban/i18n/en_AU.po      |  4 ++--
 addons/web_kanban/i18n/en_GB.po      |  4 ++--
 addons/web_kanban/i18n/es.po         |  4 ++--
 addons/web_kanban/i18n/es_CL.po      |  4 ++--
 addons/web_kanban/i18n/es_CR.po      |  4 ++--
 addons/web_kanban/i18n/es_DO.po      |  4 ++--
 addons/web_kanban/i18n/es_EC.po      |  4 ++--
 addons/web_kanban/i18n/es_MX.po      |  4 ++--
 addons/web_kanban/i18n/et.po         |  4 ++--
 addons/web_kanban/i18n/fa.po         |  4 ++--
 addons/web_kanban/i18n/fi.po         |  4 ++--
 addons/web_kanban/i18n/fr.po         |  4 ++--
 addons/web_kanban/i18n/fr_CA.po      |  4 ++--
 addons/web_kanban/i18n/gl.po         |  4 ++--
 addons/web_kanban/i18n/gu.po         |  4 ++--
 addons/web_kanban/i18n/he.po         |  4 ++--
 addons/web_kanban/i18n/hr.po         |  4 ++--
 addons/web_kanban/i18n/hu.po         |  4 ++--
 addons/web_kanban/i18n/it.po         |  4 ++--
 addons/web_kanban/i18n/ja.po         |  4 ++--
 addons/web_kanban/i18n/ka.po         |  4 ++--
 addons/web_kanban/i18n/ko.po         |  4 ++--
 addons/web_kanban/i18n/lt.po         |  4 ++--
 addons/web_kanban/i18n/mk.po         |  4 ++--
 addons/web_kanban/i18n/mn.po         |  4 ++--
 addons/web_kanban/i18n/nb.po         |  4 ++--
 addons/web_kanban/i18n/nl.po         |  4 ++--
 addons/web_kanban/i18n/nl_BE.po      |  4 ++--
 addons/web_kanban/i18n/pl.po         |  4 ++--
 addons/web_kanban/i18n/pt.po         |  4 ++--
 addons/web_kanban/i18n/pt_BR.po      |  4 ++--
 addons/web_kanban/i18n/ro.po         |  4 ++--
 addons/web_kanban/i18n/ru.po         |  4 ++--
 addons/web_kanban/i18n/sl.po         |  4 ++--
 addons/web_kanban/i18n/sr@latin.po   |  4 ++--
 addons/web_kanban/i18n/sv.po         |  4 ++--
 addons/web_kanban/i18n/th.po         |  4 ++--
 addons/web_kanban/i18n/tr.po         |  4 ++--
 addons/web_kanban/i18n/zh_CN.po      |  4 ++--
 addons/web_kanban/i18n/zh_TW.po      |  4 ++--
 addons/web_view_editor/i18n/ar.po    |  4 ++--
 addons/web_view_editor/i18n/bs.po    |  4 ++--
 addons/web_view_editor/i18n/cs.po    |  4 ++--
 addons/web_view_editor/i18n/da.po    |  4 ++--
 addons/web_view_editor/i18n/de.po    |  4 ++--
 addons/web_view_editor/i18n/en_AU.po |  4 ++--
 addons/web_view_editor/i18n/en_GB.po |  4 ++--
 addons/web_view_editor/i18n/es.po    |  4 ++--
 addons/web_view_editor/i18n/es_DO.po |  4 ++--
 addons/web_view_editor/i18n/es_EC.po |  4 ++--
 addons/web_view_editor/i18n/es_MX.po |  4 ++--
 addons/web_view_editor/i18n/et.po    |  4 ++--
 addons/web_view_editor/i18n/fa.po    |  4 ++--
 addons/web_view_editor/i18n/fi.po    |  4 ++--
 addons/web_view_editor/i18n/fr.po    |  4 ++--
 addons/web_view_editor/i18n/he.po    |  4 ++--
 addons/web_view_editor/i18n/hr.po    |  4 ++--
 addons/web_view_editor/i18n/hu.po    |  4 ++--
 addons/web_view_editor/i18n/it.po    |  4 ++--
 addons/web_view_editor/i18n/ko.po    |  4 ++--
 addons/web_view_editor/i18n/lt.po    |  4 ++--
 addons/web_view_editor/i18n/lv.po    |  4 ++--
 addons/web_view_editor/i18n/mk.po    |  4 ++--
 addons/web_view_editor/i18n/mn.po    |  4 ++--
 addons/web_view_editor/i18n/nb.po    |  4 ++--
 addons/web_view_editor/i18n/nl.po    |  4 ++--
 addons/web_view_editor/i18n/nl_BE.po |  4 ++--
 addons/web_view_editor/i18n/pl.po    |  4 ++--
 addons/web_view_editor/i18n/pt.po    |  4 ++--
 addons/web_view_editor/i18n/pt_BR.po |  4 ++--
 addons/web_view_editor/i18n/ro.po    |  4 ++--
 addons/web_view_editor/i18n/ru.po    |  4 ++--
 addons/web_view_editor/i18n/sl.po    |  4 ++--
 addons/web_view_editor/i18n/sv.po    |  4 ++--
 addons/web_view_editor/i18n/th.po    |  4 ++--
 addons/web_view_editor/i18n/tr.po    |  4 ++--
 addons/web_view_editor/i18n/zh_CN.po |  4 ++--
 343 files changed, 702 insertions(+), 700 deletions(-)

diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index c0cfcde2834..ecc5aa4aea3 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-08-13 04:04+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2014-03-15 06:42+0000\n"
+"Last-Translator: Victor Yu <vivianyw@163.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: 2014-03-04 06:19+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: project
 #: view:project.project:0
@@ -671,7 +671,7 @@ msgstr "新任务"
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
-msgstr ""
+msgstr "依据问题工作时间开票"
 
 #. module: project
 #: view:project.project:0
@@ -828,7 +828,7 @@ msgstr "花费的时间"
 #: view:project.project:0
 #: view:project.task:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: project
 #: field:account.analytic.account,company_uom_id:0
@@ -958,7 +958,7 @@ msgstr "本项目和相关项目的任务实际花费的小时数合计"
 msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
-msgstr ""
+msgstr "关注此项目的同时，追踪此项目的任务和问题关联的事件。"
 
 #. module: project
 #: view:project.task:0
@@ -1018,7 +1018,7 @@ msgstr "信息和通信历史记录"
 msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
-msgstr ""
+msgstr "开票或设定发票更新选项，到相关的合同："
 
 #. module: project
 #: field:project.task.delegate,state:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 0fbbcb6833d..a5ab6e3c64b 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-11-19 10:53+0000\n"
-"Last-Translator: Guipo Hao <hrlpool@sohu.com>\n"
+"PO-Revision-Date: 2014-03-15 07:15+0000\n"
+"Last-Translator: Victor Yu <vivianyw@163.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: 2014-03-04 07:04+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -247,7 +247,7 @@ msgstr "计量单位 "
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "错误的数据"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
@@ -1570,7 +1570,7 @@ msgstr "查找未开票明细"
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "会计.配置.设定"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -2080,7 +2080,7 @@ msgstr "产品销售单位"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr "销售订单草稿状态"
+msgstr "草稿状态的销售订单"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -2286,7 +2286,9 @@ msgstr ""
 msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
-msgstr "在挑选产品前，在 销售表单选择一个客户"
+msgstr ""
+"在挑选产品前，\n"
+" 在销售表单中选择一个客户。"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 67184648649..f92fdd447a1 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:01+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 770bfbbd840..9f061d5d949 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 719be2041ad..8d66fd1f665 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index f1c697869dd..f79c22012d2 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index e0c88404aff..06889a511f6 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 52f37e69406..46973b7a2c0 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
@@ -1610,7 +1610,7 @@ msgstr "Mažu databázi"
 #: code:addons/web/static/src/xml/base.xml:467
 #, python-format
 msgid "Powered by"
-msgstr ""
+msgstr "Založeno na"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 6d16ba2fb43..495acdd1014 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index bb67174627a..f9ee09441cb 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index 3bba3748933..d1255a88ac6 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index b0376267387..1ab30702945 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index cf2335a5c1c..2c3918bcc06 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index e29f14c3404..a1a786fc05c 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index fa318c2721a..5d37ed84799 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index a93b81ad86a..774ea3da1aa 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index dff85970e44..96b74af7041 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 91c8a77e14f..8e99a250926 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
index 51cc8a1ffc2..3353102c7e7 100644
--- a/addons/web/i18n/es_PE.po
+++ b/addons/web/i18n/es_PE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index b04f1eeb77c..6a916b1d602 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 3f005bb8748..b613aff9bf7 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 59bc4eb5e00..6350b1604b2 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index dd1524ff1de..58e91a8a9ed 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 151333cb582..13323c40119 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 6d6c0b62721..4995039d8d4 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index fc651dd112d..f26c4e665b3 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 1caa713714c..0ba9b2b1468 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/he.po b/addons/web/i18n/he.po
index d34d2dbf941..26a1c8f5962 100644
--- a/addons/web/i18n/he.po
+++ b/addons/web/i18n/he.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 24a5d06d013..3ec7a6bbead 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index dc8df85c668..73bc6181aa6 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 4dfcbf9c09f..22f87738d11 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 69a773acf8b..65cfb2e754d 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index db318997a5d..068131c92a4 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 723064188fd..75e354ad6fc 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 2fd69805e01..fc1c920f97a 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index 66368a9c196..8ca9fecdb69 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 335f7df338a..185804a40e9 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 570a08070bd..7cc4df11960 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index adadab13ec7..8ce0d5dcf19 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 6305755d96b..51e740c5fd8 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index e13c38c9afd..6d682eeadc6 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index e010241762b..1375a926243 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 879cde57ed2..de492027849 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.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-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 520b3e6169b..f7d062e7bd4 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index dfd93b68d3a..734b3cbbd16 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index ceeb55e83b0..02702624886 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index a5a9169c844..4e9f441befc 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 5d615348ee1..58c672b45ad 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index f34fb396d44..0acc7bb3ec5 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 9d6a5ba4340..c7229192916 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 37487135874..28d06e07ccd 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 68ae9312822..925ea5ea6bf 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.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-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:01+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index f939bdf4cd0..64a327ea164 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index efc5282ce51..40b0a3bee94 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index f1ee7f15ff4..2fc3f6a4fab 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -14,15 +14,15 @@ msgstr ""
 "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 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:147
 #, python-format
 msgid "Default language:"
-msgstr "ภาษาหลัก:"
+msgstr "ภาษาหลัก"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index b9ea7003525..61a1af167b4 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index ca088974d9a..a52394b625d 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index 456db1deb78..a69cd1b8a60 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index eab723ca9ea..6b487c3470d 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index f6f44ba9679..fbe1c31e0e7 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.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-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index dd04b59ffc3..dbd949fd810 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index 6cba43add02..a0583277ee8 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index e2ed2058763..02793de94e1 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 5ace6d4c937..5bf6a678882 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index b3265e0b812..29f9791cfa0 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 4e899d5cd97..9f366769715 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 44e4c8f59e2..e04e69bda71 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 5cb011c462e..fbb92237f61 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 93358638467..d4b83526832 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 206513f3b5f..d84dc0df632 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index c1cffb215da..c198423f13f 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index a57d3b3cf60..4de337db691 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 462a5a2ab50..b58a1d0001e 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index cf76f28f547..27f63faf1a8 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index e674adcf26f..a3b553a64ce 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 7d6cea95ac5..3f6c6706a2d 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
index 7a898927d19..485a4245e83 100644
--- a/addons/web_calendar/i18n/es_PE.po
+++ b/addons/web_calendar/i18n/es_PE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index db5b6285d49..56a8d1c35f1 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 1ddfdeacdd2..2675ee5df5e 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index f64e039248b..11c084f29a6 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index b422da7541e..677ccebb69d 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index e41b8252cb3..ce99491c669 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 1dac56e4b6b..322832d9321 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 129d86bf914..fe6a1d190fc 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 650d360535e..0a1109e1aba 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 4941ae7b647..386442f9d5e 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 8dccc409a4c..59fcca8dc0d 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 425fe0b6b3a..277b8ff25c7 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 118b27e7572..01fd2419cbb 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 1fe80878635..a020fa611b8 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index f51c87f2e27..d6b15deb994 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 4f77b51cb2f..bb13411ab06 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index f281254749c..17d8e638bca 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 88da0b630cd..2a6ca2367e7 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index 913ef997f90..53972abc6d3 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 73d2693af71..a2021e8a64b 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 7a12b559e16..fb362e37a74 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index 3f1dd4126c1..6879208b20a 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 5bfe489d724..05c8b9ced38 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index c4145d96551..5f559d18108 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 12b03a26fe9..69204d4c9b3 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index 259d4af9e97..7330717a12f 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index c05bfa412a7..c008cd4c8d9 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index fbd38361f81..a883a553bb0 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 0beb34d9597..1c4bd9b561e 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 9000520351c..a46c7260f98 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 96d91d4cf46..ad3e1dd7e51 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index 8d30e7a079e..200498885b4 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index 031cf5121f0..5b011a4064c 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 3392cf4d71b..fbbb944d2bd 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index a595e1319e9..79710f71a5f 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index fd151ad7f8c..461b5be591f 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po
index 62ee8aac6b1..af27ad97ebb 100644
--- a/addons/web_calendar/i18n/zh_TW.po
+++ b/addons/web_calendar/i18n/zh_TW.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index e098fd4037c..f51809830f7 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 096e17cd797..a2984162998 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index a94862db83f..9e565fc1d94 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 50105720772..e42e1cb739b 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index a707d23218c..0d237593f2d 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 238d8a1e102..e0832aa9539 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index db20550f37d..822c1da5acc 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index bde90151750..ade55de901b 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index ee1ba24821d..4d93da02fba 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index baa62175495..a77d753a3eb 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index ce8db84cad2..42b60d49fa3 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 0178af06296..79afb0692c8 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 7ccdb21500e..cdecbdc43f7 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index 0c8d3115d2b..c900b5fe76f 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index b5a52eb8995..1d45982c910 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index e4a14e0c99e..9f631eb3162 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
index 0c2473126ed..344818ed273 100644
--- a/addons/web_diagram/i18n/es_PE.po
+++ b/addons/web_diagram/i18n/es_PE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 3212778c79f..91e82ff5f66 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 7d0a87ff008..3026dcd92ae 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 4e2cb424048..634c345fd80 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index 88a25091843..fc1dd64af81 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index fb181559208..39a1f1b9f80 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 07069233045..a755ce3e54d 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index b70eccad7c6..4a4bdbc3979 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 656b43128d5..53b98831962 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 281e69c170c..ac76dc91d3b 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index c255369afbb..f1906c5773e 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 34654f6f66f..58677f458e7 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 1331d47a660..234846c2808 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index e745be6e531..47c7ab195a0 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 95acba6d544..5eeeb28ae23 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index ed0007d214e..9168e6d88fe 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 933479b6ce7..3e89e4a8589 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index bdf0030aa56..13f99f83753 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 2113ca2023f..8c14f165aef 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index d6ab2df43ce..e27215a197c 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index fa33ef9aba2..4b0d8459bf9 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 5a954ecf88b..e2a5ffd4c0d 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 2ffdb0067b8..598dfda63e3 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 39d9a86a191..76e4c911880 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 497b0d04ec8..7f687bcf68b 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index ddfed94a449..880ad51f9dd 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index e334dbd365c..fd608ff1875 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index da6814f27e7..d4fd84308d2 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 315e6ccb186..a3653945326 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 8cda71e3947..eff432a0df5 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 09b6d484cd2..71ee6bfb465 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 913bc07900c..695715df877 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index 64ad3c79896..540d255cc92 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 4989064024d..7a5a7ff5e11 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 0f8ad46e8a9..119c35b9060 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index feead27e2a8..093960efa0b 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 2c872beb060..3e129f75664 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index 864b4b9daca..bdf4e808586 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 9d498deff0c..8b83cca8d4c 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 4c820a2c461..f961d3c05ea 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 97e340f05e9..aea0f55659b 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 7d9f5cb3f25..47d0a527609 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 0d7d5eafac1..2fbe52d48ce 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 4156d286f8d..1f7a99e72e3 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index cef802e1d06..9bc637f632a 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index d07797a454f..4674b91865a 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 73bebeff31a..580087040f6 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index c5b58f4f5ff..3737dc9a904 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 7b3bfe11ea0..13cd1ddae4e 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 59ab0ff0717..d4b2a5c416c 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index b401101fb25..5708a0980e6 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index ccac39e12f6..25e4296045b 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 16411a8a9b9..9b3e81022f7 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index db4a3d06d19..f3e3a177e08 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index 0ee3cc1e161..f0d6b5b5810 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/he.po b/addons/web_gantt/i18n/he.po
index ef11809cc40..f415a523c6c 100644
--- a/addons/web_gantt/i18n/he.po
+++ b/addons/web_gantt/i18n/he.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 9cd49a68240..3bd136ac7d4 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index bc5564ed08a..9ff6bb347d1 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 96c6d1051b2..ba541496439 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 965a039152c..1dfd09b0fa0 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 2905d787256..42eacc4dbc3 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index e0711971946..d1f31017180 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index dda38a1b5ef..0c36d238439 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index 7469620555d..34f187d9187 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index f8eded51083..27ee6295df6 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index cd2de80b5b4..b021cf38b84 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index bfcd5675eec..643d2c644bb 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index a5ed886619c..5d3d398cde5 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 129f697c0d2..6b6c5b60e52 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index 5a924f6c503..f87ae762265 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 5465bce746f..427c523b8b9 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 7260bc3ca58..3ad6c8a3fae 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 3edad8d3c37..358e32dbc74 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index eeb66ebe0c0..f7301518a5d 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 5c19a5ce182..e0e5a579fcc 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index a983312d591..86c52195aa3 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index b518f17e88f..9cb29e6b749 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index af11760dd8e..2104dd98490 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index a5ef8fced8c..cc78b394cf0 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index 1c59704772c..e361d774f90 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 5b8e066f622..7cb2eec9c04 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index 0b7a6301b4d..efe20513958 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 75bc312d32e..de5de09bdcb 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 73acb54d1b9..d05a91bd4ed 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 34227dabfd0..356dd6ca5de 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index a7c0e09b6fe..e1d5af153a1 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 0c1e3bf466e..ef6895e739f 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 0070e52915b..d401a27e2b9 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 08276aed21a..6cbeba9d1b1 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index e15f21f8eee..695f15b1fea 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 25b7e274801..d874233da0b 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 1bb88ca218d..3cb73d1d8bb 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index a44c4f54f8d..214d299e503 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 5231e8f9062..3eaa8b7a0e9 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 0875ad36388..36a2b86cbbe 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index bb0f31530e7..fa5d6bd759f 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index 34ae98a1e48..d0c2321ce0a 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 5c23c5d0171..9ff87f75c62 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 85366484e61..06b2a713ee9 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index ea8723df3ee..47ec843f911 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 032c7ca0c3f..56acb73ecaa 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,8 +15,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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index dfe08dbb8e5..c8212c862e0 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index e7c68f4ddec..75f586110a3 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 2cfd8762b6b..c1d4fd958a8 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/he.po b/addons/web_graph/i18n/he.po
index 3343a74461b..8771ca2ac8e 100644
--- a/addons/web_graph/i18n/he.po
+++ b/addons/web_graph/i18n/he.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 678b5627594..711e0fa7791 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 770c3627286..9dfdb8516a3 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 5469197035f..c3671ec8f94 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index a54276493c0..8f3e8a00f66 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 62905156a3d..a4953acd124 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 18f374c9231..8486ff01c0b 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 3f4651370ea..2f37a47e928 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index e81b1ff911d..30ab0b0927e 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 33a084dad4d..e736d22e617 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 2f11d249fc4..321f28a9f97 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index e466ec85e3a..f3e30636d50 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index b6a1da2b790..4ee999e893b 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 1307b9e00a5..0034b9b9204 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index a5a9768466a..376bb8f588e 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 7d3d50cca49..9f4572ed7d2 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 8787a7c8d73..63d04e9f375 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index c8beaab41d6..108dfef5cb5 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index ba89edfba51..74f796a0191 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 0ea68d2a07a..6c374ae47c9 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 539ace093e9..76be580ec80 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index d424ca1dbf9..f978cef13a1 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index 9a4bb1c2aa4..d43ca8a862e 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index a32dfa621b9..61c623ffec7 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index 38e2bccd035..978d2ae5598 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 8c23c56f3e5..f337bc0b8a9 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 7b85bf29042..4f4a00e3157 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 5255af27cd9..6491f124ae7 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index e15fe4b1e2d..3918b829b75 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index dcfd4e39427..df3b2b4674c 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index c41785f6136..1781c835f3e 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index be8cc66c445..f35d1cbf1ea 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 44564bbd4f4..fd8a74b9a55 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index 6f46a647246..cec220f0614 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 80bf6bd65aa..be1dc806051 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index 8745aa7293c..29c6e7c6889 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index ca46818404e..a5b3998d42a 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 9049b7544df..25df2cb5cdf 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index 74fb555fe5e..cd6843b7058 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 5b56747daf2..3e2149e9690 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 7ef5a290531..fe9d0141986 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 5c6009ce367..8dcfb41064d 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index b031613e6f2..6eaa2bdc0b6 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index f3f8bfb2d2b..5fd09e920d6 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index b93ee73d4b5..8b9197242d3 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index 60dfae61e9f..e05bef70cc7 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 1ec9bc1a1fa..e6e15f0f580 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index 408f83ab97c..edb71794e66 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/he.po b/addons/web_kanban/i18n/he.po
index e482f787efc..29795dc2504 100644
--- a/addons/web_kanban/i18n/he.po
+++ b/addons/web_kanban/i18n/he.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index b2162e1712b..5705fce306f 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index f8c84453875..ac46ca8cbef 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 43c86d50a8e..fbc2b6ace49 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index ed3c1e5b757..4e066bc9641 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index f225fb5d2f1..62e41d3d6dd 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index efab97366f1..53eb527eb14 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index ab3899aad71..36a65008353 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 45421e7db6a..d8f1ea4bf0d 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 3271fc9609f..679f3e606c2 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index badedfddfbd..9b252a1f234 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 228bcecbf15..054065cb549 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index d61a8c94e49..22d45529ef8 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 96d8ca8ca13..53a09c39079 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index c9ebabc9cf6..f9eacc2a677 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index a00620c8e65..583d9025f82 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index f766af1a173..7a2d72b4767 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index fe819240891..0e1e001c0a9 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index ccbed123cf6..97bfd11c8ce 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 2d493eeb167..f2cb3ac2e7d 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 1a4e4519949..e9d1d651449 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index aab2857db3c..b5ea15a9b5c 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index acf29c247c5..fbf668ee177 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 6b1af7e7bd0..34368044ba2 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 67f98d22281..f7791865771 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index b5b611f1e3d..fa2d683781a 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 5491b9bcf35..b9e47b49ca1 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index 31621044526..98996988176 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index 167d9f98752..882ef8a5676 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index c5fa9d955cf..337a5a683bb 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index 829719da4f1..8c77fa8bb76 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
index e9f19d52177..2a2714693c8 100644
--- a/addons/web_view_editor/i18n/en_GB.po
+++ b/addons/web_view_editor/i18n/en_GB.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index e017668130a..a7835ada453 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 196b4a6ad7c..1f0737ca838 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index c6aa6e122cd..9b7a241fd91 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index 77ab9df4862..4e219f905b4 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index b7e434f21cb..f6fc91b0510 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 8dfeb8d96ec..2a909d3e82b 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 6ae1be3dca6..26ce98340a6 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index b3aecd6f840..cbe3af78d98 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/he.po b/addons/web_view_editor/i18n/he.po
index ef5670e2fb7..027ddbd7600 100644
--- a/addons/web_view_editor/i18n/he.po
+++ b/addons/web_view_editor/i18n/he.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index a9245bfd1e6..f1a5dbe6078 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 9444e6425be..535584908b3 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index 5a30a033228..35304df56df 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 40e48e33339..b87577a0326 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 1511cce777e..e012b5e79a9 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 02c4d444031..79a78dd8494 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index c2ca752f654..50992a6ae03 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index a14c5f8812e..07cdaef96e3 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 54d68526e39..1a9f99fba84 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 638799e2414..43e5d11fc69 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index 0e952e32338..c098de46242 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index 810f2b01f10..76bda2cc253 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 1d8bd020bf1..aa54ae77129 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.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-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 586d7d33a63..414757a65ab 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index cde73c5c9b0..87777beb038 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 926d6f999ed..45f82fe55f0 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 0341fc03363..2116698efdd 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po
index 965ba9f2da4..d95e8db549c 100644
--- a/addons/web_view_editor/i18n/sv.po
+++ b/addons/web_view_editor/i18n/sv.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 58fa3740e60..2a93fc19423 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index e4f46f7bca4..b1f3aa854ef 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 8e1e59f51a9..edfec33a311 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.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-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web

From fb64b578e87e8e14bb8fc169fc639f5be13ea8c2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 11:40:22 +0100
Subject: [PATCH 083/175] [IMP] Cleaning Archives

bzr revid: fp@tinyerp.com-20140316104022-fps64jlo8rpssf9m
---
 addons/website_mail_group/__init__.py         |   1 -
 addons/website_mail_group/__openerp__.py      |   5 +-
 addons/website_mail_group/controllers/main.py |  55 ++++----
 addons/website_mail_group/models/__init__.py  |   1 -
 .../website_mail_group/models/mail_group.py   |  25 ----
 .../static/src/css/website_mail_group.css     |   0
 .../views/website_mail_group.xml              | 132 ++++++++++--------
 .../views/website_mail_group_backend.xml      |   5 -
 8 files changed, 103 insertions(+), 121 deletions(-)
 delete mode 100644 addons/website_mail_group/models/__init__.py
 delete mode 100644 addons/website_mail_group/models/mail_group.py
 delete mode 100644 addons/website_mail_group/static/src/css/website_mail_group.css
 delete mode 100644 addons/website_mail_group/views/website_mail_group_backend.xml

diff --git a/addons/website_mail_group/__init__.py b/addons/website_mail_group/__init__.py
index 9f86759e32b..ee5959455ad 100644
--- a/addons/website_mail_group/__init__.py
+++ b/addons/website_mail_group/__init__.py
@@ -1,2 +1 @@
 import controllers
-import models
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 5681dc31fd3..9ea12329775 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -4,15 +4,14 @@
     'summary': '',
     'version': '1.0',
     'description': """
-OpenERP Mail Group : Mailing List Archive
-==================
+OpenERP Mail Group : Mailing List Archives
+==========================================
 
         """,
     'author': 'OpenERP SA',
     'depends': ['website','mail'],
     'data': [
         'views/website_mail_group.xml',
-        'views/website_mail_group_backend.xml',
         'data/website_mail_group_data.xml',
         'security/website_mail_group.xml',
     ],
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index dc0acce7644..97cb4d03091 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -32,22 +32,14 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        
         group_ids = group_obj.search(cr, uid, [], context=context)
-        values = {
-            'groups': group_obj.browse(cr, uid, group_ids, context),
-        }
+        values = {'groups': group_obj.browse(cr, uid, group_ids, context)}
         return request.website.render('website_mail_group.mail_groups', values)
 
-    @http.route([
-        "/groups/subscription/",
-    ], type='json', auth="public", website=True)
+    @http.route(["/groups/subscription/"], type='json', auth="user")
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        public_uid = request.registry['website'].get_public_user(cr , uid, context)
-        if uid == public_uid:
-            return ['is_public']
         if action:
             group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
         else:
@@ -55,41 +47,42 @@ class MailGroup(http.Controller):
         return []
 
     @http.route([
-        "/groups/<model('mail.group'):group>/",
-        "/groups/<model('mail.group'):group>/page/<int:page>/"
+        "/groups/<model('mail.group'):group>/<any(thread,list):mode>",
+        "/groups/<model('mail.group'):group>/<any(thread,list):mode>/page/<int:page>"
     ], type='http', auth="public", website=True)
-    def thread(self, group, page=1, **post):
+    def thread(self, group, mode='thread', page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        group_obj = request.registry.get('mail.group')
+
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('model','=','mail.group'), ('res_id','=',group.id), ('parent_id','=',False)])
-        group_ids = group_obj.search(cr, uid, [])
+        domain = [('model','=','mail.group'), ('res_id','=',group.id)]
+        if mode=='thread':
+            domain.append(('parent_id','=',False))
+        thread_count = thread_obj.search_count(cr, uid, domain, context=context)
         pager = request.website.pager(
-            url='/groups/%s/' % group.id,
-            total=len(thread_ids),
+            url='/groups/%s/%s' % (group.id, mode),
+            total=thread_count,
             page=page,
             step=self._thread_per_page,
         )
-        pager_begin = (page - 1) * self._thread_per_page
-        pager_end = page * self._thread_per_page
-        thread_ids = thread_ids[pager_begin:pager_end]
+        thread_ids = thread_obj.search(cr, uid, domain, limit=self._thread_per_page, offset=pager['offset'])
+
         values = {
-            'groups': group_obj.browse(cr, uid, group_ids, context),
-            'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
-            'active_group': group,
+            'messages': thread_obj.browse(cr, uid, thread_ids, context),
+            'group': group,
             'pager': pager,
+            'mode': mode
         }
-        return request.website.render('website_mail_group.group_thread_list', values)
+        return request.website.render('website_mail_group.group_messages', values)
 
     @http.route([
         "/groups/<model('mail.group'):group>/message/<model('mail.message'):message>",
     ], type='http', auth="public", website=True)
-    def get_thread(self, group, message, **post):
+    def get_thread(self, group, message, mode='thread', page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)], order='date')
         values = {
-            'main_thread': message,
-            'child_thread': thread_obj.browse(cr, uid, child_ids, context),
+            'message': message,
+            'group': group,
+            'mode': mode,
+            'page': page,
         }
-        return request.website.render('website_mail_group.group_thread', values)
+        return request.website.render('website_mail_group.group_message', values)
diff --git a/addons/website_mail_group/models/__init__.py b/addons/website_mail_group/models/__init__.py
deleted file mode 100644
index ea8be51acde..00000000000
--- a/addons/website_mail_group/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import mail_group
diff --git a/addons/website_mail_group/models/mail_group.py b/addons/website_mail_group/models/mail_group.py
deleted file mode 100644
index 66a7481fb52..00000000000
--- a/addons/website_mail_group/models/mail_group.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv, fields
-import uuid
-import time
-import datetime
diff --git a/addons/website_mail_group/static/src/css/website_mail_group.css b/addons/website_mail_group/static/src/css/website_mail_group.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 5000ca85a1d..2f660f4ef66 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -6,7 +6,7 @@
             <li><a t-attf-href="/groups">Mailing List</a></li>
         </xpath>
     </template>
-    <template id="mail_groups" name="My Groups">
+    <template id="mail_groups" name="Mailing Lists">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
@@ -19,7 +19,7 @@
                     <div class="col-md-3 mt32 mb64" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                            <a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/>
                             <div t-esc="group.description" class="text-muted"/>
                             <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
                             <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
@@ -30,81 +30,103 @@
         </t>
     </template>
 
-    <template id="group_thread_list">
+    <template id="group_messages" name="Message Threads">
         <t t-call="website.layout">
             <section class="container">
-                <div class="row">
+                <div class="row mt8">
+                    <div class="col-md-5">
+                        <ol class="breadcrumb mb8">
+                            <li><a href="/groups">Mailing Lists</a></li>
+                            <li class="active" t-esc="group.name"/>
+                        </ol>
+                    </div>
                     <div class="col-md-5">
                         <t t-call="website.pager"/>
                     </div>
                 </div>
-            </section>
-
-            <section class="container">
+                <h1 class="mt8 mb32">
+                    <span t-field="group.name"/>
+                    <small>List Archive</small>
+                </h1>
                 <div class="row">
                     <div class="col-md-3">
-                        <ul class="nav nav-pills nav-stacked" id="group_follows">
-                            <t t-foreach="groups" t-as="group">
-                                <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id">
-                                    <a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/>
-                                </li>
-                            </t>
+                        <ul class="nav nav-pills nav-stacked" id="group_mode">
+                            <li t-attf-class="#{mode=='thread' and 'active' or ''}">
+                                <a t-attf-href="/groups/#{ slug(group) }/thread">By thread</a>
+                            </li>
+                            <li t-attf-class="#{mode=='list' and 'active' or ''}">
+                                <a t-attf-href="/groups/#{ slug(group) }/list">By date</a>
+                            </li>
                         </ul>
                     </div>
                     <div class="col-md-9">
-                        <ul class="media-list">
-                            <li t-foreach="thread_list" t-as="thread" class="media">
-                                <a t-attf-href="/groups/#{active_group.id}/message/#{ slug(thread) }" class="pull-left">
-                                    <img class="img-rounded pull-right mt0" style="height: 40px"
-                                        t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
-                                </a>
-                                <div class="media-body">
-                                    <h4 class="media-heading">
-                                        <a t-attf-href="/groups/#{ slug(active_group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
-                                        <br/>
-                                        <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
-                                    </h4>
-                                </div>
-                            </li>
-                        </ul>
+                        <t t-call="website_mail_group.messages_short"/>
                     </div>
                 </div>
             </section>
         </t>
     </template>
 
-    <template id="group_thread">
+    <template id="group_message">
         <t t-call="website.layout">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_mail_group/static/src/css/website_mail_group.css'/>
-            </t>
-            <div class="row mt32">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-1">
-                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
-                        </div>
-                        <div class="col-md-11">
-                            <div class="panel panel-default">
-                                <div class="panel-heading" t-esc="main_thread.subject"/>
-                                <div class="panel-body" t-raw="main_thread.body"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row" t-foreach="child_thread" t-as="message">
-                        <div class="col-md-1">
-                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
-                        </div>
-                        <div class="col-md-11">
-                            <div class="panel panel-default">
-                                <div class="panel-heading" t-esc="message.subject"/>
-                                <div class="panel-body" t-raw="message.body"/>
-                            </div>
-                        </div>
+            <div class="container">
+                <div class="row mt8">
+                    <div class="col-md-5">
+                        <ol class="breadcrumb mb8">
+                            <li><a href="/groups">Mailing Lists</a></li>
+                            <li>
+                                <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">
+                                    <span t-field="group.name"/>
+                                </a>
+                            </li>
+                            <li class="active" t-esc="message.subject or 'Message'"/>
+                        </ol>
                     </div>
                 </div>
+
+                <h1 t-field="message.subject"/>
+                <img class="img-rounded pull-left" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                <h4 class="mt0 mb32">
+                     <span t-field="message.author_id.name"/>
+                    on <span t-field="message.date"/>
+                </h4>
+                <div t-raw="message.body"/>
+                <div t-if="message.child_ids">
+                    <h2 class="page-header">Follow ups</h2>
+                    <t t-set="messages" t-value="message.child_ids"/>
+                    <t t-call="website_mail_group.messages_short"/>
+                </div>
+                <div t-if="message.parent_id">
+                    <h2 class="page-header">Reference</h2>
+                    <t t-set="messages" t-value="[message.parent_id]"/>
+                    <t t-call="website_mail_group.messages_short"/>
+                </div>
+                <div class="text-center mb32 mt32">
+                    <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}" class="btn btn-lg btn-info">
+                        Back To List: <span t-field="group.name"/>
+                    </a>
+                </div>
             </div>
         </t>
     </template>
+
+    <template id="messages_short">
+        <ul class="media-list">
+            <li t-foreach="messages" t-as="thread" class="media">
+                <a t-attf-href="/groups/#{group.id}/message/#{ slug(thread) }?mode=#{mode}" class="pull-left">
+                    <img class="img-rounded pull-right mt0" style="height: 40px"
+                        t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
+                </a>
+                <div class="media-body">
+                    <h4 class="media-heading">
+                        <a t-attf-href="/groups/#{ slug(group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
+                        <br/>
+                        <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
+                    </h4>
+                </div>
+            </li>
+        </ul>
+    </template>
+
 </data>
 </openerp>
diff --git a/addons/website_mail_group/views/website_mail_group_backend.xml b/addons/website_mail_group/views/website_mail_group_backend.xml
deleted file mode 100644
index cc8d30d080d..00000000000
--- a/addons/website_mail_group/views/website_mail_group_backend.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    </data>
-</openerp>

From 9d9e6007fe405a5544ce9f1934c1341021be0f9f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 12:02:40 +0100
Subject: [PATCH 085/175] [IMP] Clean CTA

bzr revid: fp@tinyerp.com-20140316110240-g9esx75vt2qmxcic
---
 .../views/website_mail_group.xml              | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 2f660f4ef66..9087ea38fbe 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -69,6 +69,9 @@
 
     <template id="group_message">
         <t t-call="website.layout">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
+            </t>
             <div class="container">
                 <div class="row mt8">
                     <div class="col-md-5">
@@ -101,10 +104,24 @@
                     <t t-set="messages" t-value="[message.parent_id]"/>
                     <t t-call="website_mail_group.messages_short"/>
                 </div>
-                <div class="text-center mb32 mt32">
-                    <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}" class="btn btn-lg btn-info">
-                        Back To List: <span t-field="group.name"/>
-                    </a>
+
+                <div class="jumbotron mt64">
+                    <h1>Join the discussion</h1>
+                    <p>
+                        Join this mailing list to follow or participate to this discussion.<br/>
+                        <span t-field="group.name"/>: <i t-field="group.description"/>
+                    </p>
+                    <p>
+                        <span t-if="group.message_is_follower" t-attf-class="btn btn-default disabled">
+                            Already subscribed
+                        </span>
+                        <a t-if="not group.message_is_follower"
+                          t-attf-class="btn btn-primary btn-lg js_group follow_#{group.id}"
+                          t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">
+                            Join The List
+                        </a> or <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">view archives</a>
+                    </p>
+
                 </div>
             </div>
         </t>

From 675a71b2b82459c4aea5d19550e834c953fa1e11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 12:37:42 +0100
Subject: [PATCH 086/175] [IMP] attachments on messages

bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
---
 addons/website/models/website.py                |  2 +-
 addons/website_mail_group/controllers/main.py   |  5 ++++-
 .../views/website_mail_group.xml                | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ffb10d8850d..7befdb48516 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -88,7 +88,7 @@ def slug(value):
     else:
         # assume name_search result tuple
         id, name = value
-    slugname = slugify(name)
+    slugname = slugify(name or '')
     if not slugname:
         return str(id)
     return "%s-%d" % (slugname, id)
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 97cb4d03091..a6f3adcd522 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -66,8 +66,11 @@ class MailGroup(http.Controller):
         )
         thread_ids = thread_obj.search(cr, uid, domain, limit=self._thread_per_page, offset=pager['offset'])
 
+        messages = thread_obj.browse(cr, uid, thread_ids, context)
+        for m in messages:
+            print m.subject
         values = {
-            'messages': thread_obj.browse(cr, uid, thread_ids, context),
+            'messages': messages,
             'group': group,
             'pager': pager,
             'mode': mode
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 9087ea38fbe..d1f960d7c00 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -94,6 +94,23 @@
                     on <span t-field="message.date"/>
                 </h4>
                 <div t-raw="message.body"/>
+
+                <div class="row" t-if="message.attachment_ids">
+                    <h3 class="col-sm-12">Attachment(s):</h3>
+                    <div class="col-md-2 col-sm-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'>
+                        <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
+                            <t t-if="attachment.file_type == 'webimage'">
+                                <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
+                                    class='oe_attachment_embedded'></img>
+                            </t>
+                            <t t-if="attachment.file_type != 'webimage'">
+                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
+                                    class='oe_attachment_webimage'></img>
+                            </t>
+                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                        </a>
+                    </div>
+                </div>
                 <div t-if="message.child_ids">
                     <h2 class="page-header">Follow ups</h2>
                     <t t-set="messages" t-value="message.child_ids"/>

From d143e09ff5aab989b660c1f75af713433426be4c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 13:32:20 +0100
Subject: [PATCH 087/175] [IMP] Mailing List Fixes

bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
---
 addons/website_mail/views/snippets.xml        |  6 +-
 addons/website_mail_group/__openerp__.py      |  3 +-
 .../security/ir.model.access.csv              |  0
 .../security/website_mail_group.xml           | 12 ----
 .../static/src/js/website_mail_group.js       | 28 ----------
 .../views/website_mail_group.xml              | 56 ++++++++++++-------
 6 files changed, 40 insertions(+), 65 deletions(-)
 delete mode 100644 addons/website_mail_group/security/ir.model.access.csv
 delete mode 100644 addons/website_mail_group/security/website_mail_group.xml
 delete mode 100644 addons/website_mail_group/static/src/js/website_mail_group.js

diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 75202fe99fd..196ad39dac8 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -509,10 +509,10 @@
                       class="js_follow_email form-control"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
-                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
+                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
                 </span>
-                <div class="alert alert-success hidden">Thanks for your subscription!</div>
+                <div class="alert alert-success hidden">thanks for your subscription!</div>
             </div>
 
         </div>
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 9ea12329775..de47bfa4390 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -13,11 +13,10 @@ OpenERP Mail Group : Mailing List Archives
     'data': [
         'views/website_mail_group.xml',
         'data/website_mail_group_data.xml',
-        'security/website_mail_group.xml',
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
     ],
-    'qweb': ['static/src/xml/*.xml'],
+    'qweb': [],
     'installable': True,
 }
diff --git a/addons/website_mail_group/security/ir.model.access.csv b/addons/website_mail_group/security/ir.model.access.csv
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_mail_group/security/website_mail_group.xml b/addons/website_mail_group/security/website_mail_group.xml
deleted file mode 100644
index 79d4390f6f9..00000000000
--- a/addons/website_mail_group/security/website_mail_group.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.rule" id="mail.mail_group_public_and_joined">
-            <field name="name">Mail.group: access only public and joined groups</field>
-            <field name="model_id" ref="mail.model_mail_group"/>
-            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_create" eval="False"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
deleted file mode 100644
index 651ed7fa6c3..00000000000
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ /dev/null
@@ -1,28 +0,0 @@
-$(document).ready(function () {
-    $('a.js_group').on('click', function (ev) {
-        ev.preventDefault();
-        var $link = $(ev.currentTarget);
-        var href = $link.attr("href");
-        var group_id = href.match(/subscription\/([0-9]+)/)[1];
-        var action = href.match(/action=(.*)/)[1] == 'subscribe' ? true : false;
-        openerp.jsonRpc("/groups/subscription/", 'call', {
-                    'group_id': parseInt(group_id),
-                    'action' : action,
-                })
-                .then(function (data) {
-                    if(data[0])
-                        return window.location ='/web/login?redirect=/groups/';
-                    if (action){
-                        $('li#'+ group_id).toggleClass('hidden visible');
-                        $('.unfollow_' + group_id).toggleClass('visible hidden');
-                        $('.follow_' + group_id).toggleClass('hidden visible');
-                    }
-                    else {
-                        $('li#'+ group_id).toggleClass('visible hidden');
-                        $('.unfollow_' + group_id).toggleClass('hidden visible');
-                        $('.follow_' + group_id).toggleClass('visible hidden');
-                    }
-                });
-        return false;
-    });
-});
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index d1f960d7c00..9e4b41329b4 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -8,21 +8,32 @@
     </template>
     <template id="mail_groups" name="Mailing Lists">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <h1>
                     Our Mailing Lists
                 </h1>
                 <div class="row">
-                    <div class="col-md-3 mt32 mb64" t-foreach="groups" t-as="group">
+                    <div class="col-sm-4" style="height: 140px" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/>
+                            <strong><a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/></strong>
                             <div t-esc="group.description" class="text-muted"/>
-                            <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
-                            <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
+
+                            <div class="input-group js_follow"
+                                      t-att-data-id="group.id"
+                                      data-object="mail.group"
+                                      data-follow="off">
+                                <input
+                                      type="email"
+                                      name="email"
+                                      class="js_follow_email form-control"
+                                      placeholder="your email..."/>
+                                <span class="input-group-btn">
+                                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                                </span>
+                                <div class="alert alert-success hidden">You have been subscribed!</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -69,9 +80,6 @@
 
     <template id="group_message">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <div class="row mt8">
                     <div class="col-md-5">
@@ -128,16 +136,24 @@
                         Join this mailing list to follow or participate to this discussion.<br/>
                         <span t-field="group.name"/>: <i t-field="group.description"/>
                     </p>
-                    <p>
-                        <span t-if="group.message_is_follower" t-attf-class="btn btn-default disabled">
-                            Already subscribed
-                        </span>
-                        <a t-if="not group.message_is_follower"
-                          t-attf-class="btn btn-primary btn-lg js_group follow_#{group.id}"
-                          t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">
-                            Join The List
-                        </a> or <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">view archives</a>
-                    </p>
+
+                    <div style="max-width: 400px">
+                        <div class="input-group js_follow"
+                                  t-att-data-id="group.id"
+                                  data-object="mail.group"
+                                  data-follow="off">
+                            <input
+                                  type="email"
+                                  name="email"
+                                  class="js_follow_email form-control"
+                                  placeholder="your email..."/>
+                            <span class="input-group-btn">
+                                <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                            </span>
+                            <div class="alert alert-success hidden">You have been subscribed!</div>
+                        </div>
+                    </div>
 
                 </div>
             </div>

From 21cb5da695d7dd99c8064d1c494557280727f32e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 13:34:07 +0100
Subject: [PATCH 088/175] [IMP] removed unsed files

bzr revid: fp@tinyerp.com-20140316123407-snoyaoybyl45l6xl
---
 addons/website_mail_group/__openerp__.py      |   5 +-
 .../data/website_mail_group_data.xml          |   4 -
 .../data/website_mail_group_demo.xml          | 204 ------------------
 3 files changed, 2 insertions(+), 211 deletions(-)
 delete mode 100644 addons/website_mail_group/data/website_mail_group_data.xml
 delete mode 100644 addons/website_mail_group/data/website_mail_group_demo.xml

diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index de47bfa4390..5c9ff3190b6 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -9,10 +9,9 @@ OpenERP Mail Group : Mailing List Archives
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website','mail'],
+    'depends': ['website_mail'],
     'data': [
-        'views/website_mail_group.xml',
-        'data/website_mail_group_data.xml',
+        'views/website_mail_group.xml'
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
diff --git a/addons/website_mail_group/data/website_mail_group_data.xml b/addons/website_mail_group/data/website_mail_group_data.xml
deleted file mode 100644
index b020c6a30ae..00000000000
--- a/addons/website_mail_group/data/website_mail_group_data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<openerp>
-    <data>
-    </data>
-</openerp>
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
deleted file mode 100644
index 2744986dcdd..00000000000
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="mail.group" id="group_community">
-            <field name="name">Community</field>
-            <field name="description">Community team</field>
-        </record>
-        <record model="mail.group" id="group_community">
-            <field name="message_follower_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
-        </record>
-        <record id="msg_group_community_1" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Dear community,
-                </p><p>
-                    We are organizing a serie of events to showcase the new 
-                    features of OpenERP v8.The events are visible on 
-                    http://openerp.com/events
-                </p><p>
-                    The America Tour:
-                </p><p>
-                    3/11: New York:
-                    <a href="http://www.eventbrite.com/event/10576455463">
-                        http://www.eventbrite.com/event/10576455463
-                    </a>
-                </p><p>
-                    3/13: Montreal: 
-                    <a href="http://www.eventbrite.com/event/10577717237">
-                        http://www.eventbrite.com/event/10577717237
-                    </a>
-                </p><p>
-                    3/18: Los Angeles: 
-                    <a href="http://www.eventbrite.com/event/10577185647">
-                        http://www.eventbrite.com/event/10577185647
-                    </a>
-                </p><p>
-                    3/20: San Francisco: 
-                    <a href="http://www.eventbrite.com/event/10577185647">
-                        http://www.eventbrite.com/event/10577185647
-                    </a>
-                </p><p>
-                    4/10: Chicago:
-                    <a href="http://www.eventbrite.com/event/10577414331">
-                        http://www.eventbrite.com/event/10577414331
-                    </a>
-                </p><p>
-                    4/17: Miami:
-                    <a href="http://www.eventbrite.com/event/10577616937">
-                        http://www.eventbrite.com/event/10577616937
-                    </a>
-                </p><p>
-                    The European Tour:
-                </p><p>
-                    2/20: Gosselies - Belgium:
-                    <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783">
-                        http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783
-                    </a>
-                </p><p>
-                    2/21: Brussels - Belgium:
-                    <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">
-                        http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143
-                    </a>
-                </p><p>
-                    3/10: Germany:
-                    <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">
-                        http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071
-                    </a>
-                </p><p>
-                    3/18: Lisbon, Portugal:
-                    <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">
-                        https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519
-                    </a>
-                </p><p>
-                    Please spread the news and lets meet there.
-                </p><p>
-                    Thanks,
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_2" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Hi,
-                </p><p>
-                    is there any event scheduled for Africa in near future?
-                </p><p>
-                    Regards
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="parent_id" ref="msg_group_community_1"></field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_3" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>Yes,<p>
-                <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="parent_id" ref="msg_group_community_1"></field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_4" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>Dear community,</p>
-                <p>
-                    Over the past years, we did not invest a lot in marketing. We put most
-                    our efforts in R&D and Sales departements (starting from 2010) and
-                    services (started in 2012).
-                </p><p>
-                    Things are changing and we are now ready to invest a lot in marketing
-                    activities. I just wrote a "very draft" internal document to discuss the
-                    brand positioning of OpenERP:
-                    <a href="http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb">http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb</a>
-                </p><p>
-                    I would like to have your point of view on these marketing thoughts for
-                    OpenERP.
-                </p><p>
-                    Thanks,
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_5" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    I just posted my feedback request 
-                    about the OpenERP brand positioning on
-                    HN, you can react there:
-                    <a href="https://news.ycombinator.com/item?id=7243726">
-                        https://news.ycombinator.com/item?id=7243726
-                    </a>
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="parent_id" ref="msg_group_community_4"></field>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_6" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Hello,
-                </p><p>
-                    I don't think there can be only one positioning for OpenERP.
-                </p><p>
-                    Depending on the customer in front of me, I will present OpenERP as :
-                </p>
-                <ol>
-                    <li>an Apps-consuming platform (like a cell phone)</li>
-                    <li>an ERP (in its traditional meaning)</li>
-                    <li>a business apps development framework</li>
-                </ol>
-                <p>
-                    OpenERP answers a wide range of needs, so you need to differentiate 
-                    the positioning based on the 3 axis above. In each of those axis,
-                    the competition is different and arguments toward OpenERP will be
-                    different as well.
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="parent_id" ref="msg_group_community_4"></field>
-            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-    </data>
-</openerp>

From 5cc7237f63cecba24cbc52146dcfb57145ec3892 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:12:28 +0100
Subject: [PATCH 089/175] [REM] useless jsonrpc tests and controllers

bzr revid: al@openerp.com-20140316141228-0c35ymruttd5mx2j
---
 addons/web/__openerp__.py         |   1 -
 addons/web/controllers/testing.py |   7 --
 addons/web/static/test/jsonrpc.js | 152 ------------------------------
 3 files changed, 160 deletions(-)
 delete mode 100644 addons/web/static/test/jsonrpc.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 72f1610177c..f1d7d7511c7 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -87,7 +87,6 @@ This module provides the core of the OpenERP Web Client.
         "static/test/data.js",
         "static/test/list-utils.js",
         "static/test/formats.js",
-        "static/test/jsonrpc.js",
         "static/test/rpc-misordered.js",
         "static/test/evals.js",
         "static/test/search.js",
diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index c99efed4294..a51b619d49f 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -157,10 +157,3 @@ class TestRunnerController(http.Controller):
                 # replace OS path separators (from join & normpath) by URI ones
                 yield path[len(root):].replace(os.path.sep, '/')
 
-    @http.route('/web/tests/set_session_value', type='json', auth="none")
-    def set_session_value(self, value):
-        request.session.some_test_value = value
-
-    @http.route('/web/tests/get_session_value', type='json', auth="none")
-    def get_session_value(self):
-        return request.session.some_test_value
diff --git a/addons/web/static/test/jsonrpc.js b/addons/web/static/test/jsonrpc.js
deleted file mode 100644
index 3b7140bacff..00000000000
--- a/addons/web/static/test/jsonrpc.js
+++ /dev/null
@@ -1,152 +0,0 @@
-(function() {
-
-var ropenerp = window.openerp;
-
-var openerp = ropenerp.declare($, _, QWeb2);
-
-ropenerp.testing.section('jsonrpc', {},
-function (test) {
-    test('basic-jsonrpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        return session.rpc("/gen_session_id", {}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });
-    test('basic-jsonprpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('basic-jsonprpc2', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {force2step: true}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });*/
-    test('session-jsonrpc', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });
-    test('session-jsonprpc', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('session-jsonprpc2', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {}, {force2step: true});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });*/
-    test('overridesession-jsonrpc', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });
-    test('overridesession-jsonprpc', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        session.origin_server = false;
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('overridesession-jsonprpc2', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        session.origin_server = false;
-        return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {}, {force2step: true});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });*/
-    test('timeout-jsonrpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });
-    test('timeout-jsonprpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('timeout-jsonprpc2', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {force2step: true, timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });*/
-});
-
-})();

From 5b21fc022536eefa8795a2848dee061647cc789a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:13:11 +0100
Subject: [PATCH 090/175] [REM] http useless controller

bzr revid: al@openerp.com-20140316141311-m0xqh386ax952va1
---
 openerp/http.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 128d5a91246..3fc4aeb60f2 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1209,11 +1209,6 @@ class CommonController(Controller):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
-    @route('/gen_session_id', type='json', auth="none")
-    def gen_session_id(self):
-        nsession = root.session_store.new()
-        return nsession.sid
-
 root = None
 
 def wsgi_postload():

From e23ce631332f166003ee51b65b36b051026411e4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:23:02 +0100
Subject: [PATCH 091/175] [FIX] website tests crawler, admin password != super
 admin password

bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
---
 addons/website/tests/test_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index 9fb29b63c75..2a22ae04445 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -121,6 +121,6 @@ class URL(object):
 
 def load_tests(loader, base, _):
     base.addTest(CrawlSuite())
-    base.addTest(CrawlSuite('admin', tools.config['admin_passwd']))
+    base.addTest(CrawlSuite('admin', 'admin'))
     base.addTest(CrawlSuite('demo', 'demo'))
     return base

From 0772c99bcbca4b4ddac66cc81ab4781e397b87d8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:45:46 +0100
Subject: [PATCH 092/175] [FIX] website test, remove useless test, waitfor
 banner fix

bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
---
 .../static/src/js/website.tour.test.admin.js  | 106 ------------------
 addons/website/tests/test_ui.py               |   2 +-
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 addons/website/static/src/js/website.tour.test.admin.js

diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
deleted file mode 100644
index 01f4448abb2..00000000000
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-
-    website.Tour.LoginEdit = website.Tour.extend({
-        id: 'login_edit',
-        name: "Try to log as admin and check editor",
-        path: '/',
-        init: function () {
-            var self = this;
-            self.steps = [
-                {
-                    title:     "click login",
-                    element:   '#top_menu a[href*="/web/login"]',
-                },
-                {
-                    title:     "insert login",
-                    element:   '.oe_login_form input[name="login"]',
-                    sampleText: "admin",
-                },
-                {
-                    title:     "insert password",
-                    waitFor:   '.oe_login_form input[name="login"][value!=""]',
-                    element:   '.oe_login_form input[name="password"]',
-                    sampleText: "admin",
-                },
-                {
-                    title:     "select 2 Standard tickets",
-                    waitFor:   '.oe_login_form input[name="password"][value!=""]',
-                    element:   '.oe_login_form button',
-                },
-                {
-                    title:     "go back to website from backend",
-                    element:   'a[data-action-model="ir.actions.act_url"]:contains("Website")',
-                },
-                {
-                    title:     'try to edit',
-                    waitNot:   '#wrap .carousel',
-                    element:   'button[data-action=edit]:visible',
-                },
-                {
-                    title:     'check edit mode',
-                    waitFor:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     'check branding',
-                    waitFor:   '#wrap[data-oe-model="ir.ui.view"]',
-                },
-                {
-                    title:     'check rte',
-                    waitFor:   '#oe_rte_toolbar',
-                },
-                {
-                    title:     'check insert block button',
-                    element:   '[data-action="snippet"]:visible',
-                },
-                {
-                    title:     'add snippets',
-                    snippet:   '#snippet_structure .oe_snippet:first',
-                },
-                {
-                    title:     'try to save',
-                    waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     'check saved',
-                    waitFor:   '#wrap div.carousel',
-                    element:   'button[data-action=edit]:visible',
-                },
-                {
-                    title:      'try to re-edit',
-                    waitFor:    'button[data-action=save]:visible',
-                    element:    '#wrap .carousel',
-                },
-                {
-                    title:      'remove snippet',
-                    element:    '.oe_snippet_remove',
-                },
-                {
-                    title:     'try to re-save',
-                    waitNot:   '#wrap .carousel',
-                    element:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     "click admin",
-                    waitFor:   'button[data-action=edit]:visible',
-                    element:   'a:contains("Administrator")',
-                },
-                {
-                    title:     "click logout",
-                    element:   '#top_menu a[href*="/logout"]',
-                },
-                {
-                    title:     "check logout",
-                    waitFor:   '#top_menu a[href*="/web/login"]',
-                },
-            ];
-            return this._super();
-        },
-    });
-    // for test without editor bar
-    website.Tour.add(website.Tour.LoginEdit);
-
-}());
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index c9dd80ff885..54cd8a73a67 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -8,6 +8,6 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin')
 
     def test_04_admin_tour_banner(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour", login='admin')
+        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour.tours.banner", login='admin')
 
 # vim:et:

From eac51857318b751cfeabcb5583557da855003f17 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 17:06:34 +0100
Subject: [PATCH 093/175] [IMP] phantom tests - phantomjs more verbose - revert
 to dumber console.log relay, dont try to be smart, just display it - json is
 only optionally parsed for errors stack dumps

bzr revid: al@openerp.com-20140316160634-hh7br4mbg01xcrpk
---
 openerp/tests/common.py      | 26 ++++++++++++++------------
 openerp/tests/phantomtest.js | 12 +++++++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 4dcd2938ffe..378191377fb 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -212,7 +212,8 @@ class HttpCase(TransactionCase):
                 # OSError, and no errno/strerror/filename, only a pair of
                 # unnamed arguments (matching errno and strerror)
                 err, _ = e.args
-                if err == errno.EINTR: continue
+                if err == errno.EINTR:
+                    continue
                 raise
 
             if ready:
@@ -224,24 +225,24 @@ class HttpCase(TransactionCase):
             # process lines
             if '\n' in buf:
                 line, buf = buf.split('\n', 1)
-
                 line = str(line)
-                if 'CoreText' in line:
-                    continue
+
+                # relay everything from console.log, even 'ok' or 'error...' lines
+                _logger.debug("phantomjs: %s", line)
+
                 if line == "ok":
                     break
                 if line.startswith("error"):
-                    line_ = line[6:]
-                    try: line_ = json.loads(line_)
-                    except ValueError: pass
+                    line_ = self.line[6:]
+                    # when error occurs the execution stack may be sent as as JSON
+                    try:
+                        line_ = json.loads(line_)
+                    except ValueError: 
+                        pass
                     self.fail(line_ or "phantomjs test failed")
 
-                try: line = json.loads(line)
-                except ValueError: pass
-                _logger.info("phantomjs: %s", line)
-
     def phantom_run(self, cmd, timeout):
-        _logger.debug('executing `%s`', ' '.join(cmd))
+        _logger.debug('phantom_run executing %s', ' '.join(cmd))
         try:
             phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         except OSError:
@@ -252,6 +253,7 @@ class HttpCase(TransactionCase):
             # kill phantomjs if phantom.exit() wasn't called in the test
             if phantom.poll() is None:
                 phantom.terminate()
+            _logger.debug("phantom_run execution finished")
 
     def phantom_jsfile(self, jsfile, timeout=30, **kw):
         options = {
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 86176402627..63a3b2e33ff 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -113,20 +113,22 @@ function PhantomTest() {
                 console.log('loaded', url, status);
                 // process ready
                 waitFor(function() {
-                    console.log("waiting for: calling page evaluate");
+                    console.log("PhantomTest.run: wait for condition: " + ready);
                     return self.page.evaluate(function (ready) {
-                        console.log("waiting for", ready);
                         var r = false;
                         try {
-                            console.log("waiting for: page evaluating ", ready);
+                            console.log("page.evaluate eval expr:", ready);
                             r = !!eval(ready);
-                        } catch(ex) { }
-                        console.log("waiting for: returning from page evaluate");
+                        } catch(ex) { 
+                        }
+                        console.log("page.evaluate eval result:", r);
                         return r;
                     }, ready);
                 // run test
                 }, function() {
+                    console.log("PhantomTest.run: condition statified, executing: " + code);
                     self.page.evaluate(function (code) { return eval(code); }, code);
+                    console.log("PhantomTest.run: execution launched, waiting for console.log('ok')...");
                 });
             }
         });

From c93b466d32fc40973827ee89363087f81b4af9c3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 17:54:42 +0100
Subject: [PATCH 094/175] [FIX] website tour, prepare for manual injection -
 reorder website.js in a choerent way - remove injectable website.tour.test.js

We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.

bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
---
 addons/website/static/src/js/website.js       | 243 +++++++++---------
 .../static/src/js/website.tour.test.js        |  34 ---
 addons/website_sale/tests/test_ui.py          |   5 +-
 3 files changed, 129 insertions(+), 153 deletions(-)
 delete mode 100644 addons/website/static/src/js/website.tour.test.js

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 249058d91fb..065928df1cf 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -2,9 +2,11 @@
     "use strict";
 
     var website = {};
-    // The following line can be removed in 2017
     openerp.website = website;
 
+    /* ----------------------------------------------------
+       Helpers
+       ---------------------------------------------------- */ 
     website.get_context = function (dict) {
         var html = document.documentElement;
         return _.extend({
@@ -34,26 +36,11 @@
         }
         return parsedSearch;
     };
+
     website.parseHash = function () {
         return website.parseQS(window.location.hash.substring(1));
     };
 
-    /* ----- TEMPLATE LOADING ---- */
-    var templates_def = $.Deferred().resolve();
-    website.add_template_file = function(template) {
-        templates_def = templates_def.then(function() {
-            var def = $.Deferred();
-            openerp.qweb.add_template(template, function(err) {
-                if (err) {
-                    def.reject(err);
-                } else {
-                    def.resolve();
-                }
-            });
-            return def;
-        });
-    };
-    website.add_template_file('/website/static/src/xml/website.xml');
     website.reload = function () {
         location.hash = "scrollTop=" + window.document.body.scrollTop;
         if (location.search.indexOf("enable_editor") > -1) {
@@ -63,103 +50,9 @@
         }
     };
 
-    var all_ready = null;
-    var dom_ready = website.dom_ready = $.Deferred();
-    $(document).ready(function () {
-        website.is_editable = website.is_editable || $('html').data('editable');
-        website.is_editable_button= website.is_editable_button || $('html').data('editable');
-        dom_ready.resolve();
-        // fix for ie
-        if($.fn.placeholder) $('input, textarea').placeholder();
-    });
-
-    website.init_kanban = function ($kanban) {
-        $('.js_kanban_col', $kanban).each(function () {
-            var $col = $(this);
-            var $pagination = $('.pagination', $col);
-            if(!$pagination.size()) {
-                return;
-            }
-
-            var page_count =  $col.data('page_count');
-            var scope = $pagination.last().find("li").size()-2;
-            var kanban_url_col = $pagination.find("li a:first").attr("href").replace(/[0-9]+$/, '');
-
-            var data = {
-                'domain': $col.data('domain'),
-                'model': $col.data('model'),
-                'template': $col.data('template'),
-                'step': $col.data('step'),
-                'orderby': $col.data('orderby')
-            };
-
-            $pagination.on('click', 'a', function (ev) {
-                ev.preventDefault();
-                var $a = $(ev.target);
-                if($a.parent().hasClass('active')) {
-                    return;
-                }
-
-                var page = +$a.attr("href").split(",").pop().split('-')[1];
-                data['page'] = page;
-
-                $.post('/website/kanban/', data, function (col) {
-                    $col.find("> .thumbnail").remove();
-                    $pagination.last().before(col);
-                });
-
-                var page_start = page - parseInt(Math.floor((scope-1)/2), 10);
-                if (page_start < 1 ) page_start = 1;
-                var page_end = page_start + (scope-1);
-                if (page_end > page_count ) page_end = page_count;
-
-                if (page_end - page_start < scope) {
-                    page_start = page_end - scope > 0 ? page_end - scope : 1;
-                }
-
-                $pagination.find('li.prev a').attr("href", kanban_url_col+(page-1 > 0 ? page-1 : 1));
-                $pagination.find('li.next a').attr("href", kanban_url_col+(page < page_end ? page+1 : page_end));
-                for(var i=0; i < scope; i++) {
-                    $pagination.find('li:not(.prev):not(.next):eq('+i+') a').attr("href", kanban_url_col+(page_start+i)).html(page_start+i);
-                }
-                $pagination.find('li.active').removeClass('active');
-                $pagination.find('li:has(a[href="'+kanban_url_col+page+'"])').addClass('active');
-
-            });
-
-        });
-    };
-
-    /**
-     * Returns a deferred resolved when the templates are loaded
-     * and the Widgets can be instanciated.
-     */
-    website.ready = function() {
-        if (!all_ready) {
-            all_ready = dom_ready.then(function () {
-                return templates_def;
-            }).then(function () {
-                if (website.is_editable) {
-                    website.id = $('html').data('website-id');
-                    website.session = new openerp.Session();
-                    var modules = ['website'];
-                    return openerp._t.database.load_translations(website.session, modules, website.get_context().lang);
-                }
-            }).promise();
-        }
-        return all_ready;
-    };
-
-    website.error = function(data, url) {
-        var $error = $(openerp.qweb.render('website.error_dialog', {
-            'title': data.data ? data.data.arguments[0] : "",
-            'message': data.data ? data.data.arguments[1] : data.statusText,
-            'backend_url': url
-        }));
-        $error.appendTo("body");
-        $error.modal('show');
-    };
-
+    /* ----------------------------------------------------
+       Widgets
+       ---------------------------------------------------- */ 
     website.prompt = function (options) {
         /**
          * A bootstrapped version of prompt() albeit asynchronous
@@ -250,6 +143,16 @@
         return def;
     };
 
+    website.error = function(data, url) {
+        var $error = $(openerp.qweb.render('website.error_dialog', {
+            'title': data.data ? data.data.arguments[0] : "",
+            'message': data.data ? data.data.arguments[1] : data.statusText,
+            'backend_url': url
+        }));
+        $error.appendTo("body");
+        $error.modal('show');
+    };
+
     website.form = function (url, method, params) {
         var form = document.createElement('form');
         form.setAttribute('action', url);
@@ -265,11 +168,117 @@
         form.submit();
     };
 
-    dom_ready.then(function () {
+    website.init_kanban = function ($kanban) {
+        $('.js_kanban_col', $kanban).each(function () {
+            var $col = $(this);
+            var $pagination = $('.pagination', $col);
+            if(!$pagination.size()) {
+                return;
+            }
 
-        /* ----- BOOTSTRAP  STUFF ---- */
-        // $('.js_tooltip').bstooltip();
+            var page_count =  $col.data('page_count');
+            var scope = $pagination.last().find("li").size()-2;
+            var kanban_url_col = $pagination.find("li a:first").attr("href").replace(/[0-9]+$/, '');
 
+            var data = {
+                'domain': $col.data('domain'),
+                'model': $col.data('model'),
+                'template': $col.data('template'),
+                'step': $col.data('step'),
+                'orderby': $col.data('orderby')
+            };
+
+            $pagination.on('click', 'a', function (ev) {
+                ev.preventDefault();
+                var $a = $(ev.target);
+                if($a.parent().hasClass('active')) {
+                    return;
+                }
+
+                var page = +$a.attr("href").split(",").pop().split('-')[1];
+                data['page'] = page;
+
+                $.post('/website/kanban/', data, function (col) {
+                    $col.find("> .thumbnail").remove();
+                    $pagination.last().before(col);
+                });
+
+                var page_start = page - parseInt(Math.floor((scope-1)/2), 10);
+                if (page_start < 1 ) page_start = 1;
+                var page_end = page_start + (scope-1);
+                if (page_end > page_count ) page_end = page_count;
+
+                if (page_end - page_start < scope) {
+                    page_start = page_end - scope > 0 ? page_end - scope : 1;
+                }
+
+                $pagination.find('li.prev a').attr("href", kanban_url_col+(page-1 > 0 ? page-1 : 1));
+                $pagination.find('li.next a').attr("href", kanban_url_col+(page < page_end ? page+1 : page_end));
+                for(var i=0; i < scope; i++) {
+                    $pagination.find('li:not(.prev):not(.next):eq('+i+') a').attr("href", kanban_url_col+(page_start+i)).html(page_start+i);
+                }
+                $pagination.find('li.active').removeClass('active');
+                $pagination.find('li:has(a[href="'+kanban_url_col+page+'"])').addClass('active');
+
+            });
+
+        });
+    };
+
+    /* ----------------------------------------------------
+       Async Ready and Template loading
+       ---------------------------------------------------- */ 
+    var templates_def = $.Deferred().resolve();
+    website.add_template_file = function(template) {
+        templates_def = templates_def.then(function() {
+            var def = $.Deferred();
+            openerp.qweb.add_template(template, function(err) {
+                if (err) {
+                    def.reject(err);
+                } else {
+                    def.resolve();
+                }
+            });
+            return def;
+        });
+    };
+    website.add_template_file('/website/static/src/xml/website.xml');
+
+    website.dom_ready = $.Deferred();
+    $(document).ready(function () {
+        website.is_editable = website.is_editable || $('html').data('editable');
+        website.is_editable_button= website.is_editable_button || $('html').data('editable');
+        website.dom_ready.resolve();
+        // fix for ie
+        if($.fn.placeholder) $('input, textarea').placeholder();
+    });
+
+    var all_ready = null;
+    /**
+     * Returns a deferred resolved when the templates are loaded
+     * and the Widgets can be instanciated.
+     */
+    website.ready = function() {
+        if (!all_ready) {
+            all_ready = website.dom_ready.then(function () {
+                return templates_def;
+            }).then(function () {
+                if (website.is_editable) {
+                    website.id = $('html').data('website-id');
+                    website.session = new openerp.Session();
+                    var modules = ['website'];
+                    return openerp._t.database.load_translations(website.session, modules, website.get_context().lang);
+                }
+            }).promise();
+        }
+        return all_ready;
+    };
+
+    website.inject_tour = function() {
+        // if a tour is active inject tour js
+    }
+
+    website.dom_ready.then(function () {
         /* ----- PUBLISHING STUFF ---- */
         $(document).on('click', '.js_publish_management .js_publish_btn', function () {
             var $data = $(this).parents(".js_publish_management:first");
diff --git a/addons/website/static/src/js/website.tour.test.js b/addons/website/static/src/js/website.tour.test.js
deleted file mode 100644
index 3e85ce20dae..00000000000
--- a/addons/website/static/src/js/website.tour.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function () {
-
-function LoadScript(src) {
-    xmlHttp = new XMLHttpRequest();
-    xmlHttp.onreadystatechange = function() {
-        if(xmlHttp.readyState == 4) {
-            if (xmlHttp.status == 200 || xmlHttp.status == 304) {
-                new Function(xmlHttp.responseText)();
-            } else {
-                throw new Error("Can't load JavaScript.\nhref: " + window.location.href + "\nsrc: " + src);
-            }
-        }
-    };
-    xmlHttp.open("GET", src, false);
-    xmlHttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-    xmlHttp.send(null);
-}
-
-if (typeof jQuery === "undefined")
-    LoadScript("/web/static/lib/jquery/jquery.js");
-if (typeof _ === "undefined")
-    LoadScript("/web/static/lib/underscore/underscore.js");
-if (typeof openerp === "undefined") {
-    LoadScript("/web/static/lib/qweb/qweb2.js");
-    LoadScript("/web/static/src/js/openerpframework.js");
-}
-if (typeof openerp === "undefined" || !openerp.website || !openerp.website.add_template_file)
-    LoadScript("/website/static/src/js/website.js");
-if (typeof Tour === "undefined")
-    LoadScript("/website/static/lib/bootstrap-tour/bootstrap-tour.js");
-if (typeof openerp === "undefined" || !openerp.website.Tour)
-    LoadScript("/website/static/src/js/website.tour.js");
-
-})();
\ No newline at end of file
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index b024e405a1c..3d9be08b117 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -14,11 +14,12 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
     def test_02_admin_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="admin")
 
     def test_03_demo_checkout(self):
+        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
 
-    @unittest2.expectedFailure
     def test_04_public_checkout(self):
+        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)

From af216148ca8e65676698f5072c533a788d61bd01 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 18:34:06 +0100
Subject: [PATCH 095/175] [REM] separate command to run test, as --test-enable
 now works

bzr revid: al@openerp.com-20140316173406-ow8q7kayp1mw42b6
---
 addons/web/cli/__init__.py |  1 -
 addons/web/cli/test_js.py  | 35 -----------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 addons/web/cli/__init__.py
 delete mode 100644 addons/web/cli/test_js.py

diff --git a/addons/web/cli/__init__.py b/addons/web/cli/__init__.py
deleted file mode 100644
index 823c140bb79..00000000000
--- a/addons/web/cli/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import test_js
diff --git a/addons/web/cli/test_js.py b/addons/web/cli/test_js.py
deleted file mode 100644
index b3a8e634b72..00000000000
--- a/addons/web/cli/test_js.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import logging
-import optparse
-import sys
-
-import unittest2
-
-import openerp
-import openerp.addons.web.tests
-
-_logger = logging.getLogger(__name__)
-
-class TestJs(openerp.cli.Command):
-    def run(self, args):
-        self.parser = parser = optparse.OptionParser()
-        parser.add_option("-d", "--database", dest="db_name", default=False, help="specify the database name")
-        parser.add_option("--xmlrpc-port", dest="xmlrpc_port", default=8069, help="specify the TCP port for the XML-RPC protocol", type="int")
-        # proably need to add both --superadmin-password and --database-admin-password
-        self.parser.parse_args(args)
-
-        # test ony uses db_name xmlrpc_port admin_passwd, so use the server one for the actual parsing
-
-        config = openerp.tools.config
-        config.parse_config(args)
-        # needed until runbot is fixed
-        config['db_password'] = config['admin_passwd']
-
-        # run js tests
-        openerp.netsvc.init_alternative_logger()
-        suite = unittest2.TestSuite()
-        suite.addTests(unittest2.TestLoader().loadTestsFromModule(openerp.addons.web.tests.test_js))
-        r = unittest2.TextTestRunner(verbosity=2).run(suite)
-        if r.errors or r.failures:
-            sys.exit(1)
-
-# vim:et:ts=4:sw=4:

From af1c00ac3bb6e75ae4edb6596957f6c4a28de249 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 18:39:11 +0100
Subject: [PATCH 096/175] [FIX] typo remove import

bzr revid: al@openerp.com-20140316173911-e4z89t8bgoxvz6bl
---
 addons/web/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 5a0289cef6d..8f0b06e4662 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -6,6 +6,5 @@ sys.modules['openerp.addons.web.http'] = openerp.http
 http = openerp.http
 
 import controllers
-import cli
 
 wsgi_postload = http.wsgi_postload

From ddf66c0621e28a4407d6b7531f91ff5c19acd148 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 19:18:51 +0100
Subject: [PATCH 097/175] [FIX] website_mail_group remove demo from manifest

bzr revid: al@openerp.com-20140316181851-qn8cuk5lwqec5fts
---
 addons/website_mail_group/__openerp__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 5c9ff3190b6..f83fc38ce7c 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -13,9 +13,6 @@ OpenERP Mail Group : Mailing List Archives
     'data': [
         'views/website_mail_group.xml'
     ],
-    'demo': [
-        'data/website_mail_group_demo.xml'
-    ],
     'qweb': [],
     'installable': True,
 }

From e9d047e6119d8065a8d31a7d3b374630ab90c40d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 19:29:33 +0100
Subject: [PATCH 098/175] sql loggin cleanups - prepare for netsvc will be
 renamed to logging - move back log from http.py has it's used by the cron -
 move sql handler to netsvc, simplify to use sql_db - remove unused handler -
 close plaform specific #ifdef pandora's box

bzr revid: al@openerp.com-20140316182933-jkcji9yqfbsokcmg
---
 openerp/http.py             |  16 +-----
 openerp/loggers/__init__.py |   1 -
 openerp/loggers/handlers.py | 107 ------------------------------------
 openerp/netsvc.py           |  97 +++++++++++++++++---------------
 openerp/tools/config.py     |   4 +-
 5 files changed, 58 insertions(+), 167 deletions(-)
 delete mode 100644 openerp/loggers/__init__.py
 delete mode 100644 openerp/loggers/handlers.py

diff --git a/openerp/http.py b/openerp/http.py
index ac5ad3495da..b6e87e26f81 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -21,7 +21,6 @@ import time
 import traceback
 import urlparse
 import warnings
-from pprint import pformat
 
 import babel.core
 import psutil
@@ -36,9 +35,7 @@ import werkzeug.wrappers
 import werkzeug.wsgi
 
 import openerp
-import openerp.netsvc
 from openerp.service import security, model as service_model
-import openerp.tools
 
 _logger = logging.getLogger(__name__)
 
@@ -61,13 +58,6 @@ def replace_request_password(args):
         args[2] = '*'
     return tuple(args)
 
-def log(logger, level, prefix, msg, depth=None):
-    indent=''
-    indent_after=' '*len(prefix)
-    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
-        logger.log(level, indent+line)
-        indent=indent_after
-
 def dispatch_rpc(service_name, method, params):
     """ Handle a RPC call.
 
@@ -84,7 +74,7 @@ def dispatch_rpc(service_name, method, params):
             start_rss, start_vms = 0, 0
             start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
             if rpc_request and rpc_response_flag:
-                log(rpc_request, logging.DEBUG, '%s.%s' % (service_name, method), replace_request_password(params))
+                openerp.netsvc.log(rpc_request, logging.DEBUG, '%s.%s' % (service_name, method), replace_request_password(params))
 
         threading.current_thread().uid = None
         threading.current_thread().dbname = None
@@ -106,9 +96,9 @@ def dispatch_rpc(service_name, method, params):
             end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
             logline = '%s.%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (service_name, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
             if rpc_response_flag:
-                log(rpc_response, logging.DEBUG, logline, result)
+                openerp.netsvc.log(rpc_response, logging.DEBUG, logline, result)
             else:
-                log(rpc_request, logging.DEBUG, logline, replace_request_password(params), depth=1)
+                openerp.netsvc.log(rpc_request, logging.DEBUG, logline, replace_request_password(params), depth=1)
 
         return result
     except (openerp.osv.orm.except_orm, openerp.exceptions.AccessError, \
diff --git a/openerp/loggers/__init__.py b/openerp/loggers/__init__.py
deleted file mode 100644
index 19b76b55b64..00000000000
--- a/openerp/loggers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from handlers import PostgreSQLHandler
\ No newline at end of file
diff --git a/openerp/loggers/handlers.py b/openerp/loggers/handlers.py
deleted file mode 100644
index 24be46085c8..00000000000
--- a/openerp/loggers/handlers.py
+++ /dev/null
@@ -1,107 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2014 OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import contextlib
-import datetime
-import logging
-import threading
-
-import psycopg2
-
-from openerp import tools 
-
-# The PostgreSQL Handler for the logging module, will be used by OpenERP to store the logs 
-# in the database, --log-pgsql-database=YOUR_DBNAME
-# By default the system will use the current database
-
-class NoDatabaseError(Exception):
-    pass
-
-class PostgreSQLHandler(logging.Handler):
-    @contextlib.contextmanager
-    def create_connection(self):
-        db_name = None
-
-        db_name_from_cli = tools.config['log_pgsql_database']
-        if not db_name_from_cli:
-            # If there is no database, and only in this case, we are going to use the database 
-            # from the current thread and create a connection to this database.
-
-            current_thread = threading.current_thread()
-
-            db_name_from_thread = getattr(current_thread, 'dbname', None)
-            if isinstance(db_name_from_thread, basestring):
-                db_name = db_name_from_thread
-        else:
-            db_name = db_name_from_cli
-
-        if not db_name:
-            raise NoDatabaseError("There is no defined database on this request")
-
-        parameters = {
-            'user': tools.config['db_user'] or None,
-            'password': tools.config['db_password'] or None,
-            'host': tools.config['db_host'] or None,
-            'port': tools.config['db_port'] or None,
-            'database': db_name,
-        }
-        try:
-            connection = psycopg2.connect(**parameters)
-
-            if connection:
-                yield connection
-        except Exception, ex:  # Use a specific exception
-            print ex
-
-    def _internal_emit(self, record):
-        with self.create_connection() as conn:
-            exception = False
-            if record.exc_info:
-                exception = record.exc_text
-
-            now = datetime.datetime.utcnow()
-
-            current_thread = threading.current_thread()
-            uid = getattr(current_thread, 'uid', False)
-            dbname = getattr(current_thread, 'dbname', False)
-
-            parameters = (
-                now, uid, now, uid, 'server', dbname, record.name,
-                logging.getLevelName(record.levelno), record.msg, exception,
-                record.filename, record.funcName, record.lineno
-            )
-
-            with conn.cursor() as cursor:
-                cursor.execute("""
-                    INSERT INTO ir_logging(
-                        create_date, create_uid, write_date, write_uid,
-                        type, dbname, name, level, message, exception, path, func,
-                        line
-                    )
-                    VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
-                    """, parameters)
-                conn.commit()
-
-    def emit(self, record):
-        # We use a context manager to be tolerant to the errors (error of connections,...)
-        try:
-            self._internal_emit(record)
-        except NoDatabaseError:
-            pass
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 250cd52a1d1..a2c8f687f0f 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -19,20 +19,32 @@
 #
 ##############################################################################
 
-
+import contextlib
 import logging
 import logging.handlers
 import os
+import platform
 import release
 import sys
 import threading
+from pprint import pformat
+
+import psycopg2
 
 import tools
 import openerp
-import openerp.loggers
+import sql_db
+
 
 _logger = logging.getLogger(__name__)
 
+def log(logger, level, prefix, msg, depth=None):
+    indent=''
+    indent_after=' '*len(prefix)
+    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
+        logger.log(level, indent+line)
+        indent=indent_after
+
 def LocalService(name):
     """
     The openerp.netsvc.LocalService() function is deprecated. It still works
@@ -59,6 +71,38 @@ def LocalService(name):
                 with registry.cursor() as cr:
                     return registry['ir.actions.report.xml']._lookup_report(cr, name[len('report.'):])
 
+class PostgreSQLHandler(logging.Handler):
+    """ PostgreSQL Loggin Handler will store logs in the database, by default
+    the current database, can be set using --log-db=DBNAME
+    """
+    def emit(self, record):
+        print "Emit PG", record
+        ct = threading.current_thread()
+        ct_db = getattr(ct, 'dbname')
+        ct_uid = getattr(ct, 'uid')
+        dbname = tools.config['log_db'] or ct_db
+        if dbname:
+            cr = None
+            try:
+                cr = sql_db.db_connect(dbname).cursor()
+                exception = False
+                if record.exc_info:
+                    exception = record.exc_text
+                level = logging.getLevelName(record.levelno)
+                val = (uid, uid, 'server', dbname, record.name, level, record.msg, exception, record.filename, record.funcName, record.lineno)
+                cr.execute("""
+                    INSERT INTO ir_logging(create_date, write_date, create_uid, write_uid, type, dbname, name, level, message, exception, path, func, line)
+                    VALUES (NOW() at time zone 'UTC', NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+                """, val )
+                cr.commit()
+            except Exception, e:
+                print "Exception",e
+                print repr(e)
+                pass
+            finally:
+                if cr:
+                    cr.close()
+
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, _NOTHING, DEFAULT = range(10)
 #The background is set with 40 plus the number of the color, and the foreground with 30
 #These are the sequences need to get colored ouput
@@ -86,19 +130,6 @@ class ColoredFormatter(DBFormatter):
         record.levelname = COLOR_PATTERN % (30 + fg_color, 40 + bg_color, record.levelname)
         return DBFormatter.format(self, record)
 
-import platform
-def is_posix_operating_system():
-    return os.name == 'posix'
-
-def is_windows_operating_system():
-    return os.name == 'nt'
-
-def is_linux_operating_system():
-    return is_posix_operating_system() and platform.system() == 'Linux'
-
-def is_macosx_operating_system():
-    return is_posix_operating_system() and platform.system() == 'Darwin'
-
 def init_logger():
     from tools.translate import resetlocale
     resetlocale()
@@ -108,15 +139,10 @@ def init_logger():
 
     if tools.config['syslog']:
         # SysLog Handler
-        if is_windows_operating_system():
+        if os.name == 'nt':
             handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
-        elif is_linux_operating_system():
-            handler = logging.handlers.SysLogHandler('/dev/log')
-        elif is_macosx_operating_system():  # There is no /dev/log on OSX
-            handler = logging.handlers.SysLogHandler('/var/run/log')
         else:
-            raise Exception("There is no syslog handler for this Operating System: %s", platform.system())
-
+            handler = logging.handlers.SysLogHandler()
         format = '%s %s' % (release.description, release.version) + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
 
     elif tools.config['logfile']:
@@ -130,12 +156,11 @@ def init_logger():
 
             if tools.config['logrotate'] is not False:
                 handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
-
-            elif is_posix_operating_system():
+            elif os.name == 'posix':
                 handler = logging.handlers.WatchedFileHandler(logf)
-
             else:
                 handler = logging.handlers.FileHandler(logf)
+
         except Exception:
             sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
             handler = logging.StreamHandler(sys.stdout)
@@ -147,10 +172,10 @@ def init_logger():
     # behind Apache with mod_wsgi, handler.stream will have type mod_wsgi.Log,
     # which has no fileno() method. (mod_wsgi.Log is what is being bound to
     # sys.stderr when the logging.StreamHandler is being constructed above.)
-    def has_fileno(stream):
+    def is_a_tty(stream):
         return hasattr(stream, 'fileno') and os.isatty(stream.fileno())
 
-    if isinstance(handler, logging.StreamHandler) and has_fileno(handler.stream):
+    if isinstance(handler, logging.StreamHandler) and is_a_tty(handler.stream):
         formatter = ColoredFormatter(format)
     else:
         formatter = DBFormatter(format)
@@ -165,9 +190,7 @@ def init_logger():
     logging_configurations = DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig
     for logconfig_item in logging_configurations:
         loggername, level = logconfig_item.split(':')
-
         level = getattr(logging, level, logging.INFO)
-        
         logger = logging.getLogger(loggername)
         logger.handlers = []
         logger.setLevel(level)
@@ -175,9 +198,8 @@ def init_logger():
         if loggername != '':
             logger.propagate = False
 
-    # magic ;-)
     # we manage the connection in the postgresqlhandler
-    postgresqlHandler = openerp.loggers.handlers.PostgreSQLHandler()
+    postgresqlHandler = PostgreSQLHandler()
     postgresqlHandler.setLevel(logging.WARNING)
     logger = logging.getLogger()
     logger.addHandler(postgresqlHandler)
@@ -204,17 +226,4 @@ PSEUDOCONFIG_MAPPER = {
     'critical': ['openerp:CRITICAL'],
 }
 
-# A alternative logging scheme for automated runs of the
-# server intended to test it.
-def init_alternative_logger():
-    class H(logging.Handler):
-        def emit(self, record):
-            if record.levelno > 20:
-                print record.levelno, record.pathname, record.msg
-    handler = H()
-    # Add the handler to the 'openerp' logger.
-    logger = logging.getLogger('openerp')
-    logger.addHandler(handler)
-    logger.setLevel(logging.ERROR)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 998e3163355..8963720fda0 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#openerp.loggers.handlers. -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -187,7 +187,7 @@ class configmanager(object):
         group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
         group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
-        group.add_option('--log-pgsql-database', dest='log_pgsql_database', help="database where OpenERP will store the exceptions", my_default=False)
+        group.add_option('--log-db', dest='log_db', help="database where OpenERP will store the exceptions", my_default=False)
         # For backward-compatibility, map the old log levels to something
         # quite close.
         levels = [

From eaacd8a4d88877008edf7800357e55a62c9e0a76 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 20:16:22 +0100
Subject: [PATCH 099/175] ir_logging make it work, and make it usable

bzr revid: al@openerp.com-20140316191622-l59vkjeu2e8nbh75
---
 openerp/addons/base/ir/ir_logging.py       | 11 ++------
 openerp/addons/base/ir/ir_logging_view.xml | 31 ++++++++++-----------
 openerp/netsvc.py                          | 32 ++++++++++------------
 3 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/openerp/addons/base/ir/ir_logging.py b/openerp/addons/base/ir/ir_logging.py
index 66708aa729a..a2b4e606290 100644
--- a/openerp/addons/base/ir/ir_logging.py
+++ b/openerp/addons/base/ir/ir_logging.py
@@ -24,6 +24,7 @@ from openerp.tools.translate import _
 
 class ir_logging(osv.Model):
     _name = 'ir.logging'
+    _order = 'id DESC'
 
     EXCEPTIONS_TYPE = [
         ('client', 'Client'),
@@ -31,22 +32,14 @@ class ir_logging(osv.Model):
     ]
 
     _columns = {
+        'create_date': fields.datetime('Create Date', readonly=True),
         'name': fields.char('Name', required=True),
         'type': fields.selection(EXCEPTIONS_TYPE, string='Type', required=True, select=True),
         'dbname': fields.char('Database Name'),
         'level': fields.char('Level'),
         'message': fields.text('Message', required=True),
-        'exception': fields.text('Exception'),
         'path': fields.char('Path', required=True),
         'func': fields.char('Function', required=True),
         'line': fields.char('Line', required=True),
     }
 
-    def call_function(self, cr, uid, ids, context=None):
-        logger = logging.getLogger()
-        logger.error("I think there is an error")
-        try:
-            raise Exception("I want to kill your process...")
-        except Exception, ex:
-            logger.exception("Please log me into the database")
-        return True
\ No newline at end of file
diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
index d23e45f1d14..1fa5170387a 100644
--- a/openerp/addons/base/ir/ir_logging_view.xml
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -5,17 +5,17 @@
             <field name="model">ir.logging</field>
             <field name="arch" type="xml">
                 <form string="Log" version="7.0">
-                    <sheet>
-                        <field name="name" />
-                        <field name="type" />
+                    <group>
+                        <field name="create_date" />
                         <field name="dbname" />
+                        <field name="type" />
+                        <field name="name" />
                         <field name="level" />
-                        <field name="message" />
-                        <field name="exception" />
                         <field name="path" />
-                        <field name="func" />
                         <field name="line" />
-                    </sheet>
+                        <field name="func" />
+                        <field name="message" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -23,13 +23,14 @@
             <field name="model">ir.logging</field>
             <field name="arch" type="xml">
                 <tree string="Logs" version="7.0">
-                    <field name="level" />
-                    <field name="type" />
+                    <field name="create_date" />
                     <field name="dbname" />
+                    <field name="type" />
                     <field name="name" />
+                    <field name="level" />
                     <field name="path" />
-                    <field name="func" />
                     <field name="line" />
+                    <field name="func" />
                 </tree>
             </field>
         </record>
@@ -37,11 +38,11 @@
             <field name="model">ir.logging</field>
             <field name="arch" type="xml">
                 <search string="Logs">
-                    <field name="name" />
-                    <field name="level" />
                     <field name="dbname" />
                     <field name="type" />
-
+                    <field name="name" />
+                    <field name="level" />
+                    <field name="message" />
                     <group expand="0" string="Group By...">
                         <filter string="Database" domain="[]" context="{'group_by': 'dbname'}" />
                         <filter string="Level" domain="[]" context="{'group_by': 'level'}" />
@@ -50,7 +51,6 @@
                 </search>
             </field>
         </record>
-
         <record model="ir.actions.act_window" id="ir_logging_all_act">
             <field name="name">Logging</field>
             <field name="res_model">ir.logging</field>
@@ -58,8 +58,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="ir_logging_search_view" />
         </record>
-
         <menuitem parent="base.menu_custom" id="ir_logging_all_menu" action="ir_logging_all_act" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index a2c8f687f0f..af45301dbb4 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -76,28 +76,26 @@ class PostgreSQLHandler(logging.Handler):
     the current database, can be set using --log-db=DBNAME
     """
     def emit(self, record):
-        print "Emit PG", record
         ct = threading.current_thread()
-        ct_db = getattr(ct, 'dbname')
-        ct_uid = getattr(ct, 'uid')
+        ct_db = getattr(ct, 'dbname', None)
+        ct_uid = getattr(ct, 'uid', None)
         dbname = tools.config['log_db'] or ct_db
         if dbname:
             cr = None
             try:
                 cr = sql_db.db_connect(dbname).cursor()
-                exception = False
-                if record.exc_info:
-                    exception = record.exc_text
+                msg = record.msg
+                traceback = getattr(record, 'exc_text', '')
+                if traceback:
+                    msg = "%s\n%s" % (msg, traceback)
                 level = logging.getLevelName(record.levelno)
-                val = (uid, uid, 'server', dbname, record.name, level, record.msg, exception, record.filename, record.funcName, record.lineno)
+                val = (ct_uid, ct_uid, 'server', dbname, record.name, level, msg, record.pathname, record.lineno, record.funcName)
                 cr.execute("""
-                    INSERT INTO ir_logging(create_date, write_date, create_uid, write_uid, type, dbname, name, level, message, exception, path, func, line)
-                    VALUES (NOW() at time zone 'UTC', NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+                    INSERT INTO ir_logging(create_date, write_date, create_uid, write_uid, type, dbname, name, level, message, path, line, func)
+                    VALUES (NOW() at time zone 'UTC', NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
                 """, val )
                 cr.commit()
             except Exception, e:
-                print "Exception",e
-                print repr(e)
                 pass
             finally:
                 if cr:
@@ -187,6 +185,9 @@ def init_logger():
 
     logconfig = tools.config['log_handler']
 
+    postgresqlHandler = PostgreSQLHandler()
+    postgresqlHandler.setLevel(logging.WARNING)
+
     logging_configurations = DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig
     for logconfig_item in logging_configurations:
         loggername, level = logconfig_item.split(':')
@@ -195,18 +196,15 @@ def init_logger():
         logger.handlers = []
         logger.setLevel(level)
         logger.addHandler(handler)
+        logger.addHandler(postgresqlHandler)
         if loggername != '':
             logger.propagate = False
 
-    # we manage the connection in the postgresqlhandler
-    postgresqlHandler = PostgreSQLHandler()
-    postgresqlHandler.setLevel(logging.WARNING)
-    logger = logging.getLogger()
-    logger.addHandler(postgresqlHandler)
-
     for logconfig_item in logging_configurations:
         _logger.debug('logger level set: "%s"', logconfig_item)
 
+
+
 DEFAULT_LOG_CONFIGURATION = [
     'openerp.workflow.workitem:WARNING',
     'openerp.netsvc.rpc.request:INFO',

From 58fb28746a6f7921f4334694a37d31dd6bb376a6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 20:22:23 +0100
Subject: [PATCH 100/175] ir_logging, cleanup and minimize merge diff

bzr revid: al@openerp.com-20140316192223-gfxzbo83j5hpm527
---
 openerp/netsvc.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index af45301dbb4..579f495d56b 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -19,11 +19,9 @@
 #
 ##############################################################################
 
-import contextlib
 import logging
 import logging.handlers
 import os
-import platform
 import release
 import sys
 import threading
@@ -35,7 +33,6 @@ import tools
 import openerp
 import sql_db
 
-
 _logger = logging.getLogger(__name__)
 
 def log(logger, level, prefix, msg, depth=None):
@@ -141,7 +138,8 @@ def init_logger():
             handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
         else:
             handler = logging.handlers.SysLogHandler()
-        format = '%s %s' % (release.description, release.version) + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
+        format = '%s %s' % (release.description, release.version) \
+                + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
 
     elif tools.config['logfile']:
         # LogFile Handler
@@ -151,14 +149,12 @@ def init_logger():
             dirname = os.path.dirname(logf)
             if dirname and not os.path.isdir(dirname):
                 os.makedirs(dirname)
-
             if tools.config['logrotate'] is not False:
                 handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
             elif os.name == 'posix':
                 handler = logging.handlers.WatchedFileHandler(logf)
             else:
                 handler = logging.handlers.FileHandler(logf)
-
         except Exception:
             sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
             handler = logging.StreamHandler(sys.stdout)
@@ -177,7 +173,6 @@ def init_logger():
         formatter = ColoredFormatter(format)
     else:
         formatter = DBFormatter(format)
-
     handler.setFormatter(formatter)
 
     # Configure handlers
@@ -203,8 +198,6 @@ def init_logger():
     for logconfig_item in logging_configurations:
         _logger.debug('logger level set: "%s"', logconfig_item)
 
-
-
 DEFAULT_LOG_CONFIGURATION = [
     'openerp.workflow.workitem:WARNING',
     'openerp.netsvc.rpc.request:INFO',

From 99a89152b4b21ab4eee46408ccaffb9fb7db619d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 20:29:37 +0100
Subject: [PATCH 101/175] ir_logging, improve search view

bzr revid: al@openerp.com-20140316192937-q1rxct0hhlwpm2t0
---
 openerp/addons/base/ir/ir_logging_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
index 1fa5170387a..afc7a07f3aa 100644
--- a/openerp/addons/base/ir/ir_logging_view.xml
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -47,6 +47,8 @@
                         <filter string="Database" domain="[]" context="{'group_by': 'dbname'}" />
                         <filter string="Level" domain="[]" context="{'group_by': 'level'}" />
                         <filter string="Type" domain="[]" context="{'group_by': 'type'}" />
+                        <filter string="Month" domain="[]" context="{'group_by': 'create_date'}" />
+                        <filter string="Day" domain="[]" context="{'group_by': 'create_date:day'}" />
                     </group>
                 </search>
             </field>

From aa7d42acfc43465049665405dfec81d185e23403 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 20:43:28 +0100
Subject: [PATCH 102/175] ir_logging fix msg, add uid in form view

bzr revid: al@openerp.com-20140316194328-3tooio3km8ev26wj
---
 openerp/addons/base/ir/ir_logging_view.xml | 2 +-
 openerp/netsvc.py                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
index afc7a07f3aa..f963fc0d393 100644
--- a/openerp/addons/base/ir/ir_logging_view.xml
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -24,6 +24,7 @@
             <field name="arch" type="xml">
                 <tree string="Logs" version="7.0">
                     <field name="create_date" />
+                    <field name="create_uid" />
                     <field name="dbname" />
                     <field name="type" />
                     <field name="name" />
@@ -61,6 +62,5 @@
             <field name="search_view_id" ref="ir_logging_search_view" />
         </record>
         <menuitem parent="base.menu_custom" id="ir_logging_all_menu" action="ir_logging_all_act" />
-
     </data>
 </openerp>
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 579f495d56b..3de345a0adf 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -81,7 +81,7 @@ class PostgreSQLHandler(logging.Handler):
             cr = None
             try:
                 cr = sql_db.db_connect(dbname).cursor()
-                msg = record.msg
+                msg = unicode(record.msg)
                 traceback = getattr(record, 'exc_text', '')
                 if traceback:
                     msg = "%s\n%s" % (msg, traceback)

From 97a097dbab2c120485fd7228e8b9725e71fd636a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 20:52:52 +0100
Subject: [PATCH 103/175] [IMP] tests log phantom to info the default loglevel
 of runbot

bzr revid: al@openerp.com-20140316195252-i6wr3scp0zmx92zu
---
 openerp/tests/common.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 378191377fb..9845d2be86d 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -228,7 +228,7 @@ class HttpCase(TransactionCase):
                 line = str(line)
 
                 # relay everything from console.log, even 'ok' or 'error...' lines
-                _logger.debug("phantomjs: %s", line)
+                _logger.info("phantomjs: %s", line)
 
                 if line == "ok":
                     break
@@ -242,7 +242,7 @@ class HttpCase(TransactionCase):
                     self.fail(line_ or "phantomjs test failed")
 
     def phantom_run(self, cmd, timeout):
-        _logger.debug('phantom_run executing %s', ' '.join(cmd))
+        _logger.info('phantom_run executing %s', ' '.join(cmd))
         try:
             phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         except OSError:
@@ -253,7 +253,7 @@ class HttpCase(TransactionCase):
             # kill phantomjs if phantom.exit() wasn't called in the test
             if phantom.poll() is None:
                 phantom.terminate()
-            _logger.debug("phantom_run execution finished")
+            _logger.info("phantom_run execution finished")
 
     def phantom_jsfile(self, jsfile, timeout=30, **kw):
         options = {

From c3ef6eb89208506a524731f5b0f18f56f9704589 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 21:01:35 +0100
Subject: [PATCH 104/175] [FIX] tests typo in js tests result parsing

bzr revid: al@openerp.com-20140316200135-dyyl6u5uas4js90g
---
 openerp/tests/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 9845d2be86d..5a7c1dbb83a 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -233,7 +233,7 @@ class HttpCase(TransactionCase):
                 if line == "ok":
                     break
                 if line.startswith("error"):
-                    line_ = self.line[6:]
+                    line_ = ine[6:]
                     # when error occurs the execution stack may be sent as as JSON
                     try:
                         line_ = json.loads(line_)

From cde6e0f6c6f1cd3c0927691da42e0f85b1b46c6a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 22:21:27 +0100
Subject: [PATCH 105/175] [FIX] no comments

bzr revid: al@openerp.com-20140316212127-l1rxz5zh4o92tv90
---
 openerp/tests/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 5a7c1dbb83a..5d3762a6f7d 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -233,7 +233,7 @@ class HttpCase(TransactionCase):
                 if line == "ok":
                     break
                 if line.startswith("error"):
-                    line_ = ine[6:]
+                    line_ = line[6:]
                     # when error occurs the execution stack may be sent as as JSON
                     try:
                         line_ = json.loads(line_)

From 973ea59b28bad07eded12fc9cb2027d257b4d8c0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 22:33:04 +0100
Subject: [PATCH 106/175] [FIX] website_sale disabling tests while i rewrite
 Tour

bzr revid: al@openerp.com-20140316213304-gh0898xwonhca36z
---
 addons/website_sale/tests/test_ui.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 3d9be08b117..a256f0c3a93 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -4,22 +4,20 @@ import unittest2
 
 import openerp.tests
 
-inject = [
-    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
-    ("openerp.website.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
-]
 
 class TestUi(openerp.tests.HttpCase):
     def test_01_admin_shop_tour(self):
+        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
     def test_02_admin_checkout(self):
+        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="admin")
 
     def test_03_demo_checkout(self):
         return
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo")
 
     def test_04_public_checkout(self):
         return
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest")

From e6a5d82036a53ff3d4bdb8aed6f754e6c5b56a63 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 17 Mar 2014 01:08:51 +0100
Subject: [PATCH 107/175] [FIX] ir_logging missing field

bzr revid: al@openerp.com-20140317000851-3vyo7m3kc9k8jki5
---
 openerp/addons/base/ir/ir_logging.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/ir/ir_logging.py b/openerp/addons/base/ir/ir_logging.py
index a2b4e606290..dd06a19c0ae 100644
--- a/openerp/addons/base/ir/ir_logging.py
+++ b/openerp/addons/base/ir/ir_logging.py
@@ -33,6 +33,7 @@ class ir_logging(osv.Model):
 
     _columns = {
         'create_date': fields.datetime('Create Date', readonly=True),
+        'create_uid': fields.integer('Uid', readonly=True),  # Integer not m2o is intentionnal
         'name': fields.char('Name', required=True),
         'type': fields.selection(EXCEPTIONS_TYPE, string='Type', required=True, select=True),
         'dbname': fields.char('Database Name'),

From 706ef452cb61b4b03e5e372dbf8fbb36fd3b0661 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 17 Mar 2014 03:13:17 +0100
Subject: [PATCH 108/175] [IMP] tests prepend modules names when logging

bzr revid: al@openerp.com-20140317021317-4o3l1uf2ts62w1di
---
 openerp/modules/module.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 554b38f06cf..8958813baa2 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -38,7 +38,6 @@ import openerp.release as release
 from openerp.tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
-_test_logger = logging.getLogger('openerp.tests')
 
 # addons path as a list
 ad_paths = []
@@ -340,7 +339,8 @@ def get_test_modules(module):
 
 # Use a custom stream object to log the test executions.
 class TestStream(object):
-    def __init__(self):
+    def __init__(self, logger_name='openerp.tests'):
+        self.logger = logging.getLogger(logger_name)
         self.r = re.compile(r'^-*$|^ *... *$|^ok$')
     def flush(self):
         pass
@@ -352,7 +352,7 @@ class TestStream(object):
             if not first:
                 c = '` ' + c
             first = False
-            _test_logger.info(c)
+            self.logger.info(c)
 
 current_test = None
 
@@ -369,9 +369,9 @@ def run_unit_tests(module_name, dbname):
     for m in mods:
         tests = unwrap_suite(unittest2.TestLoader().loadTestsFromModule(m))
         suite = unittest2.TestSuite(itertools.ifilter(runs_at_install, tests))
-        _logger.info('module %s: running test %s.', module_name, m.__name__)
+        _logger.info('running %s tests.', m.__name__)
 
-        result = unittest2.TextTestRunner(verbosity=2, stream=TestStream()).run(suite)
+        result = unittest2.TextTestRunner(verbosity=2, stream=TestStream(m.__name__)).run(suite)
 
         if not result.wasSuccessful():
             r = False

From 338c0a3f5e191b44a94e150104652faf64547ca6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 17 Mar 2014 04:14:48 +0100
Subject: [PATCH 109/175] [FIX] race condition for test cursors If a test ends
 before handling all its http queries (serialised by a Rlock), threads created
 for unfufilled queries may hang because the interrupted thread might not have
 unlocked its cursor as it might have dissapeared from HTTP_SESSION before
 request release_test_cursor. We now use the cursor itself instead of
 HTTP_SESSION.

bzr revid: al@openerp.com-20140317031448-rffj7gixgk8jzeqp
---
 openerp/http.py         | 2 +-
 openerp/tests/common.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 3fc4aeb60f2..34b9cf19abf 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -181,7 +181,7 @@ class WebRequest(object):
 
         if self._cr:
             # Dont commit test cursors
-            if not openerp.tests.common.release_test_cursor(self.session_id):
+            if not openerp.tests.common.release_test_cursor(self._cr):
                 if exc_type is None:
                     self._cr.commit()
                 self._cr.close()
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 5d3762a6f7d..b0dcac47408 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -48,10 +48,9 @@ def acquire_test_cursor(session_id):
             cr._test_lock.acquire()
             return cr
 
-def release_test_cursor(session_id):
+def release_test_cursor(cr):
     if openerp.tools.config['test_enable']:
-        cr = HTTP_SESSION.get(session_id)
-        if cr:
+        if hasattr(cr, '_test_lock'):
             cr._test_lock.release()
             return True
     return False

From e7ae07cb09ab8a14022b7bb0221503f1fb79900f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 17 Mar 2014 04:48:20 +0000
Subject: [PATCH 110/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140317044820-8pliqfbb7gbu8bbr
---
 addons/hr_recruitment/i18n/lt.po | 1259 ++++++++++++++++++++++++++++++
 addons/share/i18n/zh_CN.po       |   36 +-
 2 files changed, 1279 insertions(+), 16 deletions(-)
 create mode 100644 addons/hr_recruitment/i18n/lt.po

diff --git a/addons/hr_recruitment/i18n/lt.po b/addons/hr_recruitment/i18n/lt.po
new file mode 100644
index 00000000000..a1467354b74
--- /dev/null
+++ b/addons/hr_recruitment/i18n/lt.po
@@ -0,0 +1,1259 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2014-03-16 13:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@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-17 04:48+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Application Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Start Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Filter and view on next actions and date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected_extra:0
+msgid "Expected Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Pending Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.source:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source
+msgid "Sources of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:435
+#, python-format
+msgid "You must define Applied Job for this applicant."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new job applicant.\n"
+"              </p><p>\n"
+"                OpenERP helps you track applicants in the recruitment\n"
+"                process and follow up all operations: meetings, interviews, "
+"etc.\n"
+"              </p><p>\n"
+"                If you setup the email gateway, applicants and their "
+"attached\n"
+"                CV are created automatically when an email is sent to\n"
+"                jobs@yourcompany.com. If you install the document "
+"management\n"
+"                modules, all resumes are indexed automatically, so that you "
+"can\n"
+"                easily search through their content.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applications"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,emp_id:0
+msgid "employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.config.settings,fetchmail_applicants:0
+msgid "Create applicants from an incoming email account"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Master Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid "Doctoral Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,department_id:0
+msgid ""
+"Stages of the recruitment process may be different per department. If this "
+"stage is common to all departments, keep this field empty."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
+msgid "Meetings"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.job,survey_id:0
+msgid "Interview Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,survey_id:0
+msgid ""
+"Choose an interview form for this job position and you will be able to "
+"print/answer this interview from all applicants who apply for this job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:435
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,availability:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print interview report"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Hired employees"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a new stage in the recruitment process.\n"
+"          </p><p>\n"
+"            Define here your stages of the recruitment process, for "
+"example:\n"
+"            qualification call, first interview, second interview, refused,\n"
+"            hired.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,alias_id:0
+msgid ""
+"Email alias for this job position. New emails will automatically create new "
+"applicants for this job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee
+#: model:ir.model,name:hr_recruitment.model_hired_employee
+msgid "Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Recruitment / Applicants Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:351
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected_extra:0
+msgid "Salary Expected by Applicant, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Draft recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Delete"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Hire & Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A contact is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant_category
+msgid "Category of applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer related job question"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Yes"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "or"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "No"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "All Initial Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree
+msgid "Degrees"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,state:0
+#: field:hr.recruitment.report,state:0
+#: field:hr.recruitment.stage,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule interview with this applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Applications"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a new stage in the recruitment process.\n"
+"          </p><p>\n"
+"            Don't forget to specify the department if your recruitment "
+"process\n"
+"            is different according to the job position.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.config.settings,module_document_ftp:0
+msgid "Allow the automatic indexation of resumes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed_extra:0
+msgid "Proposed Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "A contact is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact:"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Would you like to create an employee ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Degree:"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer
+msgid ""
+"Check if the following stages are matching your recruitment process. Don't "
+"forget to specify the department if your recruitment process is different "
+"according to the job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.config.settings:0
+msgid "Configure"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_website_company
+msgid "Company Website"
+msgstr ""
+
+#. module: hr_recruitment
+#: sql_constraint:hr.recruitment.degree:0
+msgid "The name of the Degree of Recruitment must be unique!"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a contact based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,fetchmail_applicants:0
+msgid ""
+"Allow applicants to send their job application to an email address "
+"(jobs@mycompany.com),\n"
+"                and create automatically application documents in the system."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject / Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Create New Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_linkedin
+msgid "LinkedIn"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
+msgid "New Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.source,name:0
+msgid "Source Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_word
+msgid "Word of Mouth"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,fold:0
+msgid "Hide in views if empty"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,module_document_ftp:0
+msgid ""
+"Manage your CV's and motivation letter related to all applicants.\n"
+"                This installs the module document_ftp. This will install the "
+"knowledge management  module in order to allow you to search using specific "
+"keywords through  the content of all documents (PDF, .DOCx...)"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+#: selection:hr.recruitment.stage,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Referred By"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Departement:"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Open Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant_category,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Pending recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,department_id:0
+msgid "Specific to a Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
+msgid "Bachelor Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,state:0
+msgid ""
+"The related status for the stage. The status of your document will "
+"automatically change according to the selected stage. Example, a stage is "
+"related to the status 'Close', when your document reach this stage, it will "
+"be automatically closed."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed_extra:0
+msgid "Salary Proposed by the Organisation, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+msgid "Applications to be Processed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Interview"
+msgstr ""
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index e48a7466e8b..fc95d92b318 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-09 05:00+0000\n"
-"Last-Translator: sum1201 <Unknown>\n"
+"PO-Revision-Date: 2014-03-16 16:41+0000\n"
+"Last-Translator: Victor Yu <vivianyw@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-04 07:34+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-17 04:48+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:842
@@ -76,6 +76,8 @@ msgid ""
 "    %s\n"
 "\n"
 msgstr ""
+"附件没弄好，你可以在OpenERP服务器上查看: %s\n"
+"\n"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -147,7 +149,7 @@ msgstr "共享URL"
 #: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "这是你访问这个保护区域的凭证：\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -173,7 +175,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
-msgstr ""
+msgstr "请标明分享的用户电子邮箱，每行一个。"
 
 #. module: share
 #: help:share.wizard,domain:0
@@ -189,7 +191,7 @@ msgstr "下一个"
 #: code:addons/share/wizard/share_wizard.py:662
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
-msgstr ""
+msgstr "操作和访问模式都需要要创建一个共享入口。"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:850
@@ -256,7 +258,7 @@ msgstr "非共享组"
 msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
-msgstr ""
+msgstr "带有操作说明的邮件通知已经发送到以下人了："
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:77
@@ -273,6 +275,8 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP是强大的、用户友好的商业应用套装（CRM，销售、人事、等）\n"
+"而且是开源的，可以在 http://www.openerp.com 找到并下载。"
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -282,7 +286,7 @@ msgstr "共享操作"
 #. module: share
 #: help:share.wizard,record_name:0
 msgid "Name of the shared record, if sharing a precise record"
-msgstr ""
+msgstr "如果共享一个精确记录，记录下分享名"
 
 #. module: share
 #: field:res.users,share:0
@@ -337,7 +341,7 @@ msgstr "创建新的"
 #. module: share
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
-msgstr ""
+msgstr "共享标题（显示给用户的菜单和快捷方式的名称）"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:636
@@ -348,7 +352,7 @@ msgstr "创建用户 %s  （%s ）间接共享过滤器，在用户组 %s"
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
-msgstr ""
+msgstr "用户主要访问的页面被授权共享访问"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:206
@@ -356,7 +360,7 @@ msgstr ""
 msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
-msgstr ""
+msgstr "在使用分享按钮前，你必须在用户首选项处配置你的电子邮件。"
 
 #. module: share
 #: model:res.groups,name:share.group_share_user
@@ -387,7 +391,7 @@ msgstr "数据库"
 #. module: share
 #: view:share.wizard:0
 msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "与这些人分享（每行一个电子邮件）"
 
 #. module: share
 #: field:share.wizard,domain:0
@@ -409,7 +413,7 @@ msgstr "简述"
 #: help:share.wizard,embed_code:0
 msgid ""
 "Embed this code in your documents to provide a link to the shared document."
-msgstr ""
+msgstr "在你的文档中嵌入下列代码以提供到分享文档的连接。"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:513
@@ -431,7 +435,7 @@ msgstr "共享你的单据"
 #. module: share
 #: view:share.wizard:0
 msgid "Or insert the following code where you want to embed your documents"
-msgstr ""
+msgstr "或者在你想要嵌入你的文档时，插入下列代码"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:886
@@ -439,7 +443,7 @@ msgstr ""
 msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
-msgstr ""
+msgstr "一份文档已经被自动增加到你现在的OpenERP文档中了。\n"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line

From 2688ac29a0ac6479f317fea4c4ba1f397ebfb0f3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 09:41:23 +0100
Subject: [PATCH 111/175] [FIX] keep image type intact during resize

Unless specficially requested, the output image should have the same file type
as the input (JPEG -> JPEG, PNG -> PNG), everything should not be converted to
PNG by default.

bzr revid: xmo@openerp.com-20140317084123-wvn8r4ot79610k1r
---
 openerp/tools/image.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index 196ace2da60..c5e5b396922 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -32,7 +32,7 @@ from random import randint
 # Image resizing
 # ----------------------------------------
 
-def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='PNG', avoid_if_small=False):
+def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype=None, avoid_if_small=False):
     """ Function to resize an image. The image will be resized to the given
         size, while keeping the aspect ratios, and holes in the image will be
         filled with transparent background. The image will not be stretched if
@@ -58,7 +58,8 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
             height mean an automatically computed value based respectivelly
             on height or width of the source image.
         :param encoding: the output encoding
-        :param filetype: the output filetype
+        :param filetype: the output filetype, by default the source image's
+        :type filetype: str, any PIL image format (supported for creation)
         :param avoid_if_small: do not resize if image height and width
             are smaller than the expected size.
     """
@@ -68,6 +69,8 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
         return base64_source
     image_stream = StringIO.StringIO(base64_source.decode(encoding))
     image = Image.open(image_stream)
+    # store filetype here, as Image.new below will lose image.format
+    filetype = filetype or image.format
 
     asked_width, asked_height = size
     if asked_width is None:

From 6a8f39533a95d61604491f62fdd528547b605c61 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 10:46:25 +0100
Subject: [PATCH 112/175] [REM] forced filetype on resize_image_*, fix
 incorrect size spec on big

bzr revid: xmo@openerp.com-20140317094625-00mjd8ymcxvvl9yg
---
 openerp/tools/image.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index c5e5b396922..08c2fd91f21 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -98,21 +98,21 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
     image.save(background_stream, filetype)
     return background_stream.getvalue().encode(encoding)
 
-def image_resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG', avoid_if_small=True):
+def image_resize_image_big(base64_source, size=(1204, 1024), encoding='base64', filetype=None, avoid_if_small=True):
     """ Wrapper on image_resize_image, to resize images larger than the standard
         'big' image size: 1024x1024px.
         :param size, encoding, filetype, avoid_if_small: refer to image_resize_image
     """
     return image_resize_image(base64_source, size, encoding, filetype, avoid_if_small)
 
-def image_resize_image_medium(base64_source, size=(128, 128), encoding='base64', filetype='PNG', avoid_if_small=False):
+def image_resize_image_medium(base64_source, size=(128, 128), encoding='base64', filetype=None, avoid_if_small=False):
     """ Wrapper on image_resize_image, to resize to the standard 'medium'
         image size: 180x180.
         :param size, encoding, filetype, avoid_if_small: refer to image_resize_image
     """
     return image_resize_image(base64_source, size, encoding, filetype, avoid_if_small)
 
-def image_resize_image_small(base64_source, size=(64, 64), encoding='base64', filetype='PNG', avoid_if_small=False):
+def image_resize_image_small(base64_source, size=(64, 64), encoding='base64', filetype=None, avoid_if_small=False):
     """ Wrapper on image_resize_image, to resize to the standard 'small' image
         size: 50x50.
         :param size, encoding, filetype, avoid_if_small: refer to image_resize_image

From 8ffc4d0a5a6eddf3bbfd76699e40420830f7b868 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 11:42:51 +0100
Subject: [PATCH 113/175] [ADD] support for presized fields in website/image

also add presized field to attachments (automatically computed from datas)

bzr revid: xmo@openerp.com-20140317104251-ddsa9cfpq1vkk2k1
---
 addons/website/controllers/main.py | 46 ++++++++++++++++++++++--------
 addons/website/models/website.py   | 18 +++++++++++-
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index eff28b61fcd..aee0997e4b4 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -314,6 +314,23 @@ class Website(openerp.addons.web.controllers.main.Home):
         '/website/image/<model>/<id>/<field>'
         ], auth="public", website=True)
     def website_image(self, model, id, field, max_width=maxint, max_height=maxint):
+        """ 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:`~.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 = request.registry[model]
 
         response = werkzeug.wrappers.Response()
@@ -322,15 +339,17 @@ class Website(openerp.addons.web.controllers.main.Home):
 
         ids = Model.search(request.cr, request.uid,
                            [('id', '=', id)], context=request.context) \
-            or Model.search(request.cr, openerp.SUPERUSER_ID,
-                            [('id', '=', id), ('website_published', '=', True)], context=request.context)
+           or 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], context=request.context)
+                              [concurrency, field, presized],
+                              context=request.context)
 
         if concurrency in record:
             server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
@@ -354,25 +373,28 @@ class Website(openerp.addons.web.controllers.main.Home):
         if response.status_code == 304:
             return response
 
-        data = record[field].decode('base64')
-        fit = int(max_width), int(max_height)
+        data = (record.get(presized) or record[field]).decode('base64')
 
-        buf = cStringIO.StringIO(data)
-
-        image = Image.open(buf)
-        image.load()
+        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.set_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
+            response.set_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)
+            # 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
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index f48dbd06be5..1a541865987 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -580,10 +580,26 @@ class ir_attachment(osv.osv):
             return hashlib.new('sha1', attachment_dict['datas']).hexdigest()
         return None
 
+    def _datas_big(self, cr, uid, ids, name, arg, context=None):
+        result = dict.fromkeys(ids, False)
+        if context and context.get('bin_size'):
+            return result
+
+        for record in self.browse(cr, uid, ids, context=context):
+            if not record.datas: continue
+            try:
+                result[record.id] = openerp.tools.image_resize_image_big(record.datas)
+            except IOError: # apparently the error PIL.Image.open raises
+                pass
+
+        return result
+
     _columns = {
         'datas_checksum': fields.function(_datas_checksum, size=40,
               string="Datas checksum", type='char', store=True, select=True),
-        'website_url': fields.function(_website_url_get, string="Attachment URL", type='char')
+        'website_url': fields.function(_website_url_get, string="Attachment URL", type='char'),
+        'datas_big': fields.function (_datas_big, type='binary', store=True,
+                                      string="Resized file content"),
     }
 
     def create(self, cr, uid, values, context=None):

From a2ef044c477a049875a2077e4f2b4420bb35ef75 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 12:09:04 +0100
Subject: [PATCH 114/175] [IMP] skip injection of data-oe-* attributes outside
 of editable mode

bzr revid: xmo@openerp.com-20140317110904-k8bptgv7y2yhhh8s
---
 openerp/addons/base/ir/ir_qweb.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index e9e0386b4e2..0b3bf91dc1f 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -488,7 +488,6 @@ class FieldConverter(osv.AbstractModel):
         A default configuration key is ``widget`` which can override the
         field's own ``_type``.
         """
-        content = None
         try:
             content = self.record_to_html(
                 cr, uid, field_name, record,
@@ -503,12 +502,14 @@ class FieldConverter(osv.AbstractModel):
                             field_name, record._model._name, exc_info=True)
             content = None
 
-        g_att += ''.join(
-            ' %s="%s"' % (name, werkzeug.utils.escape(value))
-            for name, value in self.attributes(
-                cr, uid, field_name, record, options,
-                source_element, g_att, t_att, qweb_context)
-        )
+        if context and context.get('inherit_branding'):
+            # add branding attributes
+            g_att += ''.join(
+                ' %s="%s"' % (name, werkzeug.utils.escape(value))
+                for name, value in self.attributes(
+                    cr, uid, field_name, record, options,
+                    source_element, g_att, t_att, qweb_context)
+            )
 
         return self.render_element(cr, uid, source_element, t_att, g_att,
                                    qweb_context, content)

From 44bebab6825a067ef0ddf3494d49249ada8baaf0 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 12:49:38 +0100
Subject: [PATCH 115/175] [FIX] website: typo: message let the user think that
 he can change the mobile view while he cannot

bzr revid: chm@openerp.com-20140317114938-3ghhwm0km3u5wyu1
---
 addons/website/static/src/js/website.tour.banner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index ff3ed030f76..a92934df89d 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -101,7 +101,7 @@
                     element:   '.modal:has(#mobile-viewport) button[data-dismiss=modal]',
                     placement: 'right',
                     title:     _t("Check Mobile Preview"),
-                    content:   _t("Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog."),
+                    content:   _t("Scroll to check rendering and then close the mobile preview."),
                     popover:   { next: _t("Continue") },
                 },
                 {

From 19aacaaea8f809ec39dcbc3e4a2e997e85c22d20 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 12:49:56 +0100
Subject: [PATCH 116/175] [FIX] website: readability block with container css

bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a6e4c3eb916..1f0242d93d1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -116,7 +116,7 @@ header a.navbar-brand img {
 }
 
 /* ----- BOOTSTRAP FIX ----- */
-.container .container {
+.container .container, .readable .container {
   padding-left: 0;
   padding-right: 0;
   width: auto;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index d6fbd0ac7bf..e08d5c1dbe3 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -85,7 +85,7 @@ header
 
 /* ----- BOOTSTRAP FIX ----- */
 
-.container
+.container, .readable
     .container
         padding-left: 0
         padding-right: 0

From d8d312768cc59fcde30daf34401e831092f15d39 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 17 Mar 2014 13:01:26 +0100
Subject: [PATCH 117/175] [FIX] product: overwritten name_search of
 product.pricelist ignored lang translations. It worked prior to saas-3
 because the pricelist filter in the searchview used a selection widget, which
 did not care about translations

bzr revid: dle@openerp.com-20140317120126-qx4wrkqfdu3nr3sp
---
 addons/product/pricelist.py | 26 ++++++++++++++++++++++----
 addons/product/product.py   | 13 +++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3c2edf74ea3..72f1c0eb342 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -115,11 +115,29 @@ class product_pricelist(osv.osv):
         if name and operator == '=' and not args:
             # search on the name of the pricelist and its currency, opposite of name_get(),
             # Used by the magic context filter in the product search view.
-            query_args = {'name': name, 'limit': limit}
+            query_args = {'name': name, 'limit': limit, 'lang': (context or {}).get('lang') or 'en_US'}
             query = """SELECT p.id
-                       FROM product_pricelist p JOIN
-                            res_currency c ON (p.currency_id = c.id)
-                       WHERE p.name || ' (' || c.name || ')' = %(name)s
+                       FROM ((
+                                SELECT pr.id, pr.name
+                                FROM product_pricelist pr JOIN
+                                     res_currency cur ON 
+                                         (pr.currency_id = cur.id)
+                                WHERE pr.name || ' (' || cur.name || ')' = %(name)s
+                            )
+                            UNION (
+                                SELECT tr.res_id as id, tr.value as name
+                                FROM ir_translation tr JOIN
+                                     product_pricelist pr ON (
+                                        pr.id = tr.res_id AND
+                                        tr.type = 'model' AND
+                                        tr.name = 'product.pricelist,name' AND
+                                        tr.lang = %(lang)s
+                                     ) JOIN
+                                     res_currency cur ON 
+                                         (pr.currency_id = cur.id)
+                                WHERE tr.value || ' (' || cur.name || ')' = %(name)s
+                            )
+                        ) p
                        ORDER BY p.name"""
             if limit:
                 query += " LIMIT %(limit)s"
diff --git a/addons/product/product.py b/addons/product/product.py
index 6b0e22238cd..eed8859bd94 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -527,12 +527,13 @@ class product_product(osv.osv):
                     cr, uid, pricelist, operator='=', context=context, limit=1)
                 pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist
 
-            products = self.browse(cr, uid, ids, context=context)
-            qtys = map(lambda x: (x, quantity, partner), products)
-            pl = plobj.browse(cr, uid, pricelist, context=context)
-            price = plobj._price_get_multi(cr,uid, pl, qtys, context=context)
-            for id in ids:
-                res[id] = price.get(id, 0.0)
+            if isinstance(pricelist, (int, long)):
+                products = self.browse(cr, uid, ids, context=context)
+                qtys = map(lambda x: (x, quantity, partner), products)
+                pl = plobj.browse(cr, uid, pricelist, context=context)
+                price = plobj._price_get_multi(cr,uid, pl, qtys, context=context)
+                for id in ids:
+                    res[id] = price.get(id, 0.0)
         for id in ids:
             res.setdefault(id, 0.0)
         return res

From d3c7750b96253e952f199abdbbb5eede67d3c873 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 13:40:56 +0100
Subject: [PATCH 118/175] [FIX] inject WORD JOINER inside p so they don't
 seemingly disappear after saving

bzr revid: xmo@openerp.com-20140317124056-kg2jngp2mg769v7m
---
 addons/website/static/src/css/website.css  | 6 +++++-
 addons/website/static/src/css/website.sass | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 1f0242d93d1..fd5492c9bc2 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -102,6 +102,10 @@ header a.navbar-brand img {
   max-height: 50px;
 }
 
+div:before, p:before {
+  content: "\2060";
+}
+
 /* ----- Snippets Styles ----- */
 .readable {
   font-size: 120%;
@@ -217,7 +221,6 @@ footer {
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal {
   overflow: hidden;
-  overflow-y: hidden;
 }
 
 ul.nav-stacked > li > a {
@@ -284,6 +287,7 @@ ul.nav-stacked > li > a {
 section, .carousel, .parallax, .row, .hr, .blockquote {
   min-height: 30px;
 }
+
 .carousel, .parallax, .blockquote {
   overflow: hidden;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index e08d5c1dbe3..44afd627214 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -68,6 +68,12 @@ header
         img
             max-height: 50px
 
+// add {WORD JOINER} (equivalent to deprecated ZERO WIDTH NO-BREAK SPACE) at
+// the beginning of paragraphs (and divs) so they don't "disappear" after
+// saving when used solely for spacing.
+div:before, p:before
+    content: '\2060'
+
 /* ----- Snippets Styles ----- */
 
 .readable
@@ -78,11 +84,9 @@ header
 
 /* ----- EDITOR ----- */
 
-
 .css_non_editable_mode_hidden
     display: none
 
-
 /* ----- BOOTSTRAP FIX ----- */
 
 .container, .readable
@@ -180,7 +184,6 @@ footer
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
     overflow: hidden
-    overflow-y: hidden
 
 ul.nav-stacked > li > a
     padding: 2px 15px

From 09deba48268bed7a77050d9b1d9776b485cb44e2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 17 Mar 2014 13:43:43 +0100
Subject: [PATCH 119/175] [FIX] tests dont generate traceback on aborted test
 requests

bzr revid: al@openerp.com-20140317124343-kgesa5c215z19vpn
---
 openerp/sql_db.py       | 10 +++++-----
 openerp/tests/common.py |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 694ae02b3d9..59841656d8c 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -148,7 +148,7 @@ class Cursor(object):
     def check(f):
         @wraps(f)
         def wrapper(self, *args, **kwargs):
-            if self.__closed:
+            if self._closed:
                 msg = 'Unable to use a closed cursor.'
                 if self.__closer:
                     msg += ' It was closed at %s, line %s' % self.__closer
@@ -165,7 +165,7 @@ class Cursor(object):
         self.sql_log = _logger.isEnabledFor(logging.DEBUG)
 
         self.sql_log_count = 0
-        self.__closed = True    # avoid the call of close() (by __del__) if an exception
+        self._closed = True    # avoid the call of close() (by __del__) if an exception
                                 # is raised by any of the following initialisations
         self._pool = pool
         self.dbname = dbname
@@ -180,7 +180,7 @@ class Cursor(object):
             self.__caller = frame_codeinfo(currentframe(),2)
         else:
             self.__caller = False
-        self.__closed = False   # real initialisation value
+        self._closed = False   # real initialisation value
         self.autocommit(False)
         self.__closer = False
 
@@ -189,7 +189,7 @@ class Cursor(object):
         self.cache = {}
 
     def __del__(self):
-        if not self.__closed and not self._cnx.closed:
+        if not self._closed and not self._cnx.closed:
             # Oops. 'self' has not been closed explicitly.
             # The cursor will be deleted by the garbage collector,
             # but the database connection is not put back into the connection
@@ -302,7 +302,7 @@ class Cursor(object):
         # collected as fast as they should). The problem is probably due in
         # part because browse records keep a reference to the cursor.
         del self._obj
-        self.__closed = True
+        self._closed = True
 
         # Clean the underlying connection.
         self._cnx.rollback()
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index b0dcac47408..99f5919f2fc 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -15,9 +15,10 @@ import time
 import unittest2
 import urllib2
 import xmlrpclib
-
 from datetime import datetime, timedelta
 
+import werkzeug
+
 import openerp
 
 _logger = logging.getLogger(__name__)
@@ -46,6 +47,8 @@ def acquire_test_cursor(session_id):
         cr = HTTP_SESSION.get(session_id)
         if cr:
             cr._test_lock.acquire()
+            if cr._closed:
+                werkzeug.exceptions.abort(500)
             return cr
 
 def release_test_cursor(cr):

From 4c5d238191de3bdd65078966e54885a37bead415 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Mar 2014 14:24:16 +0100
Subject: [PATCH 120/175] [FIX] website translation won't properly find
 inherited view's id

bzr revid: fme@openerp.com-20140317132416-nu10ltrskc8d0orf
---
 addons/website/static/src/js/website.translator.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 399e5e731b2..44e2117a7f0 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -65,6 +65,7 @@
         },
         processTranslatableNodes: function () {
             var self = this;
+            var source_attr = 'data-oe-source-id';
             var $editables = $('[data-oe-model="ir.ui.view"]')
                     .not('link, script')
                     .not('.oe_snippets,.oe_snippet, .oe_snippet *')
@@ -72,7 +73,8 @@
 
             $editables.each(function () {
                 var $node = $(this);
-                var view_id = $node.attr('data-oe-source-id') || $node.attr('data-oe-id');
+                var source_id = $node.parents('[' + source_attr + ']:first').attr(source_attr)|0;
+                var view_id = $node.attr('data-oe-source-id') || source_id || $node.attr('data-oe-id');
                 self.transNode(this, view_id|0);
             });
             $('.oe_translatable_text').on('paste', function () {

From 25732de9cebc92fc4ccb231c8ad073a16b6035f6 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 14:37:00 +0100
Subject: [PATCH 121/175] [FIX] website tour: typo for banner (from usertest
 feedback)

bzr revid: chm@openerp.com-20140317133700-8xrneej6aytua4j4
---
 addons/website/static/src/js/website.tour.banner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index a92934df89d..304d4fe7ead 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -35,7 +35,7 @@
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
                     title:     _t("Insert building blocks"),
-                    content:   _t("To add content in a page, you can insert building blocks."),
+                    content:   _t("Click here to insert blocks of centent in the page."),
                     popover:   { fixed: true },
                 },
                 {

From cd4f83122ac61d44eeb45840aa6a2ec251ed9033 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 14:51:44 +0100
Subject: [PATCH 122/175] [FIX] reduce span of paragraph spacer thing to not
 break layout

bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index fd5492c9bc2..dc0628ca3c5 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -102,7 +102,7 @@ header a.navbar-brand img {
   max-height: 50px;
 }
 
-div:before, p:before {
+#wrapwrap p:empty:after {
   content: "\2060";
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 44afd627214..a15953e0f2b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -69,9 +69,9 @@ header
             max-height: 50px
 
 // add {WORD JOINER} (equivalent to deprecated ZERO WIDTH NO-BREAK SPACE) at
-// the beginning of paragraphs (and divs) so they don't "disappear" after
-// saving when used solely for spacing.
-div:before, p:before
+// the beginning of paragraphs so they don't "disappear" after saving when
+// used solely for spacing.
+#wrapwrap p:empty:after
     content: '\2060'
 
 /* ----- Snippets Styles ----- */

From 627b5b671edd98303f3b8636d66ad11c4184c532 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 17 Mar 2014 14:52:39 +0100
Subject: [PATCH 123/175] [FIX] tests dont log traceback on aborted request
 while testing

bzr revid: al@openerp.com-20140317135239-08aefkdxiil7bpcs
---
 openerp/http.py         | 6 ++++--
 openerp/tests/common.py | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 34b9cf19abf..438c8ec1cc0 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -361,7 +361,7 @@ class JsonRequest(WebRequest):
             response['id'] = self.jsonrequest.get('id')
             response["result"] = self._call_function(**self.params)
         except AuthenticationError, e:
-            _logger.exception("Exception during JSON request handling.")
+            _logger.exception("JSON-RPC AuthenticationError in %s.", self.httprequest.path)
             se = serialize_exception(e)
             error = {
                 'code': 100,
@@ -369,7 +369,9 @@ class JsonRequest(WebRequest):
                 'data': se
             }
         except Exception, e:
-            _logger.exception("Exception during JSON request handling.")
+            # Mute test cursor error for runbot
+            if not (openerp.tools.config['test_enable'] and isinstance(e, psycopg2.OperationalError)):
+                _logger.exception("JSON-RPC Exception in %s.", self.httprequest.path)
             se = serialize_exception(e)
             error = {
                 'code': 200,
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 99f5919f2fc..a53a8d82240 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -47,8 +47,6 @@ def acquire_test_cursor(session_id):
         cr = HTTP_SESSION.get(session_id)
         if cr:
             cr._test_lock.acquire()
-            if cr._closed:
-                werkzeug.exceptions.abort(500)
             return cr
 
 def release_test_cursor(cr):

From d3111df3aa5e8ca3d57e2e71c82267c7952a98ea Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 15:13:24 +0100
Subject: [PATCH 124/175] [FIX] website: The user does not see the content menu
 because of the tutorial is hover

bzr revid: chm@openerp.com-20140317141324-th65fhx512h2p1fa
---
 addons/website/static/src/js/website.tour.banner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 304d4fe7ead..9c8afcd61e5 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -107,7 +107,7 @@
                 {
                     waitNot:   '.modal',
                     element:   '#content-menu-button',
-                    placement: 'bottom',
+                    placement: 'left',
                     title:     _t("Add new pages and menus"),
                     content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
                     popover:   { next: _t("Close Tutorial") },

From 363bbd00dbf40670303947dc290723c7beb74199 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 15:17:49 +0100
Subject: [PATCH 125/175] [FIX] website_sale: display empty message for public
 user and allow admin to edit 'no product found' message

bzr revid: chm@openerp.com-20140317141749-vmsx9x1kkmygnc61
---
 addons/website_sale/views/website_sale.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index a3576b90c2c..f0c14ee1573 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -200,8 +200,8 @@
               </table>
               <t t-if="not bins">
                 <div class="text-center text-muted">
-                  <h3 class="css_editable_display">No product defined.</h3>
-                  <t groups="base.group_website_publisher">
+                  <h3>No product found.</h3>
+                  <t groups="base.group_website_publisher" t-ignore="true">
                     <p groups="base.group_sale_manager">Use the <i>'Content'</i> top menu to create a new product.</p>
                   </t>
                 </div>

From d87bc392ce05034bcb3ac839e5160e8e01afca5d Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 17 Mar 2014 15:42:54 +0100
Subject: [PATCH 126/175] [IMP] website snippet option: rename data-class into
 data-value

bzr revid: chm@openerp.com-20140317144254-18cscu2yx5thmb89
---
 .../static/src/js/website.snippets.editor.js  | 51 ++++++++-------
 addons/website/views/snippets.xml             | 62 +++++++++----------
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 1fddc7b869b..b8533236e01 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -623,7 +623,7 @@
             this.required = this.$el.data("required");
 
             this.set_active();
-            this.$el.find('li[data-class] a').on('mouseover mouseout click', _.bind(this._mouse, this));
+            this.$el.find('li[data-value] a').on('mouseover mouseout click', _.bind(this._mouse, this));
             this.$target.on('snippet-style-reset', _.bind(this.set_active, this));
 
             this.start();
@@ -643,9 +643,9 @@
             var $prev, $next;
             if (event.type === 'mouseout') {
                 $prev = $(event.currentTarget).parent();
-                $next = this.$el.find("li[data-class].active");
+                $next = this.$el.find("li[data-value].active");
             } else {
-                $prev = this.$el.find("li[data-class].active");
+                $prev = this.$el.find("li[data-value].active");
                 $next = $(event.currentTarget).parent();
             }
             if (!$prev.length) {
@@ -709,6 +709,7 @@
         },
         /* select
         *  called when a user select an item
+        *  li must have data-value attribute
         *  variables: np = {$next, $prev}
         *       $next is false if they are no next item selected
         *       $prev is false if they are no previous item selected
@@ -717,10 +718,10 @@
             var self = this;
             // add or remove html class
             if (np.$prev) {
-                this.$target.removeClass(np.$prev.data('class' || ""));
+                this.$target.removeClass(np.$prev.data('value' || ""));
             }
             if (np.$next) {
-                this.$target.addClass(np.$next.data('class') || "");
+                this.$target.addClass(np.$next.data('value') || "");
             }
         },
         /* preview
@@ -734,10 +735,10 @@
 
             // add or remove html class
             if (np.$prev) {
-                this.$target.removeClass(np.$prev.data('class') || "");
+                this.$target.removeClass(np.$prev.data('value') || "");
             }
             if (np.$next) {
-                this.$target.addClass(np.$next.data('class') || "");
+                this.$target.addClass(np.$next.data('value') || "");
             }
         },
         /* set_active
@@ -747,14 +748,14 @@
         set_active: function () {
             var self = this;
             this.$el.find('li').removeClass("active");
-            var $active = this.$el.find('li[data-class]')
+            var $active = this.$el.find('li[data-value]')
                 .filter(function () {
                     var $li = $(this);
-                    return  ($li.data('class') && self.$target.hasClass($li.data('class')));
+                    return  ($li.data('value') && self.$target.hasClass($li.data('value')));
                 })
                 .first()
                 .addClass("active");
-            this.$el.find('li:has(li[data-class].active)').addClass("active");
+            this.$el.find('li:has(li[data-value].active)').addClass("active");
         },
         /* clean_for_save
         *  function called just before save vue
@@ -773,7 +774,7 @@
         start: function () {
             this._super();
             var src = this._get_bg();
-            this.$el.find("li[data-class].active.oe_custom_bg").data("src", src);
+            this.$el.find("li[data-value].active.oe_custom_bg").data("src", src);
         },
         select: function(event, np) {
             var self = this;
@@ -789,7 +790,7 @@
                     });
                     editor.on('cancel', self, function () {
                         if (!np.$prev || np.$prev.data("src") === "") {
-                            self.$target.removeClass(np.$next.data("class"));
+                            self.$target.removeClass(np.$next.data("value"));
                             self.$target.trigger("snippet-style-change", [self, np]);
                         }
                     });
@@ -799,7 +800,7 @@
                 }
             } else {
                 this._set_bg(false);
-                this.$target.removeClass(np.$prev.data("class"));
+                this.$target.removeClass(np.$prev.data("value"));
             }
         },
         preview: function (event, np) {
@@ -812,20 +813,20 @@
             var self = this;
             var bg = self.$target.css("background-image");
             this.$el.find('li').removeClass("active");
-            var $active = this.$el.find('li[data-class]')
+            var $active = this.$el.find('li[data-value]')
                 .filter(function () {
                     var $li = $(this);
                     return  ($li.data('src') && bg.indexOf($li.data('src')) >= 0) ||
-                            (!$li.data('src') && self.$target.hasClass($li.data('class')));
+                            (!$li.data('src') && self.$target.hasClass($li.data('value')));
                 })
                 .first();
             if (!$active.length) {
                 $active = this.$target.css("background-image") !== 'none' ?
-                    this.$el.find('li[data-class].oe_custom_bg') :
-                    this.$el.find('li[data-class=""]');
+                    this.$el.find('li[data-value].oe_custom_bg') :
+                    this.$el.find('li[data-value=""]');
             }
             $active.addClass("active");
-            this.$el.find('li:has(li[data-class].active)').addClass("active");
+            this.$el.find('li:has(li[data-value].active)').addClass("active");
         }
     });
 
@@ -942,7 +943,7 @@
         },
         load_style_options : function () {
             this._super();
-            $(".snippet-style-size li[data-class='']").remove();
+            $(".snippet-style-size li[data-value='']").remove();
         },
         start : function () {
             var self = this;
@@ -960,11 +961,11 @@
                     $active.css("background-image", self.$target.css("background-image"));
                 }
                 if (np.$prev) {
-                    $active.removeClass(np.$prev.data("class"));
+                    $active.removeClass(np.$prev.data("value"));
                 }
                 if (np.$next) {
-                    $active.addClass(np.$next.data("class"));
-                    add_class(np.$next.data("class"));
+                    $active.addClass(np.$next.data("value"));
+                    add_class(np.$next.data("value"));
                 }
             });
             this.$target.on('slid', function () { // slide.bs.carousel
@@ -986,11 +987,13 @@
             var bg = this.$target.data("snippet-option-ids").background;
             if (!bg) return $clone;
 
-            var $styles = bg.$el.find("li[data-class]:not(.oe_custom_bg)");
+            var $styles = bg.$el.find("li[data-value]:not(.oe_custom_bg)");
             var styles_index = $styles.index($styles.filter(".active")[0]);
+            $styles.removeClass("active");
             var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
+            $select.addClass("active");
             $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
-            $clone.addClass($select.data("class") || "");
+            $clone.addClass($select.data("value") || "");
 
             return $clone;
         },
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f91bd969c70..cdc4bd8f961 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -860,7 +860,7 @@
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
             <ul class="dropdown-menu">
-                <li data-class="readable"><a>Narrow</a></li>
+                <li data-value="readable"><a>Narrow</a></li>
             </ul>
         </li>
     </div>
@@ -873,51 +873,51 @@
                 <li class="dropdown-submenu">
                     <a tabindex="-2" href="#">Uniform Color</a>
                     <ul class="dropdown-menu">
-                        <li data-class='oe_dark'><a>Darken</a></li>
-                        <li data-class='oe_green'><a>Green</a></li>
-                        <li data-class='oe_red'><a>Red</a></li>
-                        <li data-class='oe_blue_light'><a>Turquoise</a></li>
-                        <li data-class='oe_blue'><a>Dark Blue</a></li>
-                        <li data-class='oe_orange'><a>Orange</a></li>
-                        <li data-class='oe_purple'><a>Purple</a></li>
-                        <li data-class='oe_black'><a>Black</a></li>
+                        <li data-value='oe_dark'><a>Darken</a></li>
+                        <li data-value='oe_green'><a>Green</a></li>
+                        <li data-value='oe_red'><a>Red</a></li>
+                        <li data-value='oe_blue_light'><a>Turquoise</a></li>
+                        <li data-value='oe_blue'><a>Dark Blue</a></li>
+                        <li data-value='oe_orange'><a>Orange</a></li>
+                        <li data-value='oe_purple'><a>Purple</a></li>
+                        <li data-value='oe_black'><a>Black</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu">
                     <a tabindex="-2" href="#">People</a>
                     <ul class="dropdown-menu">
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/parallax/parallax_bg.jpg"><a>Sunflower</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/parallax/parallax_bg.jpg"><a>Sunflower</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu">
                     <a tabindex="-2" href="#">Landscape</a>
                     <ul class="dropdown-menu">
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu">
                     <a tabindex="-2" href="#">Various</a>
                     <ul class="dropdown-menu">
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                        <li data-class="oe_img_bg" data-src="/website/static/src/img/parallax/quote.png"><a>Quote</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
+                        <li data-value="oe_img_bg" data-src="/website/static/src/img/parallax/quote.png"><a>Quote</a></li>
                     </ul>
                 </li>
-                <li data-class=""><a>None</a></li>
+                <li data-value=""><a>None</a></li>
                 <li><a style="background: none; padding: 5px; border-top: 1px solid #ddd;"></a></li>
-                <li class="oe_custom_bg" data-class="oe_img_bg"><a><b>Choose an image...</b></a></li>
+                <li class="oe_custom_bg" data-value="oe_img_bg"><a><b>Choose an image...</b></a></li>
             </ul>
         </li>
     </div>
@@ -927,9 +927,9 @@
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Layout</a>
             <ul class="dropdown-menu">
-                <li data-class="text_only"><a>Text Only</a></li>
-                <li data-class="image_text"><a>Image - Text</a></li>
-                <li data-class="text_image"><a>Text - Image</a></li>
+                <li data-value="text_only"><a>Text Only</a></li>
+                <li data-value="image_text"><a>Image - Text</a></li>
+                <li data-value="text_image"><a>Text - Image</a></li>
             </ul>
         </li>
     </div>

From 3d2452e8d4f150f193d769d8184ed2a805e02925 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Mar 2014 16:18:10 +0100
Subject: [PATCH 127/175] [FIX] Force routing map to be rebuilt between each
 module test suite

bzr revid: fme@openerp.com-20140317151810-tgsvv0ip4you1qko
---
 openerp/modules/loading.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 7ca0a6785d6..681d8534c05 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -187,6 +187,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
                     # Yamel test
                     report.record_result(load_test(module_name, idref, mode))
                     # Python tests
+                    ir_http = registry['ir.http']
+                    if hasattr(ir_http, '_routing_map'):
+                        # Force routing map to be rebuilt between each module test suite
+                        del(ir_http._routing_map)
                     report.record_result(openerp.modules.module.run_unit_tests(module_name, cr.dbname))
 
             processed_modules.append(package.name)

From 4988b40ef5255ec3e1dd3c769461de53f9865ff3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 16:24:24 +0100
Subject: [PATCH 128/175] [FIX] qweb tests re. inherit_branding
 enabling/disabling injection of data attributes

bzr revid: xmo@openerp.com-20140317152424-bchnq81cn2e7fhjb
---
 openerp/addons/base/tests/test_qweb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/tests/test_qweb.py b/openerp/addons/base/tests/test_qweb.py
index 71beaab605a..ca1503a0c24 100644
--- a/openerp/addons/base/tests/test_qweb.py
+++ b/openerp/addons/base/tests/test_qweb.py
@@ -14,7 +14,8 @@ class TestQWebTField(common.TransactionCase):
         self.engine = self.registry('ir.qweb')
 
     def context(self, values):
-        return ir_qweb.QWebContext(self.cr, self.uid, values)
+        return ir_qweb.QWebContext(
+            self.cr, self.uid, values, context={'inherit_branding': True})
 
     def test_trivial(self):
         field = document.createElement('span')

From 5196cd6e8c577d35c5788df70c7c59d8e7176183 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Mar 2014 16:25:02 +0100
Subject: [PATCH 129/175] [FIX] website: set inherit_branding in test contexts
 to trigger generation of relevant edition attributes

bzr revid: xmo@openerp.com-20140317152502-6a2agi1xjooi516e
---
 addons/website/tests/test_converter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/tests/test_converter.py b/addons/website/tests/test_converter.py
index d31df8e6956..ca72a361ac2 100644
--- a/addons/website/tests/test_converter.py
+++ b/addons/website/tests/test_converter.py
@@ -135,7 +135,7 @@ class TestConvertBack(common.TransactionCase):
         rendered = self.registry('website.qweb').render_tag_field(
             e, {'field': field_value}, '', ir_qweb.QWebContext(self.cr, self.uid, {
                 'record': record,
-            }))
+            }, context={'inherit_branding': True}))
         element = html.fromstring(
             rendered, parser=html.HTMLParser(encoding='utf-8'))
 
@@ -216,7 +216,7 @@ class TestConvertBack(common.TransactionCase):
         rendered = self.registry('website.qweb').render_tag_field(
             e, {'field': field_value}, '', ir_qweb.QWebContext(self.cr, self.uid, {
                 'record': record,
-            }))
+            }, context={'inherit_branding': True}))
 
         element = html.fromstring(rendered, parser=html.HTMLParser(encoding='utf-8'))
         # emulate edition

From f0d4240082fd2dd9ad109bfd7e3caead27410aa3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Mar 2014 17:32:28 +0100
Subject: [PATCH 130/175] [FIX] http dispatch: make sure transaction rollback
 happens in all cases when request handling raised (to be refactored)

Not doing so leads to cases where a transaction is committed
even after failing to validate a Python constraint.
This patch attempts to keep the rollback() logic next to the
corresponding commit(), and makes the rollback() more
explicit even if close() without commit() would also rollback
implicitly.

bzr revid: odo@openerp.com-20140317163228-zqbce8f0rgcg0pt4
---
 openerp/http.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/openerp/http.py b/openerp/http.py
index 5b01922bfb5..61c90929aa2 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -135,6 +135,10 @@ class WebRequest(object):
         self._cr_cm = None
         self._cr = None
         self.func_request_type = None
+
+        # prevents transaction commit, use when you catch an exception during handling
+        self._failed = None
+
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.db:
@@ -178,8 +182,11 @@ class WebRequest(object):
     def __exit__(self, exc_type, exc_value, traceback):
         _request_stack.pop()
         if self._cr:
-            if exc_type is None:
+            if exc_type is None and not self._failed:
                 self._cr.commit()
+            else:
+                # just to be explicit - happens at close() anyway
+                self._cr.rollback()
             self._cr.close()
         # just to be sure no one tries to re-use the request
         self.disable_db = True
@@ -350,6 +357,7 @@ class JsonRequest(WebRequest):
                 'message': "OpenERP Session Invalid",
                 'data': se
             }
+            self._failed = e # prevent tx commit
         except Exception, e:
             _logger.exception("Exception during JSON request handling.")
             se = serialize_exception(e)
@@ -358,6 +366,7 @@ class JsonRequest(WebRequest):
                 'message': "OpenERP Server Error",
                 'data': se
             }
+            self._failed = e # prevent tx commit
         if error:
             response["error"] = error
 

From 788708563133720c2833fdf0f67515940f6d4cd9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 17 Mar 2014 18:07:06 +0100
Subject: [PATCH 131/175] [FIX] test_converter: force inherit_branding by
 passing the right context

bzr revid: chs@openerp.com-20140317170706-dkig0e31xtnrsskj
---
 openerp/addons/test_converter/tests/test_html.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/test_converter/tests/test_html.py b/openerp/addons/test_converter/tests/test_html.py
index 2f0896990ea..3ef6566e829 100644
--- a/openerp/addons/test_converter/tests/test_html.py
+++ b/openerp/addons/test_converter/tests/test_html.py
@@ -112,11 +112,14 @@ class TestCurrencyExport(TestExport):
             'widget': 'monetary',
             'display_currency': 'c2'
         }
+        context = dict(inherit_branding=True)
         converted = converter.to_html(
             self.cr, self.uid, 'value', obj, options,
             doc.createElement('span'),
             {'field': 'obj.value', 'field-options': json.dumps(options)},
-            '', ir_qweb.QWebContext(self.cr, self.uid, {'obj': obj, 'c2': dest, }))
+            '', ir_qweb.QWebContext(self.cr, self.uid, {'obj': obj, 'c2': dest, }),
+            context=context,
+        )
         return converted
 
     def test_currency_post(self):

From ea4e92420812ac998d56e763022c90987d1b8b53 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 17 Mar 2014 18:24:15 +0100
Subject: [PATCH 132/175] [FIX] crm: remove the fact that the convert to opp
 button is hidden if the lead has probability 100: this is possible that you
 want to convert it anyway

bzr revid: dle@openerp.com-20140317172415-f5thfl78sxx2cb1z
---
 addons/crm/crm_lead_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e76a7a9124d..0985914b659 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -95,7 +95,6 @@
             <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            attrs="{'invisible': [('probability', '=', 100)]}"
                             help="Convert to Opportunity" class="oe_highlight"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"

From ce1b0ad243afd9f7251676a7a22571a232a73c3b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 18 Mar 2014 01:29:54 +0100
Subject: [PATCH 133/175] [FIX] ir_logging acl

bzr revid: al@openerp.com-20140318002954-3vc2wj6llc2017bu
---
 openerp/addons/base/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 25df6e117d0..6113f17c5aa 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -113,3 +113,4 @@
 "access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
 "access_res_font_all","res_res_font all","model_res_font",,1,0,0,0
 "access_res_font_group_user","res_res_font group_user","model_res_font","group_user",1,1,1,1
+"access_ir_logging","ir_logging admin","model_ir_logging","group_erp_manager",1,1,1,1

From f2b51c7b69910e7962715f33fc4f89110b057b46 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 18 Mar 2014 14:05:59 +0530
Subject: [PATCH 134/175] [FIX] : subscribe/unsubscribe button not work [IMP]:
 layout

bzr revid: aja@tinyerp.com-20140318083559-jwc196mypc67p5x4
---
 addons/website_mail/static/src/js/website_mail.js      | 3 +--
 addons/website_mail_group/controllers/main.py          | 2 +-
 addons/website_mail_group/views/website_mail_group.xml | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 672a21324a8..5fac61c3d36 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -39,8 +39,7 @@
                 return false;
             }
             this.$target.removeClass('has-error');
-
-            openerp.jsonRpc('/website_mail/follow', 'call', {
+            openerp.jsonRpc('/website_mail/follow/', 'call', {
                 'id': +this.$target.data('id'),
                 'object': this.$target.data('object'),
                 'message_is_follower': this.$target.attr("data-follow") || "off",
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index a6f3adcd522..fe133434abc 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -59,7 +59,7 @@ class MailGroup(http.Controller):
             domain.append(('parent_id','=',False))
         thread_count = thread_obj.search_count(cr, uid, domain, context=context)
         pager = request.website.pager(
-            url='/groups/%s/%s' % (group.id, mode),
+            url='/groups/%s/%s/' % (group.id, mode),
             total=thread_count,
             page=page,
             step=self._thread_per_page,
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 9e4b41329b4..fb18ee9f3fd 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -45,13 +45,13 @@
         <t t-call="website.layout">
             <section class="container">
                 <div class="row mt8">
-                    <div class="col-md-5">
-                        <ol class="breadcrumb mb8">
+                    <div class="col-md-5 mt16">
+                        <ol class="breadcrumb">
                             <li><a href="/groups">Mailing Lists</a></li>
                             <li class="active" t-esc="group.name"/>
                         </ol>
                     </div>
-                    <div class="col-md-5">
+                    <div class="col-md-5 pull-right">
                         <t t-call="website.pager"/>
                     </div>
                 </div>

From 77622d3b240b86332216f3d6e51114c6b5c3e473 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 18 Mar 2014 10:23:41 +0100
Subject: [PATCH 135/175] [FIX] Fix css which make unusable the option dropdown
 for unpublished product. When an user was hover on a product not published
 and was trying to go in submenu, he had lost cursor, because he was changing
 div due to opacoty little than 1.

bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
---
 addons/website/static/src/css/website.css  | 2 +-
 addons/website/static/src/css/website.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 6f69f554bd1..5e198c4de38 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -243,7 +243,7 @@ ul.nav-stacked > li > a {
   display: none;
 }
 
-[data-publish='off'] {
+[data-publish='off'] > *:not(.css_options) {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
   opacity: 0.5;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 200401023a6..75d2afb0bd0 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -200,7 +200,7 @@ ul.nav-stacked > li > a
     .btn-success, .css_unpublish
         display: none
 
-[data-publish='off']
+[data-publish='off']>*:not(.css_options)
     +opacity(0.5)
 
 /* ---- END of PUBLISH ---- */

From 3624a3beb2c09aa0c014b991a326d1b90c459917 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 11:15:05 +0100
Subject: [PATCH 136/175] [IMP] website_mail: refactor follow button; add
 partner_id in session for public user

bzr revid: chm@openerp.com-20140318101505-4yivw8h5oujyhm9b
---
 addons/website_mail/controllers/main.py       | 78 ++++++++++++-------
 .../static/src/css/website_mail.css           |  1 -
 .../static/src/js/website_mail.js             |  9 ++-
 addons/website_mail/views/snippets.xml        |  4 +-
 4 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 601e1387f0a..2eba9022dba 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -26,43 +26,69 @@ from openerp.addons.web.http import request
 
 class WebsiteMail(http.Controller):
 
-    def _find_or_create_partner(self, email, context=None):
-        # TDE TODO: FIXME: use mail_thread method
+    @http.route(['/website_mail/follow'], type='json', auth="public", website=True)
+    def website_message_subscribe(self, id=0, object=None, message_is_follower="on", email=False, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+
         partner_obj = request.registry['res.partner']
         user_obj = request.registry['res.users']
-        partner_ids = []
-        if email and email != u'false':  # post contains stringified booleans
-            partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", email)], context=request.context)
-            if not partner_ids:
-                partner_ids = [partner_obj.name_create(request.cr, SUPERUSER_ID, email, request.context)[0]]
-        else:
-            partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id]
-        return partner_ids
+        website = request.registry['website']
 
-    @http.route(['/website_mail/follow/'], type='json', auth="public", website=True)
-    def website_message_subscribe(self, id=0, object=None, message_is_follower="on", email=False, **post):
         _id = int(id)
         _message_is_follower = message_is_follower == 'on'
         _object = request.registry[object]
-        partner_ids = self._find_or_create_partner(email, request.context)
 
-        if _message_is_follower:
-            _object.check_access_rule(request.cr, request.uid, [_id], 'read', request.context)
-            _object.message_unsubscribe(request.cr, SUPERUSER_ID, [_id], partner_ids, context=request.context)
+        # search partner_id
+        public_id = website.get_public_user(cr, uid, context)
+        if uid != public_id:
+            partner_ids = [user_obj.browse(cr, uid, uid, context).partner_id.id]
         else:
-            _object.check_access_rule(request.cr, request.uid, [_id], 'read', request.context)
-            _object.message_subscribe(request.cr, SUPERUSER_ID, [_id], partner_ids, context=request.context)
-        obj = _object.browse(request.cr, request.uid, _id)
-        follower_ids = [p.id for p in obj.message_follower_ids]
+            # mail_thread method
+            partner_ids = _object._find_partner_from_emails(
+                cr, SUPERUSER_ID, _id, [email], context=context, check_followers=True)
+            if not partner_ids or not partner_ids[0]:
+                partner_ids = [partner_obj.create(cr, SUPERUSER_ID, {'name': email, 'email': email}, context=context)]
 
-        return partner_ids[0] in follower_ids and 1 or 0
+        print partner_ids
 
-    @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
+        # add or remove follower
+        if _message_is_follower:
+            _object.check_access_rule(cr, uid, [_id], 'read', context)
+            _object.message_unsubscribe(cr, SUPERUSER_ID, [_id], partner_ids, context=context)
+            return False
+        else:
+            _object.check_access_rule(cr, uid, [_id], 'read', context)
+            # add partner to session
+            request.session['partner_id'] = partner_ids[0]
+            _object.message_subscribe(cr, SUPERUSER_ID, [_id], partner_ids, context=context)
+            return True
+
+    @http.route(['/website_mail/is_follower'], type='json', auth="public", website=True)
     def call(self, model, id, **post):
-        email = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context).partner_id.email
-        value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
+        cr, uid, context = request.cr, request.uid, request.context
+
+        partner_obj = request.registry.get('res.partner')
+        users_obj = request.registry.get('res.users')
+        obj = request.registry.get(model)
+        website = request.registry['website']
+
+        partner_id = None
+        public_id = website.get_public_user(cr, uid, context)
+        if uid != public_id:
+            partner_id = users_obj.browse(cr, SUPERUSER_ID, uid, context).partner_id
+        elif request.session.get('partner_id'):
+            partner_id = partner_obj.browse(cr, SUPERUSER_ID, request.session.get('partner_id'), context)
+        
+        email = ""
+        is_follower = False
+        if partner_id:
+            email = partner_id and partner_id.email
+            is_follower = partner_id.id in [
+                fol.id for fol in obj.browse(cr, SUPERUSER_ID, id, context).message_follower_ids]
+
         return {
-            'email': email, 
-            'is_follower': value and value[0]['message_is_follower'] or False
+            'is_user': uid != public_id,
+            'email': email,
+            'is_follower': is_follower
         }
 
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
index 25d88ebf191..5678442416c 100644
--- a/addons/website_mail/static/src/css/website_mail.css
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -1,5 +1,4 @@
 .js_follow[data-follow='on'] .js_follow_btn ,
-.js_follow[data-follow='on'] .js_follow_email,
 .js_follow[data-follow='off'] .js_unfollow_btn {
     display: none;
 }
\ No newline at end of file
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 672a21324a8..bd34b526ddd 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -9,13 +9,14 @@
             var self = this;
 
             // set value and display button
-            openerp.jsonRpc('/website_mail/is_follower/', 'call', {
+            self.$target.find("input").removeClass("hidden");
+            openerp.jsonRpc('/website_mail/is_follower', 'call', {
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
             }).always(function (data) {
                 self.$target.find('input.js_follow_email')
                     .val(data.email ? data.email : "")
-                    .attr("disabled", data.email.length ? "disabled" : false);
+                    .attr("disabled", data.is_follower && data.email.length ? "disabled" : false);
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
                 self.$target.removeClass("hidden");
             });
@@ -47,8 +48,10 @@
                 'email': $email.length ? $email.val() : false,
             }).then(function (follow) {
                 if (follow) {
-                    self.$target.find(" > *").toggleClass("hidden");
+                    self.$target.find(".js_follow_email, .input-group-btn").addClass("hidden");
+                    self.$target.find(".alert").removeClass("hidden");
                 }
+                self.$target.find('input.js_follow_email').attr("disabled", follow ? "disabled" : false);
                 self.$target.attr("data-follow", follow ? 'on' : 'off');
             });
         },
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 196ad39dac8..a930f2852a1 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -509,8 +509,8 @@
                       class="js_follow_email form-control"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
-                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
                 </span>
                 <div class="alert alert-success hidden">thanks for your subscription!</div>
             </div>

From f9579073fe29361e677615b59f0adcc9cef6be26 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 12:14:42 +0100
Subject: [PATCH 137/175] [FIX] website: color of Edit Master link for themes.
 CSS less specific

bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
---
 addons/website/static/src/css/bootswatch/amelia.fix.css  | 2 +-
 addons/website/static/src/css/bootswatch/cosmo.fix.css   | 2 +-
 addons/website/static/src/css/bootswatch/flatly.fix.css  | 2 +-
 addons/website/static/src/css/bootswatch/journal.fix.css | 2 +-
 addons/website/static/src/css/bootswatch/simplex.fix.css | 2 +-
 addons/website/static/src/css/bootswatch/yeti.fix.css    | 2 +-
 addons/website/static/src/xml/website.editor.xml         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
index 38d71852a0a..2f16ea5465c 100644
--- a/addons/website/static/src/css/bootswatch/amelia.fix.css
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -1,4 +1,4 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #ad1d28;
 }
 .oe_product section {
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
index 5801cc0d7a4..907aa7bf757 100644
--- a/addons/website/static/src/css/bootswatch/cosmo.fix.css
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -2,6 +2,6 @@
     color: #fff;
     border: 2px solid #0061c2;
 }
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
index fe4a2e73ed1..c2d9500f5da 100644
--- a/addons/website/static/src/css/bootswatch/flatly.fix.css
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -1,3 +1,3 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #2c3e50;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
index a7f93fa312f..e9f41a33e8f 100644
--- a/addons/website/static/src/css/bootswatch/journal.fix.css
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -1,6 +1,6 @@
 #website-top-navbar button.btn-primary {
     border: 2px solid #e4332e;
 }
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index c87f0de237b..56dbb1fdd5f 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,3 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index a2835886465..3fd285c826e 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,4 +1,4 @@
-#website-top-navbar [data-action="cancel"] {
+#website-top-navbar a.btn-link {
     color: #fff;
 }
 .popover .close {
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 1010ec05127..37cdcf786b5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     or
-                    <a href="#" data-action="cancel">Discard</a>
+                    <a href="#" data-action="cancel" class="btn btn-link">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>

From b711318924b9d42957679cd534044ffbaefebc16 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 20 Mar 2014 15:16:00 +0530
Subject: [PATCH 138/175] [IMP]Set the order of the sequence by date while
 posting journal entries from wizard Periodical Processing> Draft Entries>
 Post Journal Entries

bzr revid: dhr@tinyerp.com-20140320094600-7s0cfsn2yz5jr2e6
---
 addons/account/wizard/account_validate_account_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 4372ce12f04..a45d2c1969b 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -34,7 +34,7 @@ class validate_account_move(osv.osv_memory):
         if context is None:
             context = {}
         data = self.browse(cr, uid, ids, context=context)[0]
-        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)])
+        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)], order="date")
         if not ids_move:
             raise osv.except_osv(_('Warning!'), _('Specified journal does not have any account move entries in draft state for this period.'))
         obj_move.button_validate(cr, uid, ids_move, context=context)

From d73baf5d1d28c92eef31f32755cc4f9f2457ea7a Mon Sep 17 00:00:00 2001
From: "david.leach@logicsupply.com" <>
Date: Fri, 21 Mar 2014 11:24:12 +0530
Subject: [PATCH 139/175] [FIX] stock: while cancelling purcahse order created
 from procurement it availables the related internal stock move which should
 not and also not triggering the workflow method

bzr revid: ado@tinyerp.com-20140321055412-30i0ifkj8wnzmaer
---
 addons/procurement/procurement.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index badd0c7498f..f1d9bd0f680 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -441,7 +441,8 @@ class procurement_order(osv.osv):
         if len(to_cancel):
             move_obj.action_cancel(cr, uid, to_cancel)
         if len(to_assign):
-            move_obj.write(cr, uid, to_assign, {'state': 'assigned'})
+            move_obj.write(cr, uid, to_assign, {'state': 'confirmed'})
+            move_obj.action_assign(cr, uid, to_assign)
         self.write(cr, uid, ids, {'state': 'cancel'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:

From 98ca1ab20035cf2e818b52b986ff91206997d951 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 24 Mar 2014 15:45:18 +0100
Subject: [PATCH 140/175] [FIX] account_voucher: bank statement reconciliation
 for refund invoices

bzr revid: dle@openerp.com-20140324144518-pnjtlxpuz63bq6ig
---
 addons/account_voucher/account_voucher.py       | 14 +++++++++-----
 addons/account_voucher/account_voucher_view.xml |  8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f58c640b11c..ff4200ace11 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -741,13 +741,17 @@ class account_voucher(osv.osv):
 
         total_credit = 0.0
         total_debit = 0.0
-        account_type = 'receivable'
+        account_type = None
+        if context.get('account_id'):
+            account_type = self.pool['account.account'].browse(cr, uid, context['account_id'], context=context).type
         if ttype == 'payment':
-            account_type = 'payable'
+            if not account_type:
+                account_type = 'payable'
             total_debit = price or 0.0
         else:
             total_credit = price or 0.0
-            account_type = 'receivable'
+            if not account_type:
+                account_type = 'receivable'
 
         if not context.get('move_line_ids', False):
             ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
@@ -836,9 +840,9 @@ class account_voucher(osv.osv):
             else:
                 default['value']['line_dr_ids'].append(rs)
 
-            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
+            if len(default['value']['line_cr_ids']) > 0:
                 default['value']['pre_line'] = 1
-            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
+            elif len(default['value']['line_dr_ids']) > 0:
                 default['value']['pre_line'] = 1
             default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price, ttype)
         return default
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 41d3c6fc1f6..b7ea4b8fc71 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -213,10 +213,10 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
+                    <field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False, 'account_id': account_id}"/>
                 </xpath>
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
-                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
+                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False, 'account_id': account_id}"/>
                 </xpath>
                 <field name="amount" position="attributes">
                     <attribute name="on_change">onchange_amount(amount)</attribute>
@@ -230,7 +230,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'account_id': account_id}"/>
                 </xpath>
             </field>
         </record>
@@ -241,7 +241,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//page/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'account_id': account_id}"/>
                 </xpath>
             </field>
         </record>

From 66d6fb065f6677441c928899c2773e57d665986a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 24 Mar 2014 17:21:30 +0100
Subject: [PATCH 141/175] [FIX] fields: when executing (4, *) operations on o2m
 fields, check the existence based on the sql model of the table.

If the o2m field linked to the o2m is stored on a different table (eg: inherit), previous request would crash as the field do not exists in the '_table' sql table

bzr revid: mat@openerp.com-20140324162130-fyotk8vqmkha43eb
---
 openerp/osv/fields.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 1ef47bc94af..26ec6fbe112 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -571,7 +571,9 @@ class one2many(_column):
                 else:
                     cr.execute('update '+_table+' set '+self._fields_id+'=null where id=%s', (act[1],))
             elif act[0] == 4:
-                cr.execute("select 1 from {0} where id=%s and {1}=%s".format(_table, self._fields_id), (act[1], id))
+                field_model = obj.pool.get(self._obj)._all_columns[self._fields_id].parent_model
+                field_table = obj.pool.get(field_model)._table
+                cr.execute("select 1 from {0} where id=%s and {1}=%s".format(field_table, self._fields_id), (act[1], id))
                 if not cr.fetchone():
                     # Must use write() to recompute parent_store structure if needed and check access rules
                     obj.write(cr, user, [act[1]], {self._fields_id:id}, context=context or {})

From 33c6f108c09d3c7b2e4151b2831f91d9133a91a6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 24 Mar 2014 17:43:34 +0100
Subject: [PATCH 142/175] [FIX] parent_model is null if local column

bzr revid: mat@openerp.com-20140324164334-pvzevi2bnmb642ak
---
 openerp/osv/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 26ec6fbe112..986fd494f0e 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -571,8 +571,8 @@ class one2many(_column):
                 else:
                     cr.execute('update '+_table+' set '+self._fields_id+'=null where id=%s', (act[1],))
             elif act[0] == 4:
-                field_model = obj.pool.get(self._obj)._all_columns[self._fields_id].parent_model
-                field_table = obj.pool.get(field_model)._table
+                field_model = self._fields_id in obj.pool[self._obj]._columns and self._obj or obj.pool[self._obj]._all_columns[self._fields_id].parent_model
+                field_table = obj.pool[field_model]._table
                 cr.execute("select 1 from {0} where id=%s and {1}=%s".format(field_table, self._fields_id), (act[1], id))
                 if not cr.fetchone():
                     # Must use write() to recompute parent_store structure if needed and check access rules

From 87f5acb97b25c0f7d58fa769c1d42226ecaa202d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 26 Mar 2014 07:12:42 +0000
Subject: [PATCH 143/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140326071242-wi4c4p17bbhfp671
---
 addons/analytic/i18n/zh_CN.po   | 14 +++++------
 addons/crm/i18n/es.po           | 10 ++++----
 addons/crm/i18n/zh_CN.po        | 12 ++++-----
 addons/l10n_be/i18n/es.po       | 44 ++++++++++++++++-----------------
 addons/project/i18n/es.po       |  8 +++---
 addons/report_webkit/i18n/es.po | 10 ++++----
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 7e7ac23f821..670562b96a7 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.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-03-25 09:00+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -36,7 +36,7 @@ msgstr ""
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract pending"
-msgstr ""
+msgstr "合同待定中"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -76,7 +76,7 @@ msgstr ""
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Contract or Project"
-msgstr ""
+msgstr "合同或者项目"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
@@ -351,7 +351,7 @@ msgstr ""
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "成本会计"
+msgstr "辅助核算"
 
 #. module: analytic
 #: field:account.analytic.line,amount:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 3ce11ae6881..72be2db66ec 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.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-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-02-05 16:34+0000\n"
-"Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>\n"
+"PO-Revision-Date: 2014-03-25 12:07+0000\n"
+"Last-Translator: Jean Ventura <jv@venturasystems.net>\n"
 "Language-Team: Spanish <es@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-02-06 06:24+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1725,7 +1725,7 @@ msgstr "Mes de la llamada"
 #. module: crm
 #: view:crm.lead:0
 msgid "Describe the lead..."
-msgstr "Describa a la iniciativa..."
+msgstr "Describa la iniciativa..."
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:292
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index d104e92fc1c..12eeae4a090 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.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-01-07 16:56+0000\n"
-"PO-Revision-Date: 2013-11-13 09:09+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2014-03-25 09:57+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-01-08 05:40+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -712,7 +712,7 @@ msgstr "合作伙伴细分"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "登记电话：%(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -3040,7 +3040,7 @@ msgstr "参考来自"
 #: code:addons/crm/crm_lead.py:1066
 #, python-format
 msgid "Scheduled a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "预定打电话： %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index ea695c5acf6..b02f8bafd75 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2013-06-19 09:15+0000\n"
+"PO-Revision-Date: 2014-03-25 12:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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:15+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_appro_mbsd3
@@ -307,7 +307,7 @@ msgstr "Periodo (s)"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:94
 #, python-format
 msgid "No data found for the selected year."
-msgstr ""
+msgstr "No se encontró información para el año seleccionado."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actifsimmobilises0
@@ -479,7 +479,7 @@ msgstr ""
 #. module: l10n_be
 #: help:partner.vat.intra,tax_code_id:0
 msgid "Keep empty to use the user's company"
-msgstr ""
+msgstr "Dejar vacío para utilizar la compañía del usuario"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actif
@@ -507,7 +507,7 @@ msgstr "Guardar XML"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:149
 #, python-format
 msgid "No phone associated with the company."
-msgstr ""
+msgstr "Ningún teléfono asociado con esta compañía"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesplusdunan2
@@ -519,7 +519,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:111
 #, python-format
 msgid "No VAT number associated with your company."
-msgstr ""
+msgstr "No existe NIF asociado con su compañía"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesimmunises3_B
@@ -548,7 +548,7 @@ msgstr "Países europeos"
 #: view:partner.vat.intra:0
 #: view:partner.vat.list:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -569,13 +569,13 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,vat_amount:0
 msgid "VAT Amount"
-msgstr ""
+msgstr "Importe impuestos"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:246
 #, python-format
 msgid "No vat number defined for %s."
-msgstr ""
+msgstr "Ningún NIF definido para %s"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertereporte2
@@ -606,7 +606,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "No belgian contact with a VAT number in your database."
-msgstr ""
+msgstr "Ningún contacto belga con NIF en su base de datos."
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
@@ -638,12 +638,12 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:296
 #, python-format
 msgid "XML File has been Created"
-msgstr ""
+msgstr "Archivo XML creado"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_belgium_bs
 msgid "Belgium Balance Sheet"
-msgstr ""
+msgstr "Balance de situación belga"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_restitution:0
@@ -659,7 +659,7 @@ msgstr ""
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones avanzadas"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_produitsexceptionnels1
@@ -685,7 +685,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:265
 #, python-format
 msgid "No data available for the client."
-msgstr ""
+msgstr "No existe información disponible para el cliente."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_etablissementsdecrdit4
@@ -695,13 +695,13 @@ msgstr ""
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_terrainsetconstructions2
 msgid "Terrains et constructions"
-msgstr ""
+msgstr "Terrenos y construcciones"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capitalsouscrit3
@@ -716,12 +716,12 @@ msgstr "IVA empresa intracomunitaria"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_stocks2
 msgid "Stocks"
-msgstr ""
+msgstr "Existencias"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_valeursdisponibles1
 msgid "Valeurs disponibles"
-msgstr ""
+msgstr "Valores disponibles"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
@@ -778,7 +778,7 @@ msgstr "Cancelar"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:147
 #, python-format
 msgid "No email address associated with the company."
-msgstr ""
+msgstr "Ningún correo electrónico asociado con la compañía."
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -815,7 +815,7 @@ msgstr ""
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_account_report_be_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Pérdidas y ganancias"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_passif0
@@ -916,7 +916,7 @@ msgstr "Periodo de declaración de IVA"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:64
 #, python-format
 msgid "No data for the selected year."
-msgstr ""
+msgstr "No se encontró información para el año seleccionado."
 
 #. module: l10n_be
 #: field:partner.vat,limit_amount:0
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c973d7feef6..bb83b69abc1 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.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: 2013-12-27 11:22+0000\n"
+"PO-Revision-Date: 2014-03-25 17:07+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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-28 05:37+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project
 #: view:project.project:0
@@ -905,7 +905,7 @@ msgstr "GTD"
 #. module: project
 #: view:project.project:0
 msgid "Project Stages"
-msgstr "Etapas del proyecto"
+msgstr "Etapas para tareas del proyecto"
 
 #. module: project
 #: help:project.task,state:0
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 887a1e1ec59..c505e55f5ad 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-25 14:56+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -252,7 +252,7 @@ msgstr "Folio 27 210 x 330 mm"
 #. module: report_webkit
 #: field:ir.header_webkit,margin_top:0
 msgid "Top Margin (mm)"
-msgstr "Margen Superiro (mm)"
+msgstr "Margen superior (mm)"
 
 #. module: report_webkit
 #: view:report.webkit.actions:0

From c1ce6158914a3b429d596f0671d6a7b3b7039a34 Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Wed, 26 Mar 2014 16:59:22 +0530
Subject: [PATCH 144/175] [FIX] point_of_sale: Replaced the call to undefined
 search_read(...) with search(...) and read(...) calls. (Maintenance Case:
 605684)

bzr revid: rgo@tinyerp.com-20140326112922-x6ac9j157han28kb
---
 addons/point_of_sale/point_of_sale.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f79b8b3d61c..76c48d24f80 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -491,7 +491,8 @@ class pos_order(osv.osv):
     def create_from_ui(self, cr, uid, orders, context=None):      
         # Keep only new orders
         submitted_references = [o['data']['name'] for o in orders]
-        existing_orders = self.search_read(cr, uid, domain=[('pos_reference', 'in', submitted_references)], fields=['pos_reference'], context=context)
+        existing_order_ids = self.search(cr, uid, [('pos_reference', 'in', submitted_references)], context=context)
+        existing_orders = self.read(cr, uid, existing_order_ids, ['pos_reference'], context=context)
         existing_references = set([o['pos_reference'] for o in existing_orders])
         orders_to_save = [o for o in orders if o['data']['name'] not in existing_references]
         order_ids = []

From 162ad1c0f1097df069cf0c2dead4e6886fde5bc8 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Mar 2014 12:30:36 +0100
Subject: [PATCH 145/175] [FIX] web: on record reload (form & list view), use
 search_read instead of read, to check if the user can still read the record
 (security rules)

bzr revid: dle@openerp.com-20140326113036-g9yv3jj6yetwxvg8
---
 addons/web/static/src/js/view_form.js | 10 ++++++++--
 addons/web/static/src/js/view_list.js |  9 +++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index edb44e7ea06..812da9a7219 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -951,14 +951,20 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             } else {
                 var fields = _.keys(self.fields_view.fields);
                 fields.push('display_name');
-                return self.dataset.read_index(fields,
+                // Use of search_read instead of read to check if we can still read the record (security rules)
+                return self.dataset.call('search_read', [[['id', '=', self.dataset.ids[self.dataset.index]]], fields],
                     {
                         context: {
                             'bin_size': true,
                             'future_display_name': true
                         }
                     }).then(function(r) {
-                        self.trigger('load_record', r);
+                        if (_.isEmpty(r)){
+                            self.do_action('history_back');
+                        }
+                        else{
+                            self.trigger('load_record', r[0]);
+                        }
                     });
             }
         });
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 6de354bfcb8..775c90555c1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -528,13 +528,14 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
     },
     reload_record: function (record) {
         var self = this;
-        return this.dataset.read_ids(
-            [record.get('id')],
+        // Use of search_read instead of read to check if we can still read the record (security rules)
+        return this.dataset.call('search_read', [
+            [['id', '=', record.get('id')]],
             _.pluck(_(this.columns).filter(function (r) {
                     return r.tag === 'field';
-                }), 'name')
+                }), 'name')]
         ).done(function (records) {
-            var values = records[0];
+            var values = _.isEmpty(records) ? undefined : records[0];
             if (!values) {
                 self.records.remove(record);
                 return;

From 649ef3ed212249d9d76b9e5a175cf96d78f03f9c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Mar 2014 13:35:13 +0100
Subject: [PATCH 146/175] [REVERT] 4164
 revid:dle@openerp.com-20140326113036-g9yv3jj6yetwxvg8: this fix actually
 works in saas-3, but not in 7.0, as search_read method is not part of the orm

bzr revid: dle@openerp.com-20140326123513-jkful2m1n2zjgdmv
---
 addons/web/static/src/js/view_form.js | 10 ++--------
 addons/web/static/src/js/view_list.js |  9 ++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 812da9a7219..edb44e7ea06 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -951,20 +951,14 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             } else {
                 var fields = _.keys(self.fields_view.fields);
                 fields.push('display_name');
-                // Use of search_read instead of read to check if we can still read the record (security rules)
-                return self.dataset.call('search_read', [[['id', '=', self.dataset.ids[self.dataset.index]]], fields],
+                return self.dataset.read_index(fields,
                     {
                         context: {
                             'bin_size': true,
                             'future_display_name': true
                         }
                     }).then(function(r) {
-                        if (_.isEmpty(r)){
-                            self.do_action('history_back');
-                        }
-                        else{
-                            self.trigger('load_record', r[0]);
-                        }
+                        self.trigger('load_record', r);
                     });
             }
         });
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 775c90555c1..6de354bfcb8 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -528,14 +528,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
     },
     reload_record: function (record) {
         var self = this;
-        // Use of search_read instead of read to check if we can still read the record (security rules)
-        return this.dataset.call('search_read', [
-            [['id', '=', record.get('id')]],
+        return this.dataset.read_ids(
+            [record.get('id')],
             _.pluck(_(this.columns).filter(function (r) {
                     return r.tag === 'field';
-                }), 'name')]
+                }), 'name')
         ).done(function (records) {
-            var values = _.isEmpty(records) ? undefined : records[0];
+            var values = records[0];
             if (!values) {
                 self.records.remove(record);
                 return;

From 204ab9f60913614c68279552b688a28c3e409fef Mon Sep 17 00:00:00 2001
From: Yanina Aular <yanina.aular@vauxoo.com>
Date: Wed, 26 Mar 2014 18:03:29 -0430
Subject: [PATCH 147/175] [PEP8]

bzr revid: yanina.aular@vauxoo.com-20140326223329-o0dlgynicv0vq0t1
---
 addons/project/project.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index c7b394ad376..937973c9265 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -288,8 +288,9 @@ class project(osv.osv):
                                         help="The kind of document created when an email is received on this project's email alias"),
         'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached",
-            type='integer')
+        'doc_count': fields.function(
+            _get_attached_docs, string="Number of documents attached", type='integer'
+        )
      }
 
     def _get_type_common(self, cr, uid, context):

From 391037db85f9f8a2ed9b81749a77897032c0e67b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 27 Mar 2014 08:13:13 +0000
Subject: [PATCH 148/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081257-qru0hbrfsyepb2s2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081313-vs355ra8b74c35d8
---
 addons/hr_payroll_account/i18n/mn.po | 10 +++++-----
 addons/procurement/i18n/mn.po        | 10 +++++-----
 addons/project/i18n/fr.po            | 11 +++++++----
 openerp/addons/base/i18n/fr.po       | 10 +++++-----
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index 1df18587af2..8be1da902ab 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.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: 2014-02-01 12:10+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-03-27 02:58+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-02 06:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-27 08:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
@@ -124,4 +124,4 @@ msgstr "Тохируулах бичилт"
 #: field:hr.payslip,journal_id:0
 #: field:hr.payslip.run,journal_id:0
 msgid "Salary Journal"
-msgstr "Цалингийн бүртгэл"
+msgstr "Цалингийн журнал"
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 1890c48b974..e1b79d36980 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.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: 2014-02-05 00:30+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-03-27 02:07+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-06 06:24+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-27 08:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -305,7 +305,7 @@ msgstr "Батлах"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Multiple"
-msgstr "Олон тоо хэмжээ"
+msgstr "Бүхэлчлэл"
 
 #. module: procurement
 #: help:procurement.order,origin:0
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 1396c8c92f8..a75cc70eda5 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.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: 2013-07-28 06:26+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
+"PO-Revision-Date: 2014-03-26 13:18+0000\n"
+"Last-Translator: Philippe Latouche - Savoir-faire Linux <Unknown>\n"
 "Language-Team: French <fr@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-03-27 08:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project
 #: view:project.project:0
@@ -2208,6 +2208,9 @@ msgid ""
 "resource allocation.\n"
 "                This installs the module project_long_term."
 msgstr ""
+"Module de gestion de projet à long terme qui permet de suivre la "
+"planification,  l'échéancier et l'allocation des ressources.\n"
+"                Ceci installe le module project_long_term."
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 2ece6292327..06bcdcfc70b 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-01-11 07:59+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
+"PO-Revision-Date: 2014-03-26 10:59+0000\n"
+"Last-Translator: Lionel Sausin - Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@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-01-12 05:47+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-03-27 08:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -10108,7 +10108,7 @@ msgid ""
 msgstr ""
 "\n"
 "Le noyau d'OpenERP, nécessaire pour toute installation.\n"
-"===================================================\n"
+"=======================================================\n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines

From a04f73ee8051b68f5b95d6f71d3b637a8c9a8c92 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 27 Mar 2014 12:34:01 +0100
Subject: [PATCH 149/175] [IMP] cookies: when retrieving session cookie, catch
 eventual errors and remove malformed cookie

bzr revid: mat@openerp.com-20140327113401-s3ee7fnexhre9mwb
---
 addons/web/static/src/js/coresetup.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7d37dc2261d..85c3284cb8f 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -125,7 +125,12 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         for(var i=0; i<cookies.length; ++i) {
             var cookie = cookies[i].replace(/^\s*/, '');
             if(cookie.indexOf(nameEQ) === 0) {
-                return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
+                try {
+                    return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
+                } catch (err) {
+                    // delete malformed cookie
+                    this.set_cookie(name, '', -1);
+                }
             }
         }
         return null;

From 598cf8d9b350de1b883010b5a7e2b3c40eecee89 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 28 Mar 2014 06:44:40 +0000
Subject: [PATCH 150/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
---
 addons/account/i18n/sv.po                     |  80 ++++-
 addons/account_analytic_analysis/i18n/sv.po   | 248 ++++++++++----
 addons/account_analytic_default/i18n/sv.po    |  36 +-
 addons/account_analytic_plans/i18n/sv.po      |  26 +-
 addons/account_asset/i18n/sv.po               |  26 +-
 .../i18n/sv.po                                |  18 +-
 addons/account_budget/i18n/sv.po              |  35 +-
 addons/account_cancel/i18n/sv.po              |  10 +-
 addons/account_followup/i18n/sv.po            |  28 +-
 addons/account_payment/i18n/sv.po             |  26 +-
 addons/auth_ldap/i18n/sv.po                   |  15 +-
 addons/auth_signup/i18n/sv.po                 | 320 ++++++++++++++++++
 addons/base_calendar/i18n/sv.po               |  45 ++-
 addons/base_setup/i18n/sv.po                  |  50 ++-
 addons/board/i18n/sv.po                       |  59 ++--
 addons/crm_helpdesk/i18n/sv.po                |  47 ++-
 addons/document_ftp/i18n/sv.po                |  18 +-
 addons/document_webdav/i18n/sv.po             |  18 +-
 addons/fetchmail/i18n/sv.po                   |  20 +-
 addons/fleet/i18n/sv.po                       |  38 +--
 addons/hr/i18n/mn.po                          |  10 +-
 addons/hr_payroll_account/i18n/mn.po          |   2 +-
 addons/hr_timesheet_invoice/i18n/sv.po        |  10 +-
 addons/project_issue/i18n/sv.po               | 120 ++++---
 addons/sale/i18n/sv.po                        |  10 +-
 addons/sale_mrp/i18n/sv.po                    |  12 +-
 addons/sale_order_dates/i18n/sv.po            |  14 +-
 27 files changed, 1001 insertions(+), 340 deletions(-)
 create mode 100644 addons/auth_signup/i18n/sv.po

diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index d619f29648f..5999ebe2175 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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-14 22:29+0000\n"
-"PO-Revision-Date: 2014-03-18 12:33+0000\n"
+"PO-Revision-Date: 2014-03-27 13:22+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-19 06:29+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -101,6 +101,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Fel!\n"
+"Du kan inte skapa rekursiva kontomallar."
 
 #. module: account
 #. openerp-web
@@ -188,6 +190,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att lägga till en räkenskapsperiod.\n"
+"               </ p>\n"
+"                 En redovisningsperiod är vanligtvis en månad eller ett "
+"kvartal. Oftast\n"
+"                 motsvarar den skattedeklarationens perioder. \n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -202,7 +212,7 @@ msgstr "Kolumnetikett"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Antal siffror i kontokoderna"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -252,7 +262,7 @@ msgstr "Validerad"
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "Intäktsvy"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -308,6 +318,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en kund återbetalning.\n"
+"               </ p>\n"
+"                 En återbetalning är ett dokument som krediterar en faktura "
+"helt eller\n"
+"                 delvis.\n"
+"               </ p>\n"
+"                 Istället för att manuellt skapa en kundåterbetalning, kan "
+"du generera den direkt från den relaterade kundfakturan.\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: help:account.installer,charts:0
@@ -372,7 +393,7 @@ msgstr ""
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr "Tillåter dig att använda analys konteringen"
+msgstr "Aktiverar objektredovisningen"
 
 #. module: account
 #: view:account.invoice:0
@@ -440,6 +461,14 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Detta gör det möjligt att hantera de tillgångar som ägs av ett företag eller "
+"en individ.\n"
+"                 Det håller reda på de avskrivningar inträffade på dessa "
+"tillgångar, och skapar konto flytta för dessa avskrivningar linjer.\n"
+"                 Detta installerar modulen account_asset. Om du inte "
+"markerar den här rutan, kommer du att kunna göra fakturering och "
+"betalningar,\n"
+"                 men inte redovisning (Journal objekt, Kontoplan, ...)"
 
 #. module: account
 #: help:account.bank.statement.line,name:0
@@ -478,6 +507,12 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Om du väljer 'avrunda per rad \": beräknas momsbeloppet först på varje rad "
+"för att avrundas  PO / SO / fakturarad och sedan summeras  de avrundade "
+"beloppen. Om du väljer 'avrunda globalt \": summeras alla skatter och sedan "
+"avrundas totalen. Om du säljer med priser med ingående moms, ska du välja "
+"\"avrunda per rad\" för att försäkra dig om att ingående skatt matchar "
+"utgående."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -623,7 +658,7 @@ msgstr "Alla"
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Decimalprecition på journaltransaktioner"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -1181,6 +1216,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att lägga till ett konto.\n"
+"               </ p>\n"
+"                 När du gör affärer med flera valutor, kan du förlora eller "
+"vinna\n"
+"                 vissa belopp på grund av förändringar i växelkursen. Den "
+"här menyn ger\n"
+"                 du en prognos för vinst eller förlust du skulle realiseras "
+"om de\n"
+"                 transaktioner avslutades idag. Endast för konton som har "
+"en\n"
+"                 sekundär valuta angiven.\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1852,7 +1901,7 @@ msgstr "Bokslutsårsordning"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr "Analyskonto"
+msgstr "Objektsredovisning"
 
 #. module: account
 #: report:account.overdue:0
@@ -2302,7 +2351,7 @@ msgstr "Bra jobbat!"
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr "Tillgångshantering"
+msgstr "Inventarier och kapitalförvaltning"
 
 #. module: account
 #: view:account.account:0
@@ -3880,7 +3929,7 @@ msgstr "Överföringar"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Bolaget har en egen kontoplan"
 
 #. module: account
 #: view:account.chart:0
@@ -6437,7 +6486,7 @@ msgstr "Företag relaterat till denna journal"
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Aktiverar en flervalutamiljö"
 
 #. module: account
 #: view:account.subscription:0
@@ -7827,7 +7876,7 @@ msgstr "Dagbok"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Momsavrundningsmetod"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -8356,7 +8405,7 @@ msgstr ""
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Momsavrundningsmetod"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8605,6 +8654,9 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Detta gör det möjligt att automatisera påminnelsebrev för obetalda fakturor, "
+"i flera eskalerande nivåer.\n"
+"                 Detta installerar modulen account_followup."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -10848,7 +10900,7 @@ msgstr "Tillämplighet alternativ"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "The optional other currency if it is a multi-currency entry."
+msgstr "Den valfria extra valutan om det är ett fler-valuta verifikat."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 612951147d3..1d05b412d94 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -8,25 +8,25 @@ 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-03-27 16:40+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:56+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "Ingen order att fakturera, skapa en"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547
 #, python-format
 msgid "Timesheets to Invoice of %s"
-msgstr ""
+msgstr "Tidrapporter att fakturera %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -36,17 +36,17 @@ msgstr "Gruppera på..."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Att fakturera"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Återstående"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -56,7 +56,7 @@ msgstr "Real Margin Rate (%)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End date passed or prepaid unit consumed"
-msgstr ""
+msgstr "Slutdatum passerat eller förbetalning upplupen"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -71,7 +71,7 @@ msgstr "Uninvoiced Amount"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Faktura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -86,7 +86,7 @@ msgstr "Date of Last Invoiced Cost"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Summan av offerter för detta avtal"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_sales_order
@@ -101,6 +101,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en offert som kan omvandlas till en "
+"kundorder.\n"
+"               </p>\n"
+"                 Använd kundorder även för att spåra allt som ska "
+"faktureras\n"
+"                 till fastpris på ett avtal.\n"
+"               </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -110,28 +119,28 @@ msgstr "Total customer invoiced amount for this account."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Summan av fakturerade tidrapportrader för detta avtal"
 
 #. module: account_analytic_analysis
 #: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
 msgid "Contract expiration reminder ${user.company_id.name}"
-msgstr ""
+msgstr "Påminnelse utgående avtal  ${user.company_id.name}"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:464
 #, python-format
 msgid "Sales Order Lines of %s"
-msgstr ""
+msgstr "Kundorderrad från %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End date is in the next month"
-msgstr ""
+msgstr "Slutdatum är i nästa månad"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -148,7 +157,7 @@ msgstr "Analyskonto"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -173,6 +182,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa ett nytt kontrakt.\n"
+"               </ p>\n"
+"                 Här hittar du de avtal som skall förnyas på grund av att\n"
+"                 slutdatum är nått eller att kontrakterade resurser är på "
+"upphällningen.\n"
+"               </ p>\n"
+"                 OpenERP sätter avtal automatiskt ställer automatiskt "
+"kontrakt som skall förnyas inom en pågående\n"
+"                 tillstånd. Efter negociation, bör försäljaren stänga eller "
+"förnya\n"
+"                 avvaktan kontrakt.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -182,27 +205,28 @@ msgstr "Slutdatum"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Kundansvarig"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
 msgstr ""
+"Beräknas enligt följande formel: Maximum Time - totala fakturerade tid"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Förväntad"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed contracts"
-msgstr ""
+msgstr "Stängda avtal"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Beräknad med formeln: teoretisk intäkt - totalkostnad"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -223,16 +247,18 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Prislista"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Beräknad med formeln: Största möjliga tid - upparbetad tid"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -246,12 +272,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Inget att fakturera, skapa"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Obligatorisk användning av mallar i avtal"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -265,7 +291,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Totalt arbetade timmar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -278,11 +304,13 @@ msgid ""
 "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
 "('invoice_on_timesheets', '=', True)]}"
 msgstr ""
+"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
+"('invoice_on_timesheets', '=', True)]}"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts assigned to a customer."
-msgstr ""
+msgstr "Avtal knutna till en kund"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -292,7 +320,7 @@ msgstr "Hours summary by month"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts"
-msgstr ""
+msgstr "Väntande avtal"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
@@ -302,7 +330,7 @@ msgstr "Computes using the formula: (Real Margin / Total Costs) * 100."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "eller visa"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -312,7 +340,7 @@ msgstr "Förälder"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Consumed"
-msgstr ""
+msgstr "Förbrukade enheter"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,month_ids:0
@@ -324,22 +352,22 @@ msgstr "Månad"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Tid och material att fakturera"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expiring soon"
-msgstr ""
+msgstr "Går snart ut"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturerad"
 
 #. module: account_analytic_analysis
 #: model:email.template,body_html:account_analytic_analysis.account_analytic_cron_email_template
@@ -410,16 +438,83 @@ msgid ""
 "\n"
 "            "
 msgstr ""
+"\n"
+"Hej ${object.name } ,\n"
+"\n"
+"% makro account_table(values) :\n"
+"<table cellspacing=\"1\" border=\"1\" cellpadding=\"4\">\n"
+"    <tr>\n"
+"        <th>Kund</th>\n"
+"        <th>Avtal</th>\n"
+"        <th>Datum</th>\n"
+"        <th>förbetalda enheter< /th>\n"
+"        <th>Avtal</th>\n"
+"    < / tr >\n"
+"    % for partner , accounts in values :\n"
+"        % for account in accounts:\n"
+"        <tr>\n"
+"            <td> ${partner.name } < / td >\n"
+"            <td> < a "
+"href=\"${ctx[\"base_url\"]}/#action=${ctx[\"action_id\"]}&id=${account.id}&vi"
+"ew_type=form\">${account.name}</a></td>\n"
+"            <td> ${ account.date_start} till ${ account.date och "
+"account.date or \" ? ? ' } < / td >\n"
+"            <td>\n"
+"            % Om account.quantity_max = 0,0 :\n"
+"                ${ account.remaining_hours } / ${ account.quantity_max } "
+"enheter\n"
+"            % endif\n"
+"            < / td >\n"
+"            <td> ${ account.partner_id.phone or '' } , ${ "
+"account.partner_id.email or '' } < / td >\n"
+"        < / tr >\n"
+"        % endfor\n"
+"    % endfor\n"
+"< / table >\n"
+"% endmacro\n"
+"\n"
+"% if \"new\" in ctx [ \" data\" ] :\n"
+"    <h2> Följande avtal upphört att gälla : </ h2 >\n"
+"    ${ account_table ( ctx [ \" data\" ] [ \" new \" ] . iteritems ( ) ) }\n"
+"% endif\n"
+"\n"
+"% if \"old\" in ctx [ \" data\" ] :\n"
+"    <h2> Följande avslutade kontrakt fortfarande inte bearbetats : </ h2 >\n"
+"    ${ account_table ( ctx [ \" data\" ] [ \" old\" ] . iteritems ( ) ) }\n"
+"% endif\n"
+"\n"
+"% if \"future\" in ctx[ \" data\" ] :\n"
+"    <h2> Följande avtal löper ut om mindre än en månad : < / h2 >\n"
+"    ${ account_table ( ctx[ \" data\" ] [ \" future \" ] . iteritems ( ) ) "
+"}\n"
+"% endif\n"
+"\n"
+"<p>\n"
+"    Du kan kontrollera alla kontrakt som ska förnyas med hjälp av menyn :\n"
+"< /p >\n"
+"<ul>\n"
+"    <li> Försäljning / Fakturering / Avtal förnya < / li >\n"
+"< /ul >\n"
+"<p>\n"
+"    Tack ,\n"
+"< /p >\n"
+"\n"
+"<pre>\n"
+"-\n"
+"OpenERP Automatiskt e-postmeddelande\n"
+"< /pre >\n"
+"\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed"
-msgstr ""
+msgstr "Avslutad"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -438,7 +533,7 @@ msgstr "Förfallna kvantiteter"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -461,7 +556,7 @@ msgstr "Avtal"
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Kundorder"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -488,7 +583,7 @@ msgstr "Användare"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Cancelled contracts"
-msgstr ""
+msgstr "Avbrutna avtal"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
@@ -503,6 +598,14 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                     Klicka här för att skapa en mall för avtal.\n"
+"                 </p>\n"
+"                     Mallar används för att föregå kontrakt / projekt som\n"
+"                     kan väljas av säljarna att snabbt konfigurera\n"
+"                     villkoren i kontraktet.\n"
+"                 </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -520,6 +623,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Gör att du kan ställa in mallfält som krävs när man skapar ett objektkonto "
+"eller ett avtal."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -536,7 +641,7 @@ msgstr "Intäkter per tidsenhet (verklig)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expired or consumed"
-msgstr ""
+msgstr "Utgången eller förbrukad"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
@@ -553,31 +658,42 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                     Klicka för att skapa ett nytt avtal.\n"
+"                 </p>\n"
+"                     Använd avtal för att följa uppgifter, frågor, "
+"tidrapporter och fakturering baserad på\n"
+"                     arbete, kostnader och / eller kundorder. OpenERP "
+"hanterar automatiskt \n"
+"                     varningarna för förnyelse av kontrakten till rätt "
+"försäljningsansvarig.\n"
+"                 </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Totalt att fakturera"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Avtal inte knutet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Customer Contracts"
-msgstr ""
+msgstr "Kundavtal"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Totalt fakturerat"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -587,7 +703,7 @@ msgstr "Computed using the formula: Max Invoice Price - Invoiced Amount."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress (open, draft)"
-msgstr ""
+msgstr "Aktuella avtal (öppna, förslag)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -597,7 +713,7 @@ msgstr "Last Invoice Date"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Remaining"
-msgstr ""
+msgstr "Kvarstående enheter"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -612,6 +728,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                 Här hittar du tidrapporter och inköp som du gjorde för\n"
+"                 avtal som kan vidarefakturerats till kunden. Om du vill\n"
+"                 att registrera nya aktiviteter för att fakturera, bör du "
+"använda tidrapportmenyn istället.\n"
+"               </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -635,6 +758,9 @@ msgid ""
 "remaining subtotals which, in turn, are computed as the maximum between "
 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
 msgstr ""
+"Förväntan av återstående intäkter för detta avtal. Beräknas som summan av "
+"återstående delsummor, som i sin tur beräknas som maximalt mellan "
+"\"(Uppskattning - Fakturerade)\" och \"att fakturera 'belopp"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -645,7 +771,7 @@ msgstr "Avtal att förnya"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summa av allt som går att fakturera på detta avtal"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -655,7 +781,7 @@ msgstr "Teoretisk marginal"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Totalt återstående"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -665,12 +791,12 @@ msgstr "Computed using the formula: Invoiced Amount - Total Costs."
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
 msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Uppskattning av timmar att fakturera"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Fast pris"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -685,22 +811,26 @@ msgid ""
 "                            defined on the product related (e.g timesheet \n"
 "                            products are defined on each employee)."
 msgstr ""
+"Vid vidarefakturering av kostnader, använder OpenERP den\n"
+"                             prislista som är knuten till avtalet och den "
+"relaterade produkten (t.ex. på tidrapport\n"
+"                             finns en produkt knuten till varje anställd)."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Obligatorisk användning av mallar"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Contract Template"
-msgstr ""
+msgstr "Avtalsmall"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -714,7 +844,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "Total uppskattning"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -740,17 +870,17 @@ msgstr "Total Time"
 #: model:res.groups,comment:account_analytic_analysis.group_template_required
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
-msgstr ""
+msgstr "Fältet mall för objektkontot och avtal kommer bli obligatoriskt"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "På tidrapporter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #~ msgid "Pending contracts to renew with your customer"
 #~ msgstr "Väntande avtal att förnya med dina kunder"
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 8af59455628..3c8d1af3937 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.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-03-27 15:11+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -27,12 +27,12 @@ msgstr "Objektregler"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Gruppera"
+msgstr "Gruppera på..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Standard slutdatum för detta objektkonto"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -41,6 +41,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj en produkt som kommer att använda objektkonto som anges i mallen (t.ex. "
+"skapa nya kundfaktura eller försäljnings ordning om vi väljer denna produkt, "
+"kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -65,12 +68,15 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj ett företag som kommer att använda objektkonto som anges i mallen "
+"(t.ex. skapa nya kundfaktura eller försäljnings ordning om vi väljer denna "
+"partner, kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -81,7 +87,7 @@ msgstr "Användare"
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr "Poster"
+msgstr "Transaktioner"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -98,13 +104,14 @@ msgstr "Standard objektkonto"
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr "Sekvens"
+msgstr "Nummerserie"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Välj en användare som kommer att använda objektkontot som anges i mallen."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -118,22 +125,25 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj ett bolag som kommer att använda objektkontot som anges i mallen (t.ex. "
+"skapa nya kundfaktura eller försäljnings ordning om vi väljer det här "
+"företaget, kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Analys konto"
+msgstr "Objektkonto"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Objektdistribution"
+msgstr "Objektfördelning"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standard startdatum för detta objektkonto"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -144,7 +154,7 @@ msgstr "Konton"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index fc9c08d8f5e..9eb7c7677bb 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.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-03-27 12:06+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -49,7 +49,7 @@ msgstr "Kurs (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Totalen borde vara mellan %s och %s"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -133,7 +133,7 @@ msgstr "Visa inte tomma rader"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Kontot %s saknar objekttransaktioner"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -144,7 +144,7 @@ msgstr "Konto3 Id"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -283,7 +283,7 @@ msgstr "Kontoutdragsrad"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -299,7 +299,7 @@ msgstr "Skriv ut korsrefererande objekt"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Användarfel!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -317,7 +317,7 @@ msgstr "Analysjournal"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Vänligen ange namn och kod innan förlagan sparas"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -349,7 +349,7 @@ msgstr "Journal"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "En objektjournal måste definieras för '%s'-journalen"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -377,7 +377,7 @@ msgstr "Fakturarad"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Objektplan saknas"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -404,7 +404,7 @@ msgstr "Objektfördelning"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "En förlaga med detta namn och kod finns redan"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index fd44381b69a..e95872c9ff0 100644
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.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-03-27 12:09+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -148,7 +148,7 @@ msgstr "Belopp som enligt plan inte kan avskrivas"
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Tiden mellan två avskivningar, i månader"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -160,7 +160,7 @@ msgstr "Avskrivningsdatutm"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Fel ! Rekursiva tillgångar kan inte skapas."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -200,7 +200,7 @@ msgstr "Avskrivningsverifikat"
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -211,7 +211,7 @@ msgstr "# avskrivningsrader"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Antal månader i en period"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -271,12 +271,12 @@ msgstr "Ändra varaktighet"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Antal avskrivningar för att anse tillgången helt avskriven"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Objektinformation"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -300,7 +300,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Nästa avskrivningsperiod"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -351,7 +351,7 @@ msgstr "Sök tillgångskategori"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "månader"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -379,7 +379,7 @@ msgstr "Tidmetoden"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index 439f5592fbd..a39cef9e913 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.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-03-27 12:11+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line.global,name:0
@@ -59,7 +59,7 @@ msgstr "Avbryt valda utdragsrader"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Värdedatum"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -104,7 +104,7 @@ msgstr "Batchbetalningsinformation"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -117,7 +117,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -224,7 +224,7 @@ msgstr "Manuell"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Banktransaktion"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -330,7 +330,7 @@ msgstr "Bankutdragsrad"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 82f62b2e9fe..b0f78e66566 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.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: 2013-01-19 00:15+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-27 12:17+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -147,6 +147,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en ny budget.\n"
+"               </ p>\n"
+"                 En budget är en prognos av företagets förväntade intäkter "
+"och / eller \n"
+"                kostnader för en framtida period. En budget är definierad på "
+"vissa\n"
+"                 finansiella konton och / eller objektkonton (som kan vara\n"
+"                 projekt, avdelningar, produktkategorier, etc.)\n"
+"               </ p>\n"
+"                 Genom att hålla reda på var dina pengar går, så vet du vid "
+"varje tillfälle hur mycket \n"
+"                 du kan spendera, och vara mer benägen att möta dina "
+"ekonomiska\n"
+"                 mål. Skapa en budget genom att specificera den förväntade "
+"intäkten per\n"
+"                 objektkonto och följa dess utveckling baserad på det "
+"verkliga utfallet\n"
+"                 under den perioden.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
@@ -266,7 +287,7 @@ msgstr "Att godkänna budgetar"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -364,12 +385,12 @@ msgstr "Teoretiskt belopp"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Cancel Budget"
-msgstr ""
+msgstr "Avbryt budget"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index dd5efb025f8..12df7ac7d01 100644
--- a/addons/account_cancel/i18n/sv.po
+++ b/addons/account_cancel/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-27 12:42+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Annullera faktura"
 
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index 288845f9481..b18e2e82aef 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.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: 2013-01-20 17:26+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-27 12:20+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -28,7 +28,7 @@ msgstr "${user.company_id.name}-betalningspåminnelse"
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Den högsta uppföljningsnivån"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -44,12 +44,12 @@ msgstr "Uppföljning"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Datum för nästa åtgärd"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -60,12 +60,12 @@ msgstr "Manuell åtgärd"
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Behöver skrivas ut"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Åtgärd att utföra"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -106,7 +106,7 @@ msgstr "Uppföljningssteg"
 #: code:addons/account_followup/account_followup.py:261
 #, python-format
 msgid "Due Date"
-msgstr ""
+msgstr "Förfallodatum"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -119,7 +119,7 @@ msgstr "Skicka uppföljningar"
 #: code:addons/account_followup/report/account_followup_print.py:86
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -138,7 +138,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Inte ansvarig"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -205,7 +205,7 @@ msgstr ""
 #: code:addons/account_followup/account_followup.py:260
 #, python-format
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -230,7 +230,7 @@ msgstr ": Partnernamn"
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Anslut en ansvarig"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index e7254eae119..a5451e535a5 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.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-03-27 12:23+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -29,6 +29,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en betalningsorder.\n"
+"               </ p>\n"
+"                 En betalningsorder är en begäran om utbetalning från ditt "
+"företag att betala en\n"
+"                 leverantörsfaktura eller en kundåterbetalning.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -121,7 +129,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -211,7 +219,7 @@ msgstr "OCR"
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "Importera betalningsrader"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -253,7 +261,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Registeringsdatum"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -392,7 +400,7 @@ msgstr "Preliminär"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -439,7 +447,7 @@ msgstr "Sök"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: account_payment
 #: field:payment.line,date:0
diff --git a/addons/auth_ldap/i18n/sv.po b/addons/auth_ldap/i18n/sv.po
index c086ccc8774..9bd5d5c7454 100644
--- a/addons/auth_ldap/i18n/sv.po
+++ b/addons/auth_ldap/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-27 12:32+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "Mallanvändare"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -29,6 +29,9 @@ msgid ""
 "option requires a server with STARTTLS enabled, otherwise all authentication "
 "attempts will fail."
 msgstr ""
+"Begär säker TLS / SSL-kryptering vid anslutning till LDAP-servern. Det här "
+"alternativet kräver en server med STARTTLS aktiverad, annars kommer alla "
+"autentiseringsförsök att misslyckas."
 
 #. module: auth_ldap
 #: view:res.company:0
@@ -146,7 +149,7 @@ msgstr ""
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_filter:0
diff --git a/addons/auth_signup/i18n/sv.po b/addons/auth_signup/i18n/sv.po
new file mode 100644
index 00000000000..0ed094c5fc1
--- /dev/null
+++ b/addons/auth_signup/i18n/sv.po
@@ -0,0 +1,320 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-27 12:30+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"A password reset has been requested for this user. An email containing the "
+"following link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr "Bekräfta lösenord"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an invitation email"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Activated"
+msgstr "Aktiverad"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr "Återställ lösenord"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send reset password link by email"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"An invitation email containing the following subscription link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Never Connected"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.set_password_email
+msgid ""
+"\n"
+"                \n"
+"                    <p>\n"
+"                        ${object.name},\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        You have been invited to connect to "
+"\"${object.company_id.name}\" in order to get access to your documents in "
+"OpenERP.\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        To accept the invitation, click on the following "
+"link:\n"
+"                    </p>\n"
+"                    <ul>\n"
+"                        <li><a href=\"${object.signup_url}\">Accept "
+"invitation to \"${object.company_id.name}\"</a></li>\n"
+"                    </ul>\n"
+"                    <p>\n"
+"                        Thanks,\n"
+"                    </p>\n"
+"                    <pre>\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    </pre>\n"
+"                \n"
+"            "
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:270
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:177
+#, python-format
+msgid "An email has been sent with credentials to reset your password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.set_password_email
+msgid "${object.company_id.name} invitation to connect on OpenERP"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, python-format
+msgid "Sign Up"
+msgstr ""
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index 72e8e7c6c0c..f6e1f26c5e7 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.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: 2013-07-08 15:23+0000\n"
+"PO-Revision-Date: 2014-03-27 15:19+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -354,6 +354,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
@@ -524,7 +526,7 @@ msgstr "Evenemangsalarminformation"
 #: code:addons/base_calendar/base_calendar.py:1017
 #, python-format
 msgid "Count cannot be negative or 0."
-msgstr ""
+msgstr "Kan inte vara negativ eller 0."
 
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
@@ -565,7 +567,7 @@ msgstr "Caldav URL"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Inbjudningsguide"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -748,7 +750,7 @@ msgstr "Avslaget"
 #: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
-msgstr ""
+msgstr "Gruppering efter datum stöds inte,  använd kalendervyn i stället."
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -905,7 +907,7 @@ msgstr "Måndag"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet4
 msgid "Open Discussion"
-msgstr ""
+msgstr "Öppen diskussion"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
@@ -940,7 +942,7 @@ msgstr "Den"
 #. module: base_calendar
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Avtalsdatum"
 
 #. module: base_calendar
 #: field:calendar.attendee,delegated_from:0
@@ -1009,7 +1011,7 @@ msgstr "Osäker"
 #: constraint:calendar.todo:0
 #: constraint:crm.meeting:0
 msgid "Error ! End date cannot be set before start date."
-msgstr ""
+msgstr "Fel ! Slutdatum kan inte sättas före startdatum."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
@@ -1185,6 +1187,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Klicka för att schemalägga ett nytt möte.\n"
+"           </p>\n"
+"             Kalendern delas mellan anställda och helt integrerad med\n"
+"             andra applikationer såsom personal semester eller affärs\n"
+"             möjligheter.\n"
+"           </p>\n"
+"        "
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1369,6 +1379,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att ställa in ett nytt larm typ.\n"
+"               </p>\n"
+"                 Du kan definiera en anpassad typ av alarm som kan vara\n"
+"                 tilldelats kalenderhändelser eller möten.\n"
+"               </p>\n"
+"            "
 
 #. module: base_calendar
 #: selection:crm.meeting,state:0
@@ -1425,7 +1442,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_message
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
@@ -1450,7 +1467,7 @@ msgstr "april"
 #: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
-msgstr ""
+msgstr "E-postadress saknas"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1468,7 +1485,7 @@ msgstr "Veckodag"
 #: code:addons/base_calendar/base_calendar.py:1015
 #, python-format
 msgid "Interval cannot be negative."
-msgstr ""
+msgstr "Intervallet kan inte vara negativt."
 
 #. module: base_calendar
 #: field:calendar.event,byday:0
@@ -1481,7 +1498,7 @@ msgstr "Per dag"
 #: code:addons/base_calendar/base_calendar.py:441
 #, python-format
 msgid "First you have to specify the date of the invitation."
-msgstr ""
+msgstr "Först måste du ange dagen för inbjudan."
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
@@ -1564,7 +1581,7 @@ msgstr "lördag"
 #: field:calendar.todo,interval:0
 #: field:crm.meeting,interval:0
 msgid "Repeat Every"
-msgstr ""
+msgstr "Repetera varje"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index bd46774c3c3..a7bb7d9636f 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.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: 2013-12-30 14:52+0000\n"
-"Last-Translator: Anders Eriksson, Mobila System <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2014-03-27 14:59+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-31 05:26+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -42,6 +42,7 @@ msgstr "base.config.settings"
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Använd externa identitetsleverantörer, logga in med google, facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +56,15 @@ msgid ""
 "OpenERP using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"OpenERP gör det möjligt att automatiskt skapa kundämnen (eller andra "
+"dokument)\n"
+"                             från inkommande e-post. Du kan automatiskt "
+"synkronisera e-post med OpenERP\n"
+"                             med vanliga POP / IMAP-konton, med hjälp av ett "
+"e-integrationsprogram för din\n"
+"                             e-postserver, eller genom att manuellt spara e-"
+"post till OpenERP via specifika\n"
+"                             plugins för ditt favorit-e-postprogram."
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
@@ -179,7 +189,7 @@ msgstr "Hyresgästen"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Dela eller bädda in godtycklig OpenERP-vy."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -202,6 +212,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Arbeta i flera företagsmiljöer, med lämplig tillgång säkerhet mellan "
+"företagen.\n"
+"                 Detta installerar modulen multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -210,6 +223,10 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Den offentliga Portalen är tillgänglig endast om du är i en endatabas läge. "
+"Du kan\n"
+"                                     starta OpenERP Server med det "
+"alternativet"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -242,6 +259,13 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"När du skickar ett dokument till en kund\n"
+"                                     (citat, faktura), kommer kunden att få\n"
+"                                     möjlighet att registrera sig på "
+"webbplatsen för att få alla sina dokument,\n"
+"                                     Läs ditt företag nyheter, följa sitt "
+"projekt,\n"
+"                                     etc."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -270,6 +294,13 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"Insticksprogrammet låter dig arkivera e-post och bilagor till det valda\n"
+"                 OpenERP-objektet. Du kan välja ett företag, eller ett "
+"kundämne och\n"
+"                 bifoga den markerade posten som en. EML-fil i\n"
+"                 en bilaga. Du kan skapa dokument för CRM kundämnen,\n"
+"                 företag från de valda e-post.\n"
+"                 Detta installerar modulen plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -298,6 +329,12 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"I Outlook plugin låter dig välja ett objekt som du vill lägga till\n"
+"                 till din e-post och bilagor från MS Outlook. Du kan välja "
+"ett företag,\n"
+"                 eller en kundämnet och arkivera en vald\n"
+"                 e-post till en OpenERP-meddelande med bilagor.\n"
+"                 Detta installerar modulen plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -316,6 +353,9 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"att göra så.\n"
+"                                     När aktiverad, kommer inloggningssidan "
+"ersättas av den publika webbplatsen."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 67e929b7b27..1c7e2d50429 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -8,58 +8,58 @@ 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-03-27 12:29+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
 #: model:ir.ui.menu,name:board.menu_board_create
 msgid "Create Board"
-msgstr ""
+msgstr "Skapa en anslagstavla"
 
 #. module: board
 #: view:board.create:0
 msgid "Create"
-msgstr ""
+msgstr "Skapa"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:4
 #, python-format
 msgid "Reset Layout.."
-msgstr ""
+msgstr "Återställ layouten"
 
 #. module: board
 #: view:board.create:0
 msgid "Create New Dashboard"
-msgstr ""
+msgstr "Skapa ny anslagstavla"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:40
 #, python-format
 msgid "Choose dashboard layout"
-msgstr ""
+msgstr "Välj anslagstavellayout"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:70
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Lägg till"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:139
 #, python-format
 msgid "Are you sure you want to remove this item ?"
-msgstr ""
+msgstr "Är du säker på att du vill radera?"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -71,31 +71,31 @@ msgstr "Bräde"
 #: model:ir.actions.act_window,name:board.open_board_my_dash_action
 #: model:ir.ui.menu,name:board.menu_board_my_dash
 msgid "My Dashboard"
-msgstr ""
+msgstr "Min anslagstavla"
 
 #. module: board
 #: field:board.create,name:0
 msgid "Board Name"
-msgstr ""
+msgstr "Tavelnamn"
 
 #. module: board
 #: model:ir.model,name:board.model_board_create
 msgid "Board Creation"
-msgstr ""
+msgstr "Anslagstavelbyggande"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:67
 #, python-format
 msgid "Add to Dashboard"
-msgstr ""
+msgstr "Lägg till anslagstavlan"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:28
 #, python-format
 msgid "&nbsp;"
-msgstr ""
+msgstr "&nbsp;"
 
 #. module: board
 #: model:ir.actions.act_window,help:board.open_board_my_dash_action
@@ -115,13 +115,28 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                   <p>\n"
+"                     <b> Din personliga anslagstavla är tom. </ b>\n"
+"                   </ p>\n"
+"                     För att lägga till din första rapport i denna tavla, gå "
+"till någon\n"
+"                     meny, växla till lista eller graf visa och klicka <i> "
+"\"Lägg till\n"
+"                     anslagstavlan \"</ i> i de utökade sökmöjligheter.\n"
+"                   </ p>\n"
+"                     Du kan välja och gruppera data innan du sätter in i\n"
+"                     instrumentpanel med sökalternativen.\n"
+"                   </ p>\n"
+"               </ div>\n"
+"            "
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:6
 #, python-format
 msgid "Reset"
-msgstr ""
+msgstr "Återställ"
 
 #. module: board
 #: field:board.create,menu_parent_id:0
@@ -133,21 +148,21 @@ msgstr "Parent Menu"
 #: code:addons/board/static/src/xml/board.xml:8
 #, python-format
 msgid "Change Layout.."
-msgstr ""
+msgstr "Ändra layout..."
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:93
 #, python-format
 msgid "Edit Layout"
-msgstr ""
+msgstr "Ändra layout"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:10
 #, python-format
 msgid "Change Layout"
-msgstr ""
+msgstr "Ändra layout"
 
 #. module: board
 #: view:board.create:0
@@ -157,11 +172,11 @@ msgstr "Cancel"
 #. module: board
 #: view:board.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:69
 #, python-format
 msgid "Title of new dashboard item"
-msgstr ""
+msgstr "Titel på anslagstavlan"
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index a32cfbc4424..3a506d893b6 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.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: 2013-01-19 00:22+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-27 14:44+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -36,7 +36,7 @@ msgstr "Gruppera på..."
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "Destination email for email gateway"
-msgstr ""
+msgstr "Mottagande e-postadress i E-postbryggan"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -46,7 +46,7 @@ msgstr "Mars"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -63,7 +63,7 @@ msgstr "Övervakarens e-post"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -106,7 +106,7 @@ msgstr "Avbruten"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -275,7 +275,7 @@ msgstr "Ingen rubrik"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel Case"
-msgstr ""
+msgstr "Avsluta ärendet"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -283,6 +283,8 @@ msgid ""
 "Helpdesk requests that are assigned to me or to one of the sale teams I "
 "manage"
 msgstr ""
+"Kundtjänst-förfrågningar som tilldelats mig eller till någon av de "
+"försäljningsteam jag hanterar"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -297,7 +299,7 @@ msgstr "Alla väntande kundjtänstärenden"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close Case"
-msgstr ""
+msgstr "Stäng ärendet"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -410,7 +412,7 @@ msgstr "Väntande"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -455,6 +457,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en ny begäran.\n"
+"               </ p>\n"
+"                 Helpdesk och support gör att du kan spåra dina insatser.\n"
+"               </ p>\n"
+"                 Använd OpenERP Frågor system för att hantera ditt stöd\n"
+"                 aktiviteter. Frågor som kan anslutas till den e-gateway: "
+"new\n"
+"                 e-post kan skapa problem, får var och en av dem "
+"automatiskt\n"
+"                 historia av samtalet med kunden.\n"
+"               </ p>\n"
+"            "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
@@ -511,7 +526,7 @@ msgstr "Januari"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -527,7 +542,7 @@ msgstr "Övrigt"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "olagMitt b"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -662,11 +677,15 @@ msgid ""
 "        \n"
 "If the case needs to be reviewed then the status is set to 'Pending'."
 msgstr ""
+"Statusen är satt till \"Utkast\", när ett ärende skapas.\n"
+"Om ärendet pågår status är inställd på \"Öppna\".\n"
+"När fallet är över, är det status till \"Klar\".\n"
+"Om ärendet måste ses över så att status är \"Väntar\"."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index 4fb04446c30..dc2e1d31358 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.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-03-27 12:39+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -45,7 +45,7 @@ msgstr ""
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: document_ftp
 #: model:ir.actions.act_url,name:document_ftp.action_document_browse
@@ -55,7 +55,7 @@ msgstr "Bläddra bland filer"
 #. module: document_ftp
 #: help:knowledge.config.settings,document_ftp_url:0
 msgid "Click the url to browse the documents"
-msgstr ""
+msgstr "Klicka på url-en för att bläddra bland dokumenten"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -70,7 +70,7 @@ msgstr "FTP-serverkonfiguration"
 #. module: document_ftp
 #: field:knowledge.config.settings,document_ftp_url:0
 msgid "Browse Documents"
-msgstr ""
+msgstr "Dokumentbläddring"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -98,7 +98,7 @@ msgstr "Adress"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
@@ -118,7 +118,7 @@ msgstr "Dokumentbläddring"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index cd23b91aa7c..3fbb4d5f63d 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -8,20 +8,20 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-27 15:06+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
 #: field:document.webdav.file.property,create_date:0
 msgid "Date Created"
-msgstr "Skapad datum"
+msgstr "Registreringsdatum"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
@@ -31,7 +31,7 @@ msgstr "Dokument"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "Dokumentattribut"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -61,7 +61,7 @@ msgstr "document.webdav.file.property"
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr "Gruppera"
+msgstr "Gruppera på..."
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -122,7 +122,7 @@ msgstr "Värde"
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr "Katalog"
+msgstr "Mapp"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_uid:0
@@ -150,7 +150,7 @@ msgstr "Författare"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Dokumentattribut"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index faaf391a2a7..81d66294521 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-27 12:42+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -70,7 +70,7 @@ msgstr ""
 #. module: fetchmail
 #: view:base.config.settings:0
 msgid "Configure the incoming email gateway"
-msgstr ""
+msgstr "Konfigurera den inkomande e-postbryggan"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -101,7 +101,7 @@ msgstr "Lokal server"
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -121,7 +121,7 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
@@ -150,7 +150,7 @@ msgstr "Behåll original"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Avancerade alternativ"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -196,6 +196,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s."
 msgstr ""
+"Detta fick vi istället:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -240,7 +242,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Utgående e-post"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
diff --git a/addons/fleet/i18n/sv.po b/addons/fleet/i18n/sv.po
index 14c66351e82..2883735942c 100644
--- a/addons/fleet/i18n/sv.po
+++ b/addons/fleet/i18n/sv.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-01-17 23:59+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-27 13:28+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -30,7 +30,7 @@ msgstr "Kompakt"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_1
 msgid "A/C Compressor Replacement"
-msgstr ""
+msgstr "Byte av komfortkyla"
 
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
@@ -42,7 +42,7 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.services:0
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -58,12 +58,12 @@ msgstr "Okänt"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_20
 msgid "Engine/Drive Belt(s) Replacement"
-msgstr ""
+msgstr "Kamremsbyte"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Vehicle costs"
-msgstr ""
+msgstr "Fordonskostnad"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -74,7 +74,7 @@ msgstr "Diesel"
 #: code:addons/fleet/fleet.py:421
 #, python-format
 msgid "License Plate: from '%s' to '%s'"
-msgstr ""
+msgstr "Registreringsskylt från '%s' till '%s'"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_38
@@ -90,7 +90,7 @@ msgstr "Gruppera efter..."
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_32
 msgid "Oil Pump Replacement"
-msgstr ""
+msgstr "Byte oljepump"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_18
@@ -142,7 +142,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,liter:0
 msgid "Liter"
-msgstr ""
+msgstr "Liter"
 
 #. module: fleet
 #: model:ir.actions.client,name:fleet.action_fleet_menu
@@ -152,22 +152,22 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Fuel Costs"
-msgstr ""
+msgstr "Bränslekostnader"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_9
 msgid "Battery Inspection"
-msgstr ""
+msgstr "Batteriinspektion"
 
 #. module: fleet
 #: field:fleet.vehicle,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bolag"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -209,7 +209,7 @@ msgstr ""
 #: view:fleet.vehicle:0
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Services"
-msgstr ""
+msgstr "Servicetillfällen"
 
 #. module: fleet
 #: help:fleet.vehicle,odometer:0
@@ -222,7 +222,7 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
@@ -238,7 +238,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Total kostnad"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
@@ -255,7 +255,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Terminate Contract"
-msgstr ""
+msgstr "Avsluta avtal"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,parent_id:0
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 453bf89fe52..1681bc0ac2c 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.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-02-01 18:23+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-03-28 02:50+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-02 06:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -541,7 +541,7 @@ msgstr "Ажилчдын бүтэц"
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Гэрээний мэдээлэл"
+msgstr "Холбоо барих мэдээлэл"
 
 #. module: hr
 #: field:res.users,employee_ids:0
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index 8be1da902ab..5ddb71011d6 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.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-03-27 08:13+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 66afa18ce49..0bb07e85372 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.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-01-30 23:31+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-27 12:40+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -60,7 +60,7 @@ msgstr "Gruppera efter..."
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Force to use a specific product"
-msgstr ""
+msgstr "Kräv en viss produkt"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
diff --git a/addons/project_issue/i18n/sv.po b/addons/project_issue/i18n/sv.po
index 52c897a92ec..21d4d74ec68 100644
--- a/addons/project_issue/i18n/sv.po
+++ b/addons/project_issue/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-27 17:24+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
 msgid "Deadly bug"
-msgstr ""
+msgstr "Showstopper"
 
 #. module: project_issue
 #: help:project.config.settings,fetchmail_issue:0
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create issues from "
 "incoming emails."
 msgstr ""
+"Tillåter att du konfigurerar din e-postserver för inkommande meddelanden att "
+"skapa ärenden automatiskt"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -48,7 +50,7 @@ msgstr "Arbetstid för att öppna ärendet"
 #. module: project_issue
 #: model:mail.message.subtype,description:project_issue.mt_issue_started
 msgid "Issue started"
-msgstr ""
+msgstr "Ärende öppnat"
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -74,7 +76,7 @@ msgstr "Upparbetat (%)"
 #: view:project.issue:0
 #: field:project.issue,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: project_issue
 #: field:project.issue,company_id:0
@@ -97,11 +99,16 @@ msgid ""
 " * Ready for next stage indicates the issue is ready to be pulled to the "
 "next stage"
 msgstr ""
+"Ett ärendes Kanban-tillstånd indikerar speciella situationer som påverkar "
+"det:\n"
+"  * Normal är standardläget\n"
+"  * Blockerad indikerar något hindrar utvecklingen av denna fråga\n"
+"  * Redo för nästa steg anger att frågan är klar att dras till nästa steg"
 
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: project_issue
 #: help:account.analytic.account,use_issues:0
@@ -155,7 +162,7 @@ msgstr "Dagar sedan registrering"
 #: view:project.issue.report:0
 #: field:project.issue.report,task_id:0
 msgid "Task"
-msgstr "Ärende"
+msgstr "Uppgift"
 
 #. module: project_issue
 #: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
@@ -194,6 +201,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Klicka för att öppna ett nytt ärende.\n"
+"           </p>\n"
+"<p>             Med OpenERP ärendehantering kan du effektivt hantera saker\n"
+"             som interna förfrågningar, mjukvaruutvecklingsbuggar, kund-\n"
+"             klagomål, projektbekymmer, materialhaverier etc.\n"
+"           </p>\n"
+"        "
 
 #. module: project_issue
 #: selection:project.issue,state:0
@@ -204,7 +219,7 @@ msgstr "Avbruten"
 #. module: project_issue
 #: field:project.issue,description:0
 msgid "Private Note"
-msgstr ""
+msgstr "Privat notering"
 
 #. module: project_issue
 #: field:project.issue.report,date_closed:0
@@ -229,7 +244,7 @@ msgstr "Arbetstimmar innan problemet är öppnar i snitt"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Objektkonto"
 
 #. module: project_issue
 #: help:project.issue,message_summary:0
@@ -237,6 +252,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: project_issue
 #: help:project.project,project_escalation_id:0
@@ -256,12 +273,12 @@ msgstr "Tilläggsinformation"
 #: code:addons/project_issue/project_issue.py:479
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Edit..."
-msgstr ""
+msgstr "Redigera..."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -272,7 +289,7 @@ msgstr "Ansvarig"
 #: model:mail.message.subtype,name:project_issue.mt_issue_blocked
 #: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
 msgid "Issue Blocked"
-msgstr ""
+msgstr "Ärende blockerat"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -282,13 +299,13 @@ msgstr "Statistik"
 #. module: project_issue
 #: field:project.issue,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanbanstatus"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:366
 #, python-format
 msgid "Project issue <b>converted</b> to task."
-msgstr ""
+msgstr "Ärende <b>konverterat</b> till uppgift"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -309,7 +326,7 @@ msgstr "Version"
 #. module: project_issue
 #: field:project.issue,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -321,7 +338,7 @@ msgstr "Ny"
 #. module: project_issue
 #: view:project.project:0
 msgid "{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}"
-msgstr ""
+msgstr "{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}"
 
 #. module: project_issue
 #: field:project.issue,email_from:0
@@ -344,7 +361,7 @@ msgstr "Lägsta"
 #: code:addons/project_issue/project_issue.py:388
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -377,7 +394,7 @@ msgstr "project.issue.version"
 #. module: project_issue
 #: field:project.config.settings,fetchmail_issue:0
 msgid "Create issues from an incoming email account "
-msgstr ""
+msgstr "Skapa ett ärende från ett inkommande e-post,eddelande "
 
 #. module: project_issue
 #: view:project.issue:0
@@ -423,7 +440,7 @@ msgstr "Ärendeanalys"
 #: code:addons/project_issue/project_issue.py:516
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Inget ämne"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
@@ -441,7 +458,7 @@ msgstr "Kontakt"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:371
@@ -467,7 +484,7 @@ msgstr "december"
 #. module: project_issue
 #: field:project.issue,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -477,12 +494,12 @@ msgstr "Ärendeuppföljningslista"
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_01
 msgid "Little problem"
-msgstr ""
+msgstr "Litet problem"
 
 #. module: project_issue
 #: view:project.project:0
 msgid "creates"
-msgstr ""
+msgstr "skapar"
 
 #. module: project_issue
 #: field:project.issue,write_date:0
@@ -492,7 +509,7 @@ msgstr "Uppdateringsdatum"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Project:"
-msgstr ""
+msgstr "Projekt:"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -508,7 +525,7 @@ msgstr "Nästa åtgärd"
 #: view:project.issue:0
 #: selection:project.issue,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blockerad"
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -592,7 +609,7 @@ msgstr "Normal"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Category:"
-msgstr ""
+msgstr "Kategori:"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -602,7 +619,7 @@ msgstr "juni"
 #. module: project_issue
 #: help:project.issue,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -617,7 +634,7 @@ msgstr "Dagar i behandling"
 #. module: project_issue
 #: field:project.issue,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: project_issue
 #: help:project.issue,state:0
@@ -644,7 +661,7 @@ msgstr "november"
 #: code:addons/project_issue/project_issue.py:499
 #, python-format
 msgid "Customer Email"
-msgstr ""
+msgstr "Kund-e-postmeddelande"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -679,7 +696,7 @@ msgstr "De här personerna kommer att ta emot e-post."
 #. module: project_issue
 #: field:project.issue,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: project_issue
 #: field:project.issue,date:0
@@ -696,12 +713,12 @@ msgstr "Tilldelad"
 #. module: project_issue
 #: view:project.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: project_issue
 #: model:mail.message.subtype,description:project_issue.mt_issue_closed
 msgid "Issue closed"
-msgstr ""
+msgstr "Ärende stängt"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -755,12 +772,12 @@ msgstr "Projektärenden"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Add an internal note..."
-msgstr ""
+msgstr "Lägg till intern notering"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Cancel Issue"
-msgstr ""
+msgstr "Avbryt ärende"
 
 #. module: project_issue
 #: help:project.issue,progress:0
@@ -770,13 +787,13 @@ msgstr "Beräknas som: nedlagd tid / total tid."
 #. module: project_issue
 #: field:project.project,issue_count:0
 msgid "Unclosed Issues"
-msgstr ""
+msgstr "Oavstängda ärenden"
 
 #. module: project_issue
 #: view:project.issue:0
 #: selection:project.issue,kanban_state:0
 msgid "Ready for next stage"
-msgstr ""
+msgstr "Klar för nästa steg"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -806,7 +823,7 @@ msgstr "Ärende"
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
-msgstr ""
+msgstr "SBS"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -831,13 +848,13 @@ msgstr "maj"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project_issue
 #: model:mail.message.subtype,name:project_issue.mt_issue_closed
 #: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
 msgid "Issue Closed"
-msgstr ""
+msgstr "Ärende stängt"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -849,13 +866,13 @@ msgstr "# e-postmeddelanden"
 #: model:mail.message.subtype,name:project_issue.mt_issue_new
 #: model:mail.message.subtype,name:project_issue.mt_project_issue_new
 msgid "Issue Created"
-msgstr ""
+msgstr "Ärende skapat"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:497
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -866,7 +883,7 @@ msgstr "februari"
 #: model:mail.message.subtype,description:project_issue.mt_issue_stage
 #: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Steg ändrat"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -890,6 +907,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att lägga till en ny version.\n"
+"               </p><p>\n"
+"                 Här definierar du de olika versionerna av dina produkter "
+"som du kan knyta ärenden till.\n"
+"               </p>\n"
+"            "
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -908,7 +932,7 @@ msgstr "Mina ärenden"
 #. module: project_issue
 #: help:project.issue.report,delay_open:0
 msgid "Number of Days to open the project issue."
-msgstr ""
+msgstr "Antal dagar innan ärendet öppnas"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -918,12 +942,12 @@ msgstr "april"
 #. module: project_issue
 #: view:project.issue:0
 msgid "⇒ Escalate"
-msgstr ""
+msgstr "⇒ Eskalera"
 
 #. module: project_issue
 #: model:mail.message.subtype,description:project_issue.mt_issue_new
 msgid "Issue created"
-msgstr ""
+msgstr "Ärende skapat"
 
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
@@ -991,7 +1015,7 @@ msgstr "Varaktighet"
 #: model:mail.message.subtype,name:project_issue.mt_issue_started
 #: model:mail.message.subtype,name:project_issue.mt_project_issue_started
 msgid "Issue Started"
-msgstr ""
+msgstr "Ärende startat"
 
 #~ msgid "Maintenance"
 #~ msgstr "Underhåll"
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 5a6e68d9ef3..592972259bf 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.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-03-27 14:49+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -2169,7 +2169,7 @@ msgstr ""
 "belyser dina försäljningsintäkter inom olika kriterier (säljare, partner, "
 "produkt, etc.) Använd den här rapporten för att utföra analyser på "
 "försäljningen som ännu inte har fakturerats. Om du vill analysera din "
-"omsättning, bör du använda Fakturaanalysrapporten i Bokföringen."
+"omsättning, bör du använda fakturaanalysrapporten i bokföringen."
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
index 1ccffd62157..63749485b1f 100644
--- a/addons/sale_mrp/i18n/sv.po
+++ b/addons/sale_mrp/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-27 13:31+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,9 +35,9 @@ msgstr "Indikerar kundreferense från kundorder"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "Försäljningsreferens"
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "Säljare"
diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po
index 1ca937885a5..001dc4e68d7 100644
--- a/addons/sale_order_dates/i18n/sv.po
+++ b/addons/sale_order_dates/i18n/sv.po
@@ -8,19 +8,19 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-27 13:34+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -40,7 +40,7 @@ msgstr "Plockningsdatum"
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date requested by the customer for the sale."
-msgstr ""
+msgstr "Kundens önskade leveransdatum"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -55,4 +55,4 @@ msgstr "Kundorder"
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Committed date for delivery."
-msgstr ""
+msgstr "Bekräftat leveransdatum"

From 8752221ac259411968f84d71e136bf18b4209280 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 29 Mar 2014 07:30:44 +0000
Subject: [PATCH 151/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064447-upr58gkij5ne9rm3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073044-67cql7rohzkmuub9
---
 addons/web/i18n/mn.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 1f18942a550..ea097ce6659 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-02-02 14:40+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-03-28 05:20+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-22 07:34+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: web
 #. openerp-web
@@ -2567,7 +2567,7 @@ msgstr "'%s' нь хөрвүүлэх боломжгүй огноо, огнооц
 #: code:addons/web/static/src/xml/base.xml:325
 #, python-format
 msgid "Duplicate"
-msgstr "Хувилах"
+msgstr "Хуулбарлан үүсгэх"
 
 #. module: web
 #. openerp-web

From 09600a9969e84fd59d005b040fc13353a665f96f Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 31 Mar 2014 10:31:22 +0530
Subject: [PATCH 152/175] [FIX]hr_payroll : initialize result_rate in localdict
 to avoid next execution problem

bzr revid: pna@tinyerp.com-20140331050122-kqfw152vcippdl52
---
 addons/hr_payroll/hr_payroll.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index f944e8b1362..cc94ac4d5db 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -593,6 +593,7 @@ class hr_payslip(osv.osv):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
                 localdict['result_qty'] = 1.0
+                localdict['result_rate'] = 100
                 #check if the rule can be applied
                 if obj_rule.satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule

From 7ee65aa181ef895d4b2d496451a0720c609adf55 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 31 Mar 2014 12:44:48 +0200
Subject: [PATCH 153/175] [FIX] sale: remove useless write call (problematic
 when invoice on delivery order)

bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
---
 addons/sale/wizard/sale_line_invoice.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index d8a7d05a10e..5f979ead31e 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -101,7 +101,6 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     break
             if flag:
                 wf_service.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr)
-                sales_order_obj.write(cr, uid, [order.id], {'state': 'progress'})
 
         if not invoices:
             raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))

From dfe28ec31f74bec051e51ee9aafede7a60bd0191 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 31 Mar 2014 14:30:12 +0200
Subject: [PATCH 154/175] [FIX] expression: use unaccent() for translated
 search

lp bug: https://launchpad.net/bugs/1049653 fixed

bzr revid: chs@openerp.com-20140331123012-dq3hsw2bc368zvgq
---
 openerp/osv/expression.py | 50 ++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index d3c2a8adabb..360ab4984cf 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -1020,6 +1020,7 @@ class expression(object):
                     push(create_substitution_leaf(leaf, (left, operator, right), working_model))
 
                 elif field.translate and right:
+                    field = left
                     need_wildcard = operator in ('like', 'ilike', 'not like', 'not ilike')
                     sql_operator = {'=like': 'like', '=ilike': 'ilike'}.get(operator, operator)
                     if need_wildcard:
@@ -1031,33 +1032,38 @@ class expression(object):
                         sql_operator = sql_operator[4:] if sql_operator[:3] == 'not' else '='
                         inselect_operator = 'not inselect'
 
-                    subselect = '( SELECT res_id'          \
-                             '    FROM ir_translation'  \
-                             '   WHERE name = %s'       \
-                             '     AND lang = %s'       \
-                             '     AND type = %s'
-                    instr = ' %s'
-                    #Covering in,not in operators with operands (%s,%s) ,etc.
                     if sql_operator == 'in':
-                        instr = ','.join(['%s'] * len(right))
-                        subselect += '     AND value ' + sql_operator + ' ' + " (" + instr + ")"   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
-                    else:
-                        subselect += '     AND value ' + sql_operator + instr +   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
+                        right = tuple(right)
 
-                    params = [working_model._name + ',' + left,
+                    if self.has_unaccent and sql_operator.endswith('like'):
+                        trans_left = 'unaccent(value)'
+                        left = 'unaccent("%s")' % (left,)
+                        instr = 'unaccent(%s)'
+                    else:
+                        trans_left = 'value'
+                        left = '"%s"' % (left,)
+                        instr = '%s'
+
+                    subselect = """(SELECT res_id
+                                      FROM ir_translation
+                                     WHERE name = %s
+                                       AND lang = %s
+                                       AND type = %s
+                                       AND {trans_left} {operator} {right}
+                                   ) UNION (
+                                    SELECT id
+                                      FROM "{table}"
+                                     WHERE {left} {operator} {right}
+                                   )
+                                """.format(trans_left=trans_left, operator=sql_operator,
+                                           right=instr, table=working_model._table, left=left)
+
+                    params = [working_model._name + ',' + field,
                               context.get('lang', False) or 'en_US',
                               'model',
                               right,
                               right,
-                             ]
+                              ]
                     push(create_substitution_leaf(leaf, ('id', inselect_operator, (subselect, params)), working_model))
 
                 else:
@@ -1176,7 +1182,7 @@ class expression(object):
 
             if left in model._columns:
                 format = need_wildcard and '%s' or model._columns[left]._symbol_set[0]
-                if self.has_unaccent and sql_operator in ('ilike', 'not ilike'):
+                if self.has_unaccent and sql_operator.endswith('like'):
                     query = '(unaccent(%s."%s") %s unaccent(%s))' % (table_alias, left, sql_operator, format)
                 else:
                     query = '(%s."%s" %s %s)' % (table_alias, left, sql_operator, format)

From 6488521529d8e36951f67f7a9fb650b615d1721b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 1 Apr 2014 20:42:04 +0200
Subject: [PATCH 155/175] [FIX] l10n_pa: remove duplicated "data" key in
 manifest

bzr revid: chs@openerp.com-20140401184204-e8tr0fnc5x053w6l
---
 addons/l10n_pa/__openerp__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/l10n_pa/__openerp__.py b/addons/l10n_pa/__openerp__.py
index 05e7ad5aefc..792c3de07ea 100644
--- a/addons/l10n_pa/__openerp__.py
+++ b/addons/l10n_pa/__openerp__.py
@@ -44,8 +44,6 @@ Con la Colaboración de
 			],
     "demo_xml": [
 			],
-    "data": [
-			],
     "active": False,
     "installable": True,
     "certificate" : "",

From 16ce262c33d331a5d1c61caf9a042942125168ce Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 2 Apr 2014 06:44:59 +0000
Subject: [PATCH 156/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
---
 addons/account/i18n/ar.po                     |   10 +-
 addons/account/i18n/ja.po                     |    6 +-
 addons/account/i18n/nl.po                     |    6 +-
 addons/account_analytic_plans/i18n/tr.po      |   10 +-
 .../i18n/sv.po                                |    8 +-
 addons/account_check_writing/i18n/sv.po       |   12 +-
 addons/account_payment/i18n/sv.po             |   25 +-
 addons/account_report_company/i18n/sv.po      |   64 +
 addons/account_test/i18n/sv.po                |  266 ++++
 addons/account_voucher/i18n/sv.po             |   45 +-
 addons/analytic/i18n/sv.po                    |  104 +-
 addons/analytic/i18n/zh_CN.po                 |   62 +-
 .../analytic_contract_hr_expense/i18n/sv.po   |   95 ++
 addons/analytic_user_function/i18n/sv.po      |   20 +-
 addons/audittrail/i18n/sv.po                  |   14 +-
 addons/auth_oauth/i18n/sv.po                  |   28 +-
 addons/base_action_rule/i18n/sv.po            |   52 +-
 addons/base_gengo/i18n/sv.po                  |  269 ++++
 addons/base_iban/i18n/sv.po                   |   10 +-
 addons/base_import/i18n/sv.po                 | 1193 +++++++++++++++++
 addons/base_vat/i18n/sv.po                    |   14 +-
 addons/claim_from_delivery/i18n/sv.po         |   14 +-
 addons/crm/i18n/ja.po                         |   14 +-
 addons/crm/i18n/sv.po                         |   38 +-
 addons/crm_claim/i18n/nl.po                   |   10 +-
 addons/crm_claim/i18n/sv.po                   |  124 +-
 addons/crm_helpdesk/i18n/sv.po                |    9 +-
 addons/crm_partner_assign/i18n/sv.po          |   70 +-
 addons/crm_profiling/i18n/sv.po               |   14 +-
 addons/crm_todo/i18n/sv.po                    |   12 +-
 addons/decimal_precision/i18n/sv.po           |   10 +-
 addons/delivery/i18n/sv.po                    |   16 +-
 addons/document/i18n/sv.po                    |   24 +-
 addons/document_page/i18n/sv.po               |   58 +-
 addons/edi/i18n/sv.po                         |   20 +-
 addons/email_template/i18n/sv.po              |   16 +-
 addons/event_moodle/i18n/sv.po                |  185 +++
 addons/event_sale/i18n/sv.po                  |   90 ++
 addons/google_base_account/i18n/sv.po         |   20 +-
 addons/hr/i18n/am.po                          |   46 +-
 addons/hr/i18n/mn.po                          |    2 +-
 addons/hr_contract/i18n/sv.po                 |   20 +-
 addons/hr_evaluation/i18n/sv.po               |   30 +-
 addons/hr_expense/i18n/sv.po                  |   30 +-
 addons/hr_holidays/i18n/sv.po                 |   18 +-
 addons/hr_payroll/i18n/mn.po                  |   28 +-
 addons/hr_payroll/i18n/sv.po                  |   32 +-
 addons/hr_payroll_account/i18n/sv.po          |   10 +-
 addons/hr_recruitment/i18n/sv.po              |   68 +-
 addons/knowledge/i18n/sv.po                   |   41 +-
 addons/mail/i18n/sv.po                        |  184 ++-
 addons/marketing/i18n/sv.po                   |   24 +-
 addons/marketing_campaign/i18n/sv.po          |   10 +-
 addons/membership/i18n/sv.po                  |   10 +-
 addons/mrp/i18n/ja.po                         |    8 +-
 addons/mrp/i18n/sv.po                         |   12 +-
 addons/mrp_byproduct/i18n/sv.po               |   14 +-
 addons/note/i18n/sv.po                        |   60 +-
 addons/note_pad/i18n/sv.po                    |   10 +-
 addons/pad/i18n/sv.po                         |   26 +-
 addons/pad_project/i18n/sv.po                 |   10 +-
 addons/plugin/i18n/sv.po                      |   10 +-
 addons/point_of_sale/i18n/ja.po               |   65 +-
 addons/point_of_sale/i18n/sv.po               |   28 +-
 addons/process/i18n/sv.po                     |   28 +-
 addons/procurement/i18n/ja.po                 |   14 +-
 addons/product_margin/i18n/sv.po              |   10 +-
 addons/project_gtd/i18n/sv.po                 |   18 +-
 addons/project_issue_sheet/i18n/sv.po         |   12 +-
 addons/project_timesheet/i18n/sv.po           |   38 +-
 addons/purchase/i18n/ja.po                    |   10 +-
 addons/purchase/i18n/sv.po                    |   81 +-
 addons/purchase_double_validation/i18n/sv.po  |   20 +-
 addons/resource/i18n/sv.po                    |   31 +-
 addons/sale/i18n/sv.po                        |  420 +++---
 addons/sale_analytic_plans/i18n/sv.po         |   10 +-
 addons/sale_crm/i18n/sv.po                    |   37 +-
 addons/sale_journal/i18n/sv.po                |   16 +-
 addons/sale_margin/i18n/sv.po                 |   10 +-
 addons/sale_stock/i18n/sv.po                  |   30 +-
 addons/stock/i18n/ja.po                       |   14 +-
 addons/stock/i18n/sv.po                       |   12 +-
 addons/stock/i18n/tr.po                       |   11 +-
 addons/stock/i18n/zh_TW.po                    |   33 +-
 addons/stock_invoice_directly/i18n/sv.po      |   10 +-
 addons/subscription/i18n/sv.po                |   44 +-
 addons/warning/i18n/sv.po                     |   18 +-
 addons/web_linkedin/i18n/sv.po                |  152 +++
 88 files changed, 3811 insertions(+), 1121 deletions(-)
 create mode 100644 addons/account_report_company/i18n/sv.po
 create mode 100644 addons/account_test/i18n/sv.po
 create mode 100644 addons/analytic_contract_hr_expense/i18n/sv.po
 create mode 100644 addons/base_gengo/i18n/sv.po
 create mode 100644 addons/base_import/i18n/sv.po
 create mode 100644 addons/event_moodle/i18n/sv.po
 create mode 100644 addons/event_sale/i18n/sv.po
 create mode 100644 addons/web_linkedin/i18n/sv.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index e6349985205..07a3b27e2d7 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-02-04 01:12+0000\n"
-"Last-Translator: Mohamed M. Hagag <Unknown>\n"
+"PO-Revision-Date: 2014-04-01 07:01+0000\n"
+"Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@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-02-06 06:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "مدفوعات النظام"
+msgstr "نظام الدفع"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.account:0
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 508ae152702..65df1d84819 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-03-22 05:16+0000\n"
+"PO-Revision-Date: 2014-04-01 02:55+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-23 06:43+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: account
@@ -2394,7 +2394,7 @@ msgstr "斜体テキスト（小）"
 msgid ""
 "If you want the journal should be control at opening/closing, check this "
 "option"
-msgstr ""
+msgstr "オープン/クローズ時に仕訳を制御する場合は、このオプションをチェックします。"
 
 #. module: account
 #: view:account.bank.statement:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 932b8201882..ed8418b88ee 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/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: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-03-20 14:36+0000\n"
+"PO-Revision-Date: 2014-03-30 11:13+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-03-21 06:51+0000\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: account
@@ -928,7 +928,7 @@ msgstr "Kostenplaatsboekingen per regel"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr "Teruggave Methode"
+msgstr "Wijze van crediteren"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 4344f7e4c3a..a4d02655b94 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_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:36+0000\n"
-"PO-Revision-Date: 2014-03-07 06:40+0000\n"
-"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
+"PO-Revision-Date: 2014-03-30 10:17+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\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-08 06:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: tr\n"
 
 #. module: account_analytic_plans
@@ -382,7 +382,7 @@ msgstr "Hiç analitik plan tanımlanmamış."
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr "Banka Ekstresi"
+msgstr "Banka Hesap Özeti"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index a39cef9e913..f6776733213 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -8,19 +8,19 @@ 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-27 12:11+0000\n"
+"PO-Revision-Date: 2014-03-30 11:55+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-28 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line.global,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Upphovsman till förmånstagarinformation"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -113,6 +113,8 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"Radering ej tillåten. Gå till det tillhörande kontoutdraget för att ta bort "
+"och / eller modifiera kontoutdragsraden."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
index cba37bc7e40..8afe2438fd7 100644
--- a/addons/account_check_writing/i18n/sv.po
+++ b/addons/account_check_writing/i18n/sv.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-03-31 21:12+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -112,7 +112,7 @@ msgstr ""
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
 msgid "Allow Check Writing"
-msgstr ""
+msgstr "Tillåt checkutgivning"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -124,7 +124,7 @@ msgstr "Betalning"
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
 msgid "Use Preprinted Check"
-msgstr ""
+msgstr "Använd förtryckta checker"
 
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index a5451e535a5..b983cb3165c 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -8,13 +8,13 @@ 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-27 12:23+0000\n"
+"PO-Revision-Date: 2014-04-01 06:36+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-28 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_payment
@@ -123,6 +123,8 @@ msgid ""
 "You cannot cancel an invoice which has already been imported in a payment "
 "order. Remove it from the following payment order : %s."
 msgstr ""
+"Du kan inte avbryta en faktura som redan har importerats i en "
+"betalningsorder. Ta bort den från följande betalningsorder: %s."
 
 #. module: account_payment
 #: code:addons/account_payment/account_invoice.py:43
@@ -194,6 +196,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"När en beställning görs statusen är \"Utkast\".\n"
+"  När banken bekräftas status är satt till \"Bekräftad\".\n"
+"  Då ordern är betald sätts status till \"Klar\"."
 
 #. module: account_payment
 #: view:payment.order:0
@@ -368,7 +373,7 @@ msgstr "Kontoutdrag hämta"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "Det finns inget företag definierat på verifikatraden."
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -462,7 +467,7 @@ msgstr "Total:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "Genomförandedatum"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -579,7 +584,7 @@ msgstr "Meddelande Rad 2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -665,7 +670,7 @@ msgstr "Order"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Cancel Payments"
-msgstr ""
+msgstr "Avbryt betalning"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -676,7 +681,7 @@ msgstr "Total"
 #: code:addons/account_payment/wizard/account_payment_order.py:112
 #, python-format
 msgid "Entry Lines"
-msgstr ""
+msgstr "Verifikatrader"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -687,19 +692,19 @@ msgstr "Skapa betalning"
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid "The amount which should be paid at the current date. "
-msgstr ""
+msgstr "Belopp att erlägga vid angivet datum. "
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "Föredraget datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_report_company/i18n/sv.po b/addons/account_report_company/i18n/sv.po
new file mode 100644
index 00000000000..fab9602a1b4
--- /dev/null
+++ b/addons/account_report_company/i18n/sv.po
@@ -0,0 +1,64 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-31 16:28+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: account_report_company
+#: field:res.partner,display_name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_report_company
+#: field:account.invoice,commercial_partner_id:0
+#: help:account.invoice.report,commercial_partner_id:0
+msgid "Commercial Entity"
+msgstr "Kommersiell entitet"
+
+#. module: account_report_company
+#: field:account.invoice.report,commercial_partner_id:0
+msgid "Partner Company"
+msgstr "Närliggande bolag"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_report_company
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:ir.model,name:account_report_company.model_res_partner
+msgid "Partner"
+msgstr "Företag"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Fakturastatistik"
+
+#. module: account_report_company
+#: view:res.partner:0
+msgid "True"
+msgstr "Sant"
+
+#. module: account_report_company
+#: help:account.invoice,commercial_partner_id:0
+msgid ""
+"The commercial entity that will be used on Journal Entries for this invoice"
+msgstr ""
+"Den kommersiella entiteten som kommer användas för journalrader på denna "
+"faktura"
diff --git a/addons/account_test/i18n/sv.po b/addons/account_test/i18n/sv.po
new file mode 100644
index 00000000000..73e4768fdf4
--- /dev/null
+++ b/addons/account_test/i18n/sv.po
@@ -0,0 +1,266 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-31 21:13+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid ""
+"Code should always set a variable named `result` with the result of your "
+"test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was "
+"succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named "
+"`column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your "
+"code:\n"
+"    * cr: cursor to the database\n"
+"    * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct "
+"indentation (if needed).\n"
+"\n"
+"Example: \n"
+"    sql = '''SELECT id, name, ref, date\n"
+"             FROM account_move_line \n"
+"             WHERE account_id IN (SELECT id FROM account_account WHERE type "
+"= 'view')\n"
+"          '''\n"
+"    cr.execute(sql)\n"
+"    result = cr.dictfetchall()"
+msgstr ""
+"Kod ska alltid ställa en variabel med namnet `resultat` med resultatet av "
+"ditt test, kan det vara en lista eller\n"
+"en ordbok. Om `resultat` är en tom lista, betyder det att testet var lyckat. "
+"Annars kommer\n"
+"försöka översätta och skriva ut vad som finns i `resultat`.\n"
+"\n"
+"Om resultatet av testet är en ordbok kan du ställa in en variabel med namnet "
+"`column_order` för att välja in\n"
+"vilken ordning du vill skriva ut `resultat` s innehåll.\n"
+"\n"
+"Om du behöver dem, kan du även använda följande variabler i koden:\n"
+"     * Cr: markören till databasen\n"
+"     * Uid: ID för den aktuella användaren\n"
+"\n"
+"På något sätt måste koden vara lagliga python uttalanden med rätt indrag (om "
+"det behövs).\n"
+"\n"
+"Exempel:\n"
+"     sql ='' 'SELECT id, namn, ref, datum\n"
+"              FRÅN account_move_line\n"
+"              VAR konto-IN (SELECT id FROM account_account WHERE typ = "
+"\"Visa\")\n"
+"           '' '\n"
+"     cr.execute (SQL)\n"
+"     resultat = cr.dictfetchall ()"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid ""
+"Check that reconciled invoice for Sales/Purchases has reconciled entries for "
+"Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid ""
+"Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr "Testnamn"
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid ""
+"Check that reconciled account moves, that define Payable and Receivable "
+"accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr "Tester"
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid ""
+"Test 5.1 : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid ""
+"Check on bank statement that the Closing Balance = Starting Balance + sum of "
+"statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid ""
+"Check if the balance of the new opened fiscal year matches with last year's "
+"balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create Accounting Test.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 01abe4323ba..730e4771df4 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -8,24 +8,24 @@ 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-03-29 14:57+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-30 06:15+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Avstämning"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:417
@@ -66,7 +66,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Uppdatera)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -93,7 +93,7 @@ msgstr "mars"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -103,7 +103,7 @@ msgstr "Betala faktura"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "Är du säker på att du vill avbryta detta kvitto?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -131,7 +131,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -173,6 +173,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att registrera ett inköpskvitto.\n"
+"               </p><p>\n"
+"                 När inköpskvitto bekräftas, kan du registrera\n"
+"                 leverantörsbetalning i samband med detta kvitto.\n"
+"               </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -222,7 +229,7 @@ msgstr "Anteckningar"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -240,7 +247,7 @@ msgstr "Journalpost"
 #: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -255,7 +262,7 @@ msgstr "Betalningsalternativ"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. 003/10"
-msgstr ""
+msgstr "e.g. 003/10"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -291,7 +298,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -314,7 +321,7 @@ msgstr "Skatt"
 #: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ogiltig åtgärd"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
@@ -332,6 +339,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -346,7 +355,7 @@ msgstr "Betalningsinformation"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(uppdatering)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -364,7 +373,7 @@ msgstr "Importera fakturor"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. Invoice SAJ/0042"
-msgstr ""
+msgstr "e.g. Invoice SAJ/0042"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1208
@@ -425,7 +434,7 @@ msgstr "Leverantörsverifikat"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 1a447d5f88d..d3c2880740b 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/i18n/sv.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-04-01 06:23+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -25,18 +25,18 @@ msgstr "Underliggande konton"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:229
 #, python-format
 msgid "Contract: "
-msgstr ""
+msgstr "Avtal: "
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract pending"
-msgstr ""
+msgstr "Vilande avtal"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,7 +47,7 @@ msgstr "Mall"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,date:0
 msgid "End Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
@@ -72,16 +72,24 @@ msgid ""
 "the\n"
 "                                        customer."
 msgstr ""
+"När slutdatum för avtalet passerats \n"
+"                                         eller det maximala antalet "
+"tjänsteenheter \n"
+"                                         enheter (t.ex. supportavtal) "
+"förbrukats, aviseras kundansvarig \n"
+"                                         via e-post för att förnya "
+"kontraktet med\n"
+"                                         kunden."
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Contract or Project"
-msgstr ""
+msgstr "Avtal eller projekt"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account/Contract Name"
-msgstr ""
+msgstr "Konto/avtalsnamn"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -91,7 +99,7 @@ msgstr "Ekonomichef"
 #. module: analytic
 #: field:account.analytic.account,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -101,7 +109,7 @@ msgstr "Stängd"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_pending
 msgid "Contract to Renew"
-msgstr ""
+msgstr "Avtal att förnya"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -111,18 +119,18 @@ msgstr "Ny"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projektledare"
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:271
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
@@ -139,17 +147,17 @@ msgstr "Beskrivning"
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Quick account creation disallowed."
-msgstr ""
+msgstr "Snabbskapande av konto icke tillåtet"
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva objektkonton."
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -160,7 +168,7 @@ msgstr "Företag"
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Renewal"
-msgstr ""
+msgstr "Förnya"
 
 #. module: analytic
 #: help:account.analytic.account,message_summary:0
@@ -168,11 +176,13 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: analytic
 #: help:account.analytic.account,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -180,6 +190,8 @@ msgid ""
 "Sets the higher limit of time to work on the contract, based on the "
 "timesheet. (for instance, number of hours in a limited support contract.)"
 msgstr ""
+"Anger den högre gränsen för arbetstid på avtalet,  baserat på tidrapporten. "
+"(till exempel antal timmar i ett supportavtal med timbank.)"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
@@ -201,7 +213,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -221,12 +233,12 @@ msgstr "Datum"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_closed
 msgid "Contract Finished"
-msgstr ""
+msgstr "Avtal avslutat"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -240,7 +252,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
@@ -250,38 +262,38 @@ msgstr "Kontohieraki"
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: analytic
 #: help:account.analytic.account,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan inte skapa objektrader för ett rubrikkonto."
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Contract Information"
-msgstr ""
+msgstr "Avtalsinformation"
 
 #. module: analytic
 #: field:account.analytic.account,template_id:0
 #: selection:account.analytic.account,type:0
 msgid "Template of Contract"
-msgstr ""
+msgstr "Avtalsmall"
 
 #. module: analytic
 #: field:account.analytic.account,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Förbetald tjänsteenhet"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -291,7 +303,7 @@ msgstr "Kredit"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_opened
 msgid "Contract Opened"
-msgstr ""
+msgstr "Avtal öppnat"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -305,6 +317,14 @@ msgid ""
 "The special type 'Template of Contract' allows you to define a template with "
 "default data that you can reuse easily."
 msgstr ""
+"Om du väljer visa-Typ, betyder det att du inte kommer att kunna göra "
+"verifikat med det kontot.\n"
+"Typen \"objektkonto\" står för vanliga konton som du bara vill använda i "
+"redovisningen.\n"
+"Om du väljer avtal eller projekt, ger det dig möjlighet att hantera "
+"giltigheten och faktureringsalternativ för detta konto.\n"
+"Den speciella typen \"Avtalsmall\" kan du definiera en mall med "
+"standarduppgifter som är enkla att återanvända."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -314,7 +334,7 @@ msgstr "Avbruten"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Analytic View"
-msgstr ""
+msgstr "Objektvisning"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -324,12 +344,12 @@ msgstr "Balans"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Fullständigt namn"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "To Renew"
-msgstr ""
+msgstr "Att förnya"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -340,18 +360,18 @@ msgstr "Antal"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract closed"
-msgstr ""
+msgstr "Avtal stängt"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
@@ -379,23 +399,23 @@ msgstr "Valuta"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Contract opened"
-msgstr ""
+msgstr "Avtal öppnat"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Type of Account"
-msgstr ""
+msgstr "Typ av konto"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 670562b96a7..7e856e9eabf 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -8,13 +8,13 @@ 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-25 09:00+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2014-03-30 03:47+0000\n"
+"Last-Translator: jeffery chen fan <jeffery9@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-26 07:12+0000\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic
@@ -31,7 +31,7 @@ msgstr "进行中"
 #: code:addons/analytic/analytic.py:229
 #, python-format
 msgid "Contract: "
-msgstr ""
+msgstr "合约： "
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
@@ -81,7 +81,7 @@ msgstr "合同或者项目"
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account/Contract Name"
-msgstr ""
+msgstr "客户/合约的名称"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -101,7 +101,7 @@ msgstr "已关闭"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_pending
 msgid "Contract to Renew"
-msgstr ""
+msgstr "需续签的合约"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -139,7 +139,7 @@ msgstr "描述"
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Quick account creation disallowed."
-msgstr ""
+msgstr "不允许快速客户创建"
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
@@ -160,19 +160,19 @@ msgstr "公司"
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Renewal"
-msgstr ""
+msgstr "续约"
 
 #. module: analytic
 #: help:account.analytic.account,message_summary:0
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存聊天摘要（消息数，...）。本摘要是直接使用HTML格式，以便插入到看板视图。"
 
 #. module: analytic
 #: help:account.analytic.account,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -218,12 +218,12 @@ msgstr "日期"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_closed
 msgid "Contract Finished"
-msgstr ""
+msgstr "完成的合约"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -235,7 +235,7 @@ msgstr "计算公式是数量乘以产品成本价。币别是公司本位币。
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
@@ -245,38 +245,38 @@ msgstr "树"
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: analytic
 #: help:account.analytic.account,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史记录"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能在视图类型的科目上创建解析行"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Contract Information"
-msgstr ""
+msgstr "合约信息"
 
 #. module: analytic
 #: field:account.analytic.account,template_id:0
 #: selection:account.analytic.account,type:0
 msgid "Template of Contract"
-msgstr ""
+msgstr "合约模板"
 
 #. module: analytic
 #: field:account.analytic.account,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Prepaid Service Units"
-msgstr ""
+msgstr "预付的服务单元"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -286,7 +286,7 @@ msgstr "贷方"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_opened
 msgid "Contract Opened"
-msgstr ""
+msgstr "进行中的合约"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -309,7 +309,7 @@ msgstr "已取消"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Analytic View"
-msgstr ""
+msgstr "解析视图"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -319,12 +319,12 @@ msgstr "差额"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "完整姓名"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "To Renew"
-msgstr ""
+msgstr "要续签的"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -335,18 +335,18 @@ msgstr "数量"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Reference"
-msgstr ""
+msgstr "参考"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract closed"
-msgstr ""
+msgstr "关闭的合约"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
@@ -374,23 +374,23 @@ msgstr "货币"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Contract opened"
-msgstr ""
+msgstr "合约已开启"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Type of Account"
-msgstr ""
+msgstr "科目的类型"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic_contract_hr_expense/i18n/sv.po b/addons/analytic_contract_hr_expense/i18n/sv.po
new file mode 100644
index 00000000000..cb81ff2961a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/sv.po
@@ -0,0 +1,95 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-31 21:26+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "eller visa"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
+msgstr ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Inget att fakturera, skapa"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "utlägg"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Objektkonto"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:144
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Utlägg att fakturera av %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136
+#, python-format
+msgid "Expenses of %s"
+msgstr "Utlägg av %s"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Expenses and Timesheet Invoicing Ratio"
+msgstr "Andel utlägg och tidrapport på faktura"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
+msgstr ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Uppskattning av utlägg att fakturera"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Debitera utläggen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Faktura"
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 3f7b0b01bc0..77936f98e6c 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-31 16:35+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Objektrad"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Tjänst"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -40,7 +40,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
@@ -58,12 +58,12 @@ msgstr "Objektkonto"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Fakturainformation"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index 907f5e7635f..3c397844331 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.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-03-30 12:29+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -62,7 +62,7 @@ msgstr ""
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -216,7 +216,7 @@ msgstr ""
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Granska"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -388,7 +388,7 @@ msgstr "Loggrad"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/auth_oauth/i18n/sv.po b/addons/auth_oauth/i18n/sv.po
index f4b73d21a74..c5040692bbe 100644
--- a/addons/auth_oauth/i18n/sv.po
+++ b/addons/auth_oauth/i18n/sv.po
@@ -8,24 +8,24 @@ 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: 2013-01-19 00:21+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-30 12:20+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
 msgid "Validation URL"
-msgstr ""
+msgstr "Gransknings-URL"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,auth_endpoint:0
 msgid "Authentication URL"
-msgstr ""
+msgstr "URL för idkontroll"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_base_config_settings
@@ -40,7 +40,7 @@ msgstr "Leverantörsnamn"
 #. module: auth_oauth
 #: field:auth.oauth.provider,scope:0
 msgid "Scope"
-msgstr ""
+msgstr "Spelrum"
 
 #. module: auth_oauth
 #: field:res.users,oauth_provider_id:0
@@ -55,7 +55,7 @@ msgstr "CSS-klass"
 #. module: auth_oauth
 #: field:auth.oauth.provider,body:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
@@ -70,7 +70,7 @@ msgstr "okänd"
 #. module: auth_oauth
 #: field:res.users,oauth_access_token:0
 msgid "OAuth Access Token"
-msgstr ""
+msgstr "OAuth åtkomstpollett"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,client_id:0
@@ -102,12 +102,12 @@ msgstr "Tillåt användare att logga in med hjälp av Facebook"
 #. module: auth_oauth
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID måste vara unikt per utgivare"
 
 #. module: auth_oauth
 #: help:res.users,oauth_uid:0
 msgid "Oauth Provider user_id"
-msgstr ""
+msgstr "Oauth utgivare-user_id"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,data_endpoint:0
@@ -117,7 +117,7 @@ msgstr "Data-URL"
 #. module: auth_oauth
 #: view:auth.oauth.provider:0
 msgid "arch"
-msgstr ""
+msgstr "Arkitektur"
 
 #. module: auth_oauth
 #: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
@@ -127,9 +127,9 @@ msgstr "Leverantörer"
 #. module: auth_oauth
 #: field:base.config.settings,auth_oauth_google_enabled:0
 msgid "Allow users to sign in with Google"
-msgstr ""
+msgstr "Tillåt användare logga in med Google"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,enabled:0
 msgid "Allowed"
-msgstr ""
+msgstr "Tillåten"
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index a3546bc3847..ffd016d3815 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-31 16:21+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Åtgärdsregler"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -60,12 +60,12 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_followers:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Lägg till följare"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible"
-msgstr ""
+msgstr "Ange ansvarig"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -78,22 +78,22 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
 msgid "base.action.rule.lead.test"
-msgstr ""
+msgstr "base.action.rule.lead.test"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Stängd"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Ledtid efter utlösningsdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -103,12 +103,12 @@ msgstr "Villkor"
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntar"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_pre_id:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Action Rule"
-msgstr ""
+msgstr "Åtgärdsregel"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_id:0
@@ -213,17 +213,17 @@ msgstr "Dagar"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Timer"
-msgstr ""
+msgstr "Tidtagare"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Ledtidstyp"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server actions to run"
-msgstr ""
+msgstr "Serveråtgärder att köra"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -233,12 +233,12 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
@@ -253,7 +253,7 @@ msgstr "Minuter"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_pre_id:0
@@ -269,7 +269,7 @@ msgstr "Sekvens"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Åtgärder"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -296,7 +296,7 @@ msgstr "Skapat datum"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Senaste åtgärd"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,partner_id:0
@@ -306,15 +306,15 @@ msgstr "Företag"
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Utlösningsdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 #: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
-msgstr ""
+msgstr "Serveråtgärder"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Ämne"
diff --git a/addons/base_gengo/i18n/sv.po b/addons/base_gengo/i18n/sv.po
new file mode 100644
index 00000000000..29aece5d58b
--- /dev/null
+++ b/addons/base_gengo/i18n/sv.po
@@ -0,0 +1,269 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-31 16:36+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Kommentarer"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Public Key..."
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "base.gengo.translations"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Comments & Activity..."
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Private Key..."
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add your comments here for translator...."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 51848b56908..5c2bad22322 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.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-03-31 21:15+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -86,4 +86,4 @@ msgstr "IBAN är felaktig, den måste inledas med landskod"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN konto"
+msgstr "IBAN-konto"
diff --git a/addons/base_import/i18n/sv.po b/addons/base_import/i18n/sv.po
new file mode 100644
index 00000000000..6c552ba669d
--- /dev/null
+++ b/addons/base_import/i18n/sv.po
@@ -0,0 +1,1193 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-31 16:37+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:451
+#, python-format
+msgid "Get all possible values"
+msgstr "Hämta samtliga värden"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:331
+#, python-format
+msgid "Relation Fields"
+msgstr "Relationsfält"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:174
+#, python-format
+msgid "Semicolon"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:175
+#, python-format
+msgid "Tab"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Customers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:438
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:248
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:427
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:404
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:421
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        customers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:176
+#, python-format
+msgid "Space"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:330
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:173
+#: code:addons/base_import/static/src/js/import.js:184
+#, python-format
+msgid "Comma"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:423
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 53fe15ac4f9..f4cfab6791d 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -8,19 +8,19 @@ 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-03-31 16:42+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "Kontrollera giltighet"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:152
@@ -46,12 +46,12 @@ msgstr "Bolag"
 #: code:addons/base_vat/base_vat.py:113
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "e.g. BE0477472701"
-msgstr ""
+msgstr "e.g. SE5577472701"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index 35b0d046741..a5ed52231cb 100644
--- a/addons/claim_from_delivery/i18n/sv.po
+++ b/addons/claim_from_delivery/i18n/sv.po
@@ -8,26 +8,26 @@ 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-03-31 16:43+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Reklamationer"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Reklamationer från leveransen"
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 80739d4ba7a..fd311454d94 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.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-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-03-13 08:00+0000\n"
+"PO-Revision-Date: 2014-04-01 14:20+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-14 06:58+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1344,7 +1344,7 @@ msgstr "コード"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "特徴"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1626,7 +1626,7 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "顧客クレーム管理"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -2298,7 +2298,7 @@ msgstr ""
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "アフターサービス"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
@@ -2716,7 +2716,7 @@ msgstr "番地"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "ヘルプデスクおよびサポート管理"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 1f9ce104aa1..e22587633bb 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.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-01-07 16:56+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 16:46+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-01-08 05:39+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -101,7 +101,7 @@ msgstr "Stegnamn"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -118,7 +118,7 @@ msgstr "Dag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bolagsnamn"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
@@ -185,6 +185,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:637
@@ -384,7 +386,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Död"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -392,7 +394,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm
 #: field:crm.segmentation.line,segmentation_id:0
@@ -486,7 +488,7 @@ msgstr "Skapa affärstillfälle"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: crm
 #: view:crm.lead:0
@@ -501,7 +503,7 @@ msgstr "Epost-korrespondens"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Steg ändrat"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -524,7 +526,7 @@ msgstr "Planned Revenue"
 #: code:addons/crm/crm_lead.py:1004
 #, python-format
 msgid "Customer Email"
-msgstr ""
+msgstr "Kund-e-postmeddelande"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -563,7 +565,7 @@ msgstr "Summering"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Sammanfoga"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -676,7 +678,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -740,7 +742,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -750,7 +752,7 @@ msgstr "Stop Process"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -801,7 +803,7 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -905,7 +907,7 @@ msgstr "mars"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Skicka e-post"
 
 #. module: crm
 #: help:crm.case.section,message_unread:0
@@ -922,7 +924,7 @@ msgstr "Dagar för att öppna"
 #. module: crm
 #: view:crm.lead:0
 msgid "ZIP"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: crm
 #: field:crm.lead,mobile:0
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 8db11c3914a..2e24c346a5d 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/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: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-08 11:21+0000\n"
+"PO-Revision-Date: 2014-03-28 12:26+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: 2013-11-21 06:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -383,7 +383,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr "Regelen"
+msgstr "Oplossen"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -884,7 +884,7 @@ msgstr "Mijn klacht(en)"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr "Geregeld"
+msgstr "Opgelost"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index 1203a9d5d4d..e0a8d3f0537 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.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-03-31 19:48+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Denna etapp är inte synlig, t.ex. i statusfältet eller Kanbanvyn, i de fall "
+"etappen saknar poster."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -38,7 +40,7 @@ msgstr "Gruppera på..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr "Ansvariga"
+msgstr "Ansvarsområden"
 
 #. module: crm_claim
 #: help:sale.config.settings,fetchmail_claim:0
@@ -46,16 +48,18 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Här kan du konfigurera din inkommande e-postserver, och skapar reklamationer "
+"från inkommande e-post."
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Reklamationsetapper"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
@@ -65,7 +69,7 @@ msgstr "Stängledtid"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -77,7 +81,7 @@ msgstr "Lösning"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -91,6 +95,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en reklamationskategori.\n"
+"               </p><p>\n"
+"                 Skapa reklamationskategorier för att bättre hantera och "
+"klassificera dina\n"
+"                 reklamationer. Några exempel på reklamationer kan vara: "
+"förebyggande åtgärder,\n"
+"                 korrigerande åtgärder.\n"
+"               </p>\n"
+"            "
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -100,12 +114,12 @@ msgstr "#Reklamationer"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etappnamn"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -149,7 +163,7 @@ msgstr "preventiv"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -159,7 +173,7 @@ msgstr "Stängningsdatum"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falskt"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -169,7 +183,7 @@ msgstr "Referens"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr "Reklamationens datum"
+msgstr "Reklamationsdatum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -182,6 +196,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -235,12 +251,12 @@ msgstr "Prioritet"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Göm i vyn när tom"
 
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +270,7 @@ msgstr "Nya"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Sektioner"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -290,7 +306,7 @@ msgstr "Reklamationsrubrik"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Nekad"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -300,7 +316,7 @@ msgstr "Nästa datum för åtgärd"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -320,7 +336,7 @@ msgstr "Juli"
 #: view:crm.claim.stage:0
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr "Reklamationsstatus"
+msgstr "Reklamationsetapper"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
@@ -343,13 +359,13 @@ msgstr "Datum"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "Destination email for email gateway."
-msgstr ""
+msgstr "Destinationsmottagare för e-postbryggan"
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Inget ämne"
 
 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@@ -359,16 +375,20 @@ msgid ""
 "is related to the status 'Close', when your document reaches this stage, it "
 "will be automatically have the 'closed' status."
 msgstr ""
+"Den relaterade statusen för etappen. Statusen för ditt dokument kommer att "
+"ändras automatiskt med avseende på en ny etapp. Till exempel, om en etapp är "
+"relaterad till statusen \"Stäng\", när dokumentet når denna etapp, kommer "
+"den att automatiskt att ha status som den \"stängda\"."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Klara upp"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
@@ -389,7 +409,7 @@ msgstr "CRM Reklamationsrapport"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -435,6 +455,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Om du markerar detta fält kommer detta skede föreslås som standard på varje "
+"säljlag. Befintliga lag kommer inte att få denna status."
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -491,7 +513,7 @@ msgstr "Stängd"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Neka"
 
 #. module: crm_claim
 #: view:res.partner:0
@@ -501,7 +523,7 @@ msgstr "Företagsreklamation"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Reklamationsetapp"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -519,7 +541,7 @@ msgstr "Väntande"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -535,7 +557,7 @@ msgstr "Normal"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Används för att sortera etapper. Lägre är bättre."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -555,7 +577,7 @@ msgstr "Telefon"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -577,6 +599,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att sätta upp en ny etapp i behandlingen av "
+"reklamationer.\n"
+"               </p><p>\n"
+"                 Du kan skapa reklamationsetapp för att kategorisera status "
+"för varje\n"
+"                 reklamation in i systemet. Etapperna definiera alla steg\n"
+"                 som krävs för att lösa en reklamation.\n"
+"               </p>\n"
+"            "
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -587,6 +619,9 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Statusen är satt till \"Utkast\", när ett ärende skapas. Om ärendet pågår är "
+"status inställd på \"Öppna\". När fallet är över, sätts status till "
+"\"Klar\". Om ärendet måste granskas är status \"Väntar\"."
 
 #. module: crm_claim
 #: field:crm.claim,active:0
@@ -614,6 +649,7 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Ansvarigt säljlag. Definiera ansvarig användare och e-postkonto för bryggan."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -634,7 +670,7 @@ msgstr "Reklamationsdatum"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -644,7 +680,7 @@ msgstr "Reklamationskategorier"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Gemensamt med alla lag"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -683,7 +719,7 @@ msgstr "Reklamation"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Mitt bolag"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -779,7 +815,7 @@ msgstr "Åtgärder för att lösa ärendet"
 #. module: crm_claim
 #: field:crm.claim.stage,case_refused:0
 msgid "Refused stage"
-msgstr ""
+msgstr "Etapp avslag"
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
@@ -808,6 +844,14 @@ msgid ""
 "            </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Registrera och spåra dina kunders reklamationer. "
+"Reklamationer kan kopplas till en försäljningsorder eller en batch. Du kan "
+"skicka e-post med bifogade filer och behålla hela historien för en "
+"reklamation (e-post skickas, ingripande typ osv). Reklamationer kan "
+"automatiskt kopplas till en e-postadress med hjälp av e-postbryggan.\n"
+"             </p>\n"
+"            "
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -833,22 +877,22 @@ msgstr "Mina ärenden"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Utredd"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Reklamationer skapas från inkommande e-post"
 
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -883,11 +927,13 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Länk mellan etapperna och säljlag. När den är inställd, begränsas aktuell "
+"etapp till det valda säljlaget."
 
 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
 msgid "Refused stages are specific stages for done."
-msgstr ""
+msgstr "Avslagsetappen är specifik för klar"
 
 #~ msgid ""
 #~ "Record and track your customers' claims. Claims may be linked to a sales "
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index 3a506d893b6..a8376040de1 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.po
@@ -8,13 +8,13 @@ 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-27 14:44+0000\n"
+"PO-Revision-Date: 2014-04-01 06:39+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-28 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_helpdesk
@@ -136,6 +136,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -512,6 +514,7 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Ansvarigt säljlag. Definiera ansvarig användare och e-postkonto för bryggan."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -727,7 +730,7 @@ msgstr "Senaste åtgärd"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Assigned to Me or My Sales Team(s)"
-msgstr ""
+msgstr "Anslut mig till mitt/mina säljlag"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index d560c343edc..bb004ea6e63 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.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-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 16:26+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -25,7 +25,7 @@ msgstr "Ledtid till avslut"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Författare"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -53,7 +53,7 @@ msgstr "Gruppera på..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Rensa HTML-innehållet automatiskt"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -68,7 +68,7 @@ msgstr "Geoplacering"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Blockerad"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -81,6 +81,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"E-postadress till avsändaren. Det här fältet är satt när inget matchande "
+"företag hittas för inkommande e-post."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +113,7 @@ msgstr "Företag"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "Aviseringar"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +125,7 @@ msgstr "Företagsdatum"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -170,12 +172,12 @@ msgstr "Geografisk tilldelning"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-postredigeringsguide"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Omsättning"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -199,13 +201,13 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Systemavisering"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
-msgstr ""
+msgstr "Vidarebefordra kundämne"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
@@ -271,7 +273,7 @@ msgstr "Typ"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-Post"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
@@ -286,7 +288,7 @@ msgstr "Lägsta"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@@ -311,12 +313,12 @@ msgstr "Skapad datum"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Överliggande meddelande"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
@@ -346,7 +348,7 @@ msgstr "Juli"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
-msgstr ""
+msgstr "Granskningsdatum"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -358,12 +360,12 @@ msgstr "Läge"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Att läsa"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -423,7 +425,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -467,7 +469,7 @@ msgstr "Öppningsdatum"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Undermeddelanden"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
@@ -483,17 +485,17 @@ msgstr "Ämne"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Innehåll"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Röster"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -658,12 +660,12 @@ msgstr "Planerade intäkter"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
-msgstr ""
+msgstr "Företagsgranskning"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
-msgstr ""
+msgstr "Faktureringsperiod"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -724,7 +726,7 @@ msgstr "Öppen"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "Undertyp"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -739,12 +741,12 @@ msgstr "Aktuellt"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Kundämnen/affärsmöjligheter"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Aviserade företag"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -775,7 +777,7 @@ msgstr "Förväntad intäkt"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "Aktivering"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -874,12 +876,12 @@ msgstr "CRM kundämnesrapport"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Författarläge"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
@@ -911,7 +913,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Inledande meddelande i tråd."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 3c6a082ee13..3f02cf80bc8 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.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-03-31 16:51+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -26,7 +26,7 @@ msgstr "Frågelista"
 #: view:crm_profiling.question:0
 #: field:crm_profiling.question,answers_ids:0
 msgid "Avalaible Answers"
-msgstr ""
+msgstr "Tillgängliga svar"
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -151,7 +151,7 @@ msgstr "Använd profileringsreglerna"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Fel ! Du kan inte skapa rekursiva profiler."
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@@ -200,4 +200,4 @@ msgstr "Spara data"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "eller"
diff --git a/addons/crm_todo/i18n/sv.po b/addons/crm_todo/i18n/sv.po
index 37be50e77e6..fd01cb5f1d2 100644
--- a/addons/crm_todo/i18n/sv.po
+++ b/addons/crm_todo/i18n/sv.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-03-31 16:51+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr "Tidsram"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "Kundämne"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -67,7 +67,7 @@ msgstr "Avbryt"
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Kundämnen/affärsmöjligheter"
 
 #. module: crm_todo
 #: field:project.task,lead_id:0
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index 2646ec57d76..016840c0891 100644
--- a/addons/decimal_precision/i18n/sv.po
+++ b/addons/decimal_precision/i18n/sv.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-03-31 20:55+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -26,7 +26,7 @@ msgstr "Siffror"
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
 msgid "Decimal Accuracy"
-msgstr "Decimal pression"
+msgstr "Decimalprecision"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 2ff99b8a1b3..9067f5ea56c 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.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-03-31 16:57+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -52,7 +52,7 @@ msgstr "Leveransmatrisrad"
 #: field:stock.move,weight_uom_id:0
 #: field:stock.picking,weight_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -71,7 +71,7 @@ msgstr "Volym"
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Zip"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -204,7 +204,7 @@ msgstr "Matrisdefinition"
 #: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -224,7 +224,7 @@ msgstr "Kundorder"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Utgående Leveranser"
 
 #. module: delivery
 #: view:sale.order:0
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 5bb98ab85fc..0a90370e382 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.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-03-31 16:53+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -50,7 +50,7 @@ msgstr "Gruppera på..."
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Ändring"
 
 #. module: document
 #: view:document.directory:0
@@ -92,7 +92,7 @@ msgstr "Directory Content"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mina dokument"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -257,7 +257,7 @@ msgstr ""
 #: code:addons/document/document.py:310
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -426,7 +426,7 @@ msgstr "Statisk"
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "okänd"
 
 #. module: document
 #: view:document.directory:0
@@ -503,7 +503,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Bilaga(or)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -591,7 +591,7 @@ msgstr "Katalognamnet måste vara unikt !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -747,7 +747,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document_page/i18n/sv.po b/addons/document_page/i18n/sv.po
index 9afe539e62e..a16fd2c7806 100644
--- a/addons/document_page/i18n/sv.po
+++ b/addons/document_page/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:19+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -23,13 +23,13 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: document_page
 #: view:document.page:0
 #: field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Senaste författare"
 
 #. module: document_page
 #: view:document.page:0
@@ -46,12 +46,12 @@ msgstr "Meny"
 #: view:document.page:0
 #: model:ir.model,name:document_page.model_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Dokumentsida"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_related_page_history
 msgid "Page History"
-msgstr ""
+msgstr "Sidhistorik"
 
 #. module: document_page
 #: view:document.page:0
@@ -64,12 +64,12 @@ msgstr "Innehåll"
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: document_page
 #: view:document.page:0
@@ -85,32 +85,32 @@ msgstr "Rubrik"
 #. module: document_page
 #: model:ir.model,name:document_page.model_document_page_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Skapa guide-meny"
 
 #. module: document_page
 #: field:document.page,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Ändrad av"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Sidtyp"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -121,7 +121,7 @@ msgstr "Menyinformation"
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Dokumentets sidhistorik"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
@@ -144,7 +144,7 @@ msgstr "Datum"
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Skillnad"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_page
@@ -156,12 +156,12 @@ msgstr "Sidor"
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -202,7 +202,7 @@ msgstr ""
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Dokumenthistorik"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -212,12 +212,12 @@ msgstr "Menynamn"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Sida"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
@@ -227,6 +227,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicka för att skapa en ny webbsida.\n"
+"              </p>\n"
+"            "
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -238,14 +242,14 @@ msgstr "Skapa meny"
 #. module: document_page
 #: field:document.page,display_content:0
 msgid "Displayed Content"
-msgstr ""
+msgstr "Visa innehåll"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -261,9 +265,9 @@ msgstr "Skillnad"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttyp"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Underordnade"
diff --git a/addons/edi/i18n/sv.po b/addons/edi/i18n/sv.po
index 5f6982a2fbf..f3533c11379 100644
--- a/addons/edi/i18n/sv.po
+++ b/addons/edi/i18n/sv.po
@@ -8,35 +8,35 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 16:16+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Orsak:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Dokumentet har blivit korrekt importerat!"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Ursäkta, dokumentet kunde inte importeras."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@@ -53,13 +53,13 @@ msgstr "Valuta"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Dokumentimport avisering"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Saknad applikation"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -87,4 +87,4 @@ msgstr "Företag"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI-undersystem"
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 73804617e12..4e0154d2e94 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 16:56+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -38,7 +38,7 @@ msgstr "Sidorutans knapp för att öppna sidorutans åtgärder"
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Hoppa av"
 
 #. module: email_template
 #: view:email.template:0
@@ -95,7 +95,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Förhandsvisa"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -112,13 +112,13 @@ msgstr ""
 #: field:email.template,body_html:0
 #: field:email_template.preview,body_html:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:247
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: email_template
 #: field:mail.compose.message,template_id:0
diff --git a/addons/event_moodle/i18n/sv.po b/addons/event_moodle/i18n/sv.po
new file mode 100644
index 00000000000..7035fd2bd8f
--- /dev/null
+++ b/addons/event_moodle/i18n/sv.po
@@ -0,0 +1,185 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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: 2014-03-31 20:53+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with username and password"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
+msgid "event.moodle.config.wiz"
+msgstr "event.moodle.config.wiz"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,server_moodle:0
+msgid ""
+"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
+"'http://localhost'"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.registration,moodle_user_password:0
+msgid "Password for Moodle User"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_password:0
+msgid "Moodle Password"
+msgstr "Moodle lösenord"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Your email '%s' is wrong."
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with a Token"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"The easiest way to connect OpenERP with a moodle server is to create a "
+"'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
+"application."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,url:0
+msgid "URL to Moodle Server"
+msgstr "URL till Moodleserver"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,url:0
+msgid "The url that will be used for the connection with moodle in xml-rpc"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_registration
+msgid "Event Registration"
+msgstr "Evenemangsregistrering"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"Another approach is to create a user for OpenERP in Moodle. If you do so, "
+"make sure that this user has appropriate access rights."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.registration,moodle_uid:0
+msgid "Moodle User ID"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,server_moodle:0
+msgid "Moodle Server"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.event,moodle_id:0
+msgid "Moodle ID"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Server"
+msgstr "Server"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#: code:addons/event_moodle/event_moodle.py:105
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:105
+#, python-format
+msgid "You must configure your moodle connection."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_username:0
+#: field:event.registration,moodle_username:0
+msgid "Moodle Username"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+#: model:ir.actions.act_window,name:event_moodle.configure_moodle
+msgid "Configure Moodle"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_token:0
+msgid "Moodle Token"
+msgstr "Moodle-token"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_username:0
+msgid ""
+"You can also connect with your username that you define when you create a "
+"token"
+msgstr ""
+
+#. module: event_moodle
+#: help:event.event,moodle_id:0
+msgid "The identifier of this event in Moodle"
+msgstr ""
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_token:0
+msgid "Put your token that you created in your moodle server"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.ui.menu,name:event_moodle.wizard_moodle
+msgid "Moodle Configuration"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "or"
+msgstr "eller"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#, python-format
+msgid "First configure your moodle connection."
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Apply"
+msgstr "Verkställ"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_event
+msgid "Event"
+msgstr "Händelse"
diff --git a/addons/event_sale/i18n/sv.po b/addons/event_sale/i18n/sv.po
new file mode 100644
index 00000000000..bcaf87f3948
--- /dev/null
+++ b/addons/event_sale/i18n/sv.po
@@ -0,0 +1,90 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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: 2014-03-31 20:57+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Produkt"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sales order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Evenemangstyp"
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr "event_ok"
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "Evenemangstyp"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "Händelse"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
index 3027e546f0c..be0a6c077df 100644
--- a/addons/google_base_account/i18n/sv.po
+++ b/addons/google_base_account/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:21+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -36,12 +36,12 @@ msgstr "Google kontaktimportfel!"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -57,7 +57,7 @@ msgstr "Google-lösenord"
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -67,7 +67,7 @@ msgstr "Google-konto"
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synkronisering"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
@@ -78,7 +78,7 @@ msgstr ""
 #. module: google_base_account
 #: view:google.login:0
 msgid "e.g. user@gmail.com"
-msgstr ""
+msgstr "e.g. user@gmail.com"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -98,7 +98,7 @@ msgstr "Google-kontakt"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po
index bcb3bd297fa..eca04d8af75 100644
--- a/addons/hr/i18n/am.po
+++ b/addons/hr/i18n/am.po
@@ -8,13 +8,13 @@ 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-21 08:07+0000\n"
+"PO-Revision-Date: 2014-04-01 09:20+0000\n"
 "Last-Translator: biniyam <life2enough@gmail.com>\n"
 "Language-Team: Amharic <am@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-22 07:04+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr
@@ -354,27 +354,27 @@ msgstr "አባላቶች"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "ማስተካከያዎች"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "የሰራተኞች ቅጽ"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "የሰራተኞችን ወጪ መከታተያ"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "ስልክ"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr ""
+msgstr "አግብቶ የፈታ"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -386,12 +386,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
 #: model:ir.ui.menu,name:hr.menu_hr_department_tree
 msgid "Departments"
-msgstr ""
+msgstr "ክፍሎች"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "የሰራተኛው ተጠሪ"
 
 #. module: hr
 #: view:hr.employee:0
@@ -424,7 +424,7 @@ msgstr ""
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "ወንድ"
 
 #. module: hr
 #: view:hr.employee:0
@@ -451,18 +451,18 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "አንስተኛ መጠን ያላቸው ፎቶዎች"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "የሰራተኞች መድብ"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "ምልክት"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
@@ -472,22 +472,22 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Related User"
-msgstr ""
+msgstr "ተጠቃሚዎች"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ወይም"
 
 #. module: hr
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "ምድብ"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "ቅጥር ማቆም"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
@@ -497,32 +497,32 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "የሰራተኞች የባንክ ቁጥር"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "ማስታወሻ"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "የሰራተኞች መዋቅር"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "የግንኙነት መረጃ"
 
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "ተመሳሳይ ሰራተኞች"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "የባእልና ያረፍት ቀኖችን መቆጣጠር"
 
 #. module: hr
 #: field:hr.department,child_ids:0
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 1681bc0ac2c..5ab2cd2ffb5 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.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-03-28 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:30+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index aff929cafe1..a8c3c242c15 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.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-01-17 23:52+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-04-01 06:48+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -45,7 +45,7 @@ msgstr "Gruppera efter..."
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Advantages..."
-msgstr ""
+msgstr "Fördelar..."
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
@@ -108,7 +108,7 @@ msgstr "Avtalstyper"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Exam"
-msgstr ""
+msgstr "Medicinsk undersökning"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -169,7 +169,7 @@ msgstr "Arbetsschema"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Salary and Advantages"
-msgstr ""
+msgstr "Lön och förmåner"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
@@ -179,7 +179,7 @@ msgstr "Befattning"
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
+msgstr "Fel! Avtalets startdatum måste vara mindre än dess slutdatum."
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
@@ -199,7 +199,7 @@ msgstr "Visa nummer"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Dist."
-msgstr ""
+msgstr "Hem-arbete distans"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -209,7 +209,7 @@ msgstr "Födelseort"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period Duration"
-msgstr ""
+msgstr "Provanställningstid"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index 7b829ae5bec..77baff54e3c 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.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-03-31 16:59+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -88,7 +88,7 @@ msgstr "Bedömningsfaser"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "Skicka begäran"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -114,7 +114,7 @@ msgstr "(Eval_name): Bedömnings namn"
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -154,7 +154,7 @@ msgstr "Bedömning"
 #: help:hr.evaluation.interview,message_unread:0
 #: help:hr_evaluation.evaluation,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -224,6 +224,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -240,7 +242,7 @@ msgstr "Tidsfrist"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -265,7 +267,7 @@ msgstr "(Datum)s: Aktuellt datum"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "Intervjuer"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:83
@@ -277,13 +279,13 @@ msgstr "Beträffande "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -384,7 +386,7 @@ msgstr "Juli"
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
@@ -569,7 +571,7 @@ msgstr " (Employee_name) s: Partners namn"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -618,7 +620,7 @@ msgstr "Utvecklingssamtal"
 #: field:hr.evaluation.interview,message_summary:0
 #: field:hr_evaluation.evaluation,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 4236a8e654b..8e6353ba5f3 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.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-03-31 17:01+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -44,7 +44,7 @@ msgstr "Bokföraren ersätter utläggen"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_approved
 msgid "Expense approved"
-msgstr ""
+msgstr "Utlägg godkänt"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
@@ -85,7 +85,7 @@ msgstr "Ny utgift"
 #: field:hr.expense.line,uom_id:0
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -95,7 +95,7 @@ msgstr "mars"
 #. module: hr_expense
 #: field:hr.expense.expense,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -155,7 +155,7 @@ msgstr "Anteckningar"
 #. module: hr_expense
 #: field:hr.expense.expense,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:172
@@ -165,7 +165,7 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:353
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_refused
@@ -201,7 +201,7 @@ msgstr ""
 #. module: hr_expense
 #: help:hr.expense.expense,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -244,12 +244,14 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:453
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -308,7 +310,7 @@ msgstr "Sekvensen ordning vid visning av en lista över kostnadsrader."
 #: view:hr.expense.report:0
 #: field:hr.expense.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -330,7 +332,7 @@ msgstr "Väntar"
 #. module: hr_expense
 #: field:hr.expense.expense,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -422,7 +424,7 @@ msgstr "Efter skapandet av faktura, ersätt kostnader"
 #: code:addons/hr_expense/hr_expense.py:121
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 9efe633bb5b..3bf5378ef53 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.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-03-31 17:00+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -63,7 +63,7 @@ msgstr "Läge för Ledighetstilldelning"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_from:0
 msgid "From Date"
-msgstr ""
+msgstr "Från datum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -117,7 +117,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
-msgstr ""
+msgstr "Allokering"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -147,7 +147,7 @@ msgstr "Aktuell ledighetstyp"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Validate"
-msgstr ""
+msgstr "Granska"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -178,7 +178,7 @@ msgstr "Ledighet"
 #. module: hr_holidays
 #: field:hr.holidays,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -189,7 +189,7 @@ msgstr "Ledig"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 146ec99f246..dbda8281393 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.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-02-03 10:32+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-04-01 07:52+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-04 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -247,7 +247,7 @@ msgstr "Дүрмийн дүнг тооцоолох арга."
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
 msgid "Contribution Register's Payslip Lines"
-msgstr "Хандивийн бүртгэлийн цалингийн хуудсын мөрүүд"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
@@ -357,11 +357,11 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Хандив оруулалтыг бүртгэхдээ дарна.\n"
+"                Шинэ суутгал шимтгэлийн төрөл бүртгэх бол энд дарна.\n"
 "              </p><p>\n"
-"                Хандивын бүртгэл гэдэг нь цалингийн төлбөрт гуравдагч этгээд "
-"оролцох явдлыг хэлнэ. Энэ нь нийгмийн халамж, улс болон цалинд нэмэр оруулж "
-"байгаа хэн ч байж болно. \n"
+"                Суутгал шимтгэлийн төрөл гэдэг нь цалингийн дүнгээс "
+"гуравдагч этгээд суутгал шимтгэл авах явдалд хэрэглэгдэнэ. Тухайлбал "
+"нийгмийн даатгал, эрүүл мэндийн даатгал, ажилгүйдлийн тэтгэмж гэх мэт. \n"
 "              </p>\n"
 "            "
 
@@ -466,7 +466,7 @@ msgstr "Төлбөрийн баримтыг хийсэн үү ? "
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr "Цалингийн хуудас хандивийн бүртгэлээр"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -504,7 +504,7 @@ msgstr "Нөхөн төлөх "
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr "Цалингийн хуудсын мөрүүд хандивын бүртгэлээр"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -758,7 +758,7 @@ msgstr "Хийгдсэн Цалингийн Хуудсын Багцууд"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Payslip Lines by Contribution Register:"
-msgstr "Цалингийн хуудсын мөрүүд хандивын бүртгэлээр:"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -1036,7 +1036,7 @@ msgstr "hr.config.settings"
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
+msgstr "Суутгал шимтгэлийн төрөл"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -1091,7 +1091,7 @@ msgstr "Нийт үндсэн цалин"
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
+msgstr "Суутгал шимтгэлийн төрөл"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index ca0bf75c7a5..cc19058ecf4 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.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-03-31 16:55+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -124,7 +124,7 @@ msgstr "hr.salary.rule"
 #: view:hr.payslip:0
 #: view:hr.payslip.run:0
 msgid "to"
-msgstr ""
+msgstr "till"
 
 #. module: hr_payroll
 #: field:hr.payslip,payslip_run_id:0
@@ -152,7 +152,7 @@ msgstr "Antal / Pris"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Underliggande definitioner"
 
 #. module: hr_payroll
 #: field:hr.payslip.input,payslip_id:0
@@ -208,7 +208,7 @@ msgstr "Noteringar"
 #: code:addons/hr_payroll/hr_payroll.py:905
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -303,7 +303,7 @@ msgstr "Struktur"
 #. module: hr_payroll
 #: field:hr.contribution.register,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -441,7 +441,7 @@ msgstr "Procentsats baserad på"
 #: code:addons/hr_payroll/hr_payroll.py:90
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
@@ -469,7 +469,7 @@ msgstr "Lönespecifikation Rader"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -521,7 +521,7 @@ msgstr "Fast belopp"
 #: code:addons/hr_payroll/hr_payroll.py:370
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,active:0
@@ -537,7 +537,7 @@ msgstr ""
 #: field:hr.payslip,state:0
 #: field:hr.payslip.run,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -931,12 +931,12 @@ msgstr "Sekvens"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Period from"
-msgstr ""
+msgstr "Period från"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -1018,7 +1018,7 @@ msgstr "Anställdas lönespecifikation"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1272,7 +1272,7 @@ msgstr "Lönespecifikation Namn"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Accounting"
-msgstr ""
+msgstr "Bokföring"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range:0
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 419ec16d1f4..edace2b502c 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:23+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
@@ -50,7 +50,7 @@ msgstr "Utgiftsjournalen \"%s\" saknar debet-konto"
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_tax_id:0
 msgid "Tax Code"
-msgstr "Skattekod"
+msgstr "Momskod"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,period_id:0
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index d4b8cdef4db..29b4c002738 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.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-03-31 16:41+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -45,7 +45,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobil:"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,fold:0
@@ -106,7 +106,7 @@ msgstr "Vilande arbeten"
 #: view:hr.applicant:0
 #: field:hr.applicant,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -123,7 +123,7 @@ msgid "Sources of Applicants"
 msgstr "Källor för sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Du måste definiera sökta jobb för denna sökande."
@@ -164,7 +164,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applications"
-msgstr ""
+msgstr "Ansökningar"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -174,7 +174,7 @@ msgstr "Dagar för att öppna"
 #. module: hr_recruitment
 #: field:hr.applicant,emp_id:0
 msgid "employee"
-msgstr ""
+msgstr "anställd"
 
 #. module: hr_recruitment
 #: field:hr.config.settings,fetchmail_applicants:0
@@ -191,7 +191,7 @@ msgstr "Dag"
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Contact"
-msgstr ""
+msgstr "Skapa kontakt"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -223,7 +223,7 @@ msgstr "Nästa åtgärd"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -246,7 +246,7 @@ msgstr ""
 #. module: hr_recruitment
 #: help:hr.applicant,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_recruitment
 #: field:hr.applicant,color:0
@@ -256,7 +256,7 @@ msgstr "Färgindex"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "Möten"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -295,9 +295,11 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -376,7 +378,7 @@ msgstr "År"
 #. module: hr_recruitment
 #: field:hr.applicant,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_monster
@@ -386,7 +388,7 @@ msgstr "Monster"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
 msgid "Applicant Hired"
-msgstr ""
+msgstr "Sökande anställd"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -506,7 +508,7 @@ msgid "Applicants"
 msgstr "Sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:360
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Inget ämne"
@@ -527,9 +529,7 @@ msgid "Gives the sequence order when displaying a list of stages."
 msgstr "Visaren lista på stegen i sekvens ordning."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:347
 #: field:hr.applicant,partner_id:0
-#, python-format
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -619,7 +619,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant_category
@@ -667,7 +667,7 @@ msgstr "Ämne"
 #: view:hired.employee:0
 #: view:hr.recruitment.partner.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
@@ -779,7 +779,7 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:407
+#: code:addons/hr_recruitment/hr_recruitment.py:397
 #, python-format
 msgid "Applicant <b>created</b>"
 msgstr ""
@@ -888,7 +888,7 @@ msgstr "Granska etapperna i rektryteringsprocessen"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contact:"
-msgstr ""
+msgstr "Kontakt:"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -914,7 +914,7 @@ msgstr "Vill du lägga upp en anställd ?"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Degree:"
-msgstr ""
+msgstr "Examen:"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -934,7 +934,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
@@ -955,7 +955,7 @@ msgstr "Namnet på examen för rekryteringen måste vara unik!"
 #: code:addons/hr_recruitment/hr_recruitment.py:349
 #, python-format
 msgid "Contact Email"
-msgstr ""
+msgstr "Kontaktpersonens e-postadress"
 
 #. module: hr_recruitment
 #: view:hired.employee:0
@@ -996,7 +996,7 @@ msgstr "Ger sorteringsordningen när listan med examina visas."
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
 msgid "Stage changed"
-msgstr ""
+msgstr "Steg ändrat"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1047,7 +1047,7 @@ msgid "New"
 msgstr "Ny"
 
 #. module: hr_recruitment
-#: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
+#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview
 #: view:hr.job:0
 msgid "Interview"
 msgstr "Intervju"
@@ -1060,7 +1060,7 @@ msgstr "Källnamn"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Dag(ar)"
 
 #. module: hr_recruitment
 #: field:hr.applicant,description:0
@@ -1120,7 +1120,7 @@ msgstr "Anställd"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Referred By"
-msgstr ""
+msgstr "Hänvisad av"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1194,7 +1194,7 @@ msgstr "De här personerna kommer att ta emot e-post."
 #. module: hr_recruitment
 #: field:hr.job,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1209,17 +1209,17 @@ msgstr "Vilande rekryteringar"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract"
-msgstr ""
+msgstr "Avtal"
 
 #. module: hr_recruitment
 #: field:hr.applicant,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 6774d404802..5caaf71b0da 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -8,24 +8,24 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-29 14:48+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:15+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-30 06:15+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Documents"
-msgstr ""
+msgstr "Dokument"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_webdav:0
@@ -33,11 +33,13 @@ msgid ""
 "Access your documents in OpenERP through WebDAV.\n"
 "                This installs the module document_webdav."
 msgstr ""
+"Få tillgång till dina dokument i OpenERP via WebDAV.\n"
+"                 Detta installerar modulen document_webdav."
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_page:0
 msgid "This installs the module document_page."
-msgstr ""
+msgstr "Detta installerar modulen document_page"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
@@ -48,12 +50,12 @@ msgstr "Samverkansinnehåll"
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: view:knowledge.config.settings:0
 msgid "Configure Knowledge"
-msgstr ""
+msgstr "Konfigurera kunskapssystemet"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "Dokumenthantering och kunskapsutveckling"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document:0
@@ -63,31 +65,36 @@ msgid ""
 "and a document dashboard.\n"
 "                This installs the module document."
 msgstr ""
+"Detta är en komplett dokumenthanteringssystem, med: användarautentisering,\n"
+"                 fritextsökning i dokumenten (dock ej pptx eller docx, "
+"använd odt-formaten och pdf för bästa resultat), och en "
+"dokumentanslagstavla.\n"
+"                 Detta installerar modulen document."
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
 msgid "Create static web pages"
-msgstr ""
+msgstr "Skapar statiska webbsidor"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_ftp:0
 msgid "Share repositories (FTP)"
-msgstr ""
+msgstr "Dela dokumentarkiv (FTP)"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "Administrera dokument"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -100,16 +107,18 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
+"Få tillgång till dina dokument i OpenERP via ett FTP-gränssnitt.\n"
+"                 Detta installerar modulen document_ftp."
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "Dela dokumentarkiv (WebDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index cae90248617..2706147bd73 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -9,14 +9,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-18 12:47+0000\n"
+"PO-Revision-Date: 2014-04-02 02:34+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Svenska <info@openerpsweden.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-19 06:29+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -133,6 +133,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"E-postadress till avsändaren. Det här fältet är satt när inget matchande "
+"företag hittas för inkommande e-post."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -196,6 +198,9 @@ msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
+"Medlemmarna i dessa grupper kommer automatiskt att läggas till som följare. "
+"Observera att de kommer att kunna hantera sin prenumeration för hand om det "
+"behövs."
 
 #. module: mail
 #. openerp-web
@@ -224,6 +229,9 @@ msgid ""
 " %s won't be notified of any email or discussion on this document. Do you "
 "really want to remove him from the followers ?"
 msgstr ""
+"Varning!\n"
+"  %s inte kommer att meddelas om någon e-post eller diskussion om detta "
+"dokument. Vill du verkligen ta bort honom från följare?"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -246,6 +254,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Medelstora foto av gruppen. Det är automatiskt storleksändras som en "
+"128x128px bild, med bildförhållande bevaras. Använd det här fältet i "
+"formulär vyer eller några Kanbanvyer."
 
 #. module: mail
 #. openerp-web
@@ -268,6 +279,10 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
 
 #. module: mail
 #: view:mail.mail:0
@@ -292,14 +307,14 @@ msgstr "Tråd"
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "Öppna den avancerade e-posteditorn"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "&ograve"
-msgstr ""
+msgstr "&ograve"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
@@ -328,6 +343,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 
 #. module: mail
 #. openerp-web
@@ -393,7 +410,7 @@ msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 #. module: mail
 #: field:mail.group,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Medelstort foto"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
@@ -445,7 +462,7 @@ msgstr "visa ytterligare meddelande"
 #: code:addons/mail/res_users.py:69
 #, python-format
 msgid "Invalid Action!"
-msgstr "Ogiltig åtgärd"
+msgstr "Ogiltig åtgärd!"
 
 #. module: mail
 #. openerp-web
@@ -544,7 +561,7 @@ msgstr "Från"
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Undertyp"
 
 #. module: mail
 #: view:mail.mail:0
@@ -555,7 +572,7 @@ msgstr "E-postmeddelande"
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #. openerp-web
@@ -611,7 +628,7 @@ msgstr "Följare"
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr "Arkiv"
+msgstr "Archives"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -637,7 +654,7 @@ msgstr "Ny"
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr "En följate"
+msgstr "En följare"
 
 #. module: mail
 #: field:mail.compose.message,model:0
@@ -858,12 +875,12 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr ""
+msgstr "Har bilagor"
 
 #. module: mail
 #: view:mail.mail:0
@@ -933,7 +950,7 @@ msgstr ""
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "Är en avisering"
 
 #. module: mail
 #. openerp-web
@@ -978,6 +995,8 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
 
 #. module: mail
 #: view:mail.mail:0
@@ -1004,7 +1023,7 @@ msgstr "Ägare"
 #: code:addons/mail/res_partner.py:52
 #, python-format
 msgid "Partner Profile"
-msgstr ""
+msgstr "Partner Profile"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -1019,7 +1038,7 @@ msgstr "Meddelanden"
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id of the followed resource"
 
 #. module: mail
 #: field:mail.compose.message,body:0
@@ -1039,6 +1058,8 @@ msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
 msgstr ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
@@ -1060,45 +1081,45 @@ msgstr ""
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Integritet"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Avisering"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:654
 #, python-format
 msgid "Please complete partner's informations"
-msgstr ""
+msgstr "Please complete partner's informations"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:190
 #, python-format
 msgid "<p>Access this document <a href=\"%s\">directly in OpenERP</a></p>"
-msgstr ""
+msgstr "<p>Access this document <a href=\"%s\">directly in OpenERP</a></p>"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Followers of selected items and"
-msgstr ""
+msgstr "Followers of selected items and"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "Record Thread ID"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Mina grupper"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -1154,7 +1175,7 @@ msgstr "Du har ett oläst meddelande"
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Name get of the related document."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -1165,7 +1186,7 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr "Notifikationer"
+msgstr "Aviseringar"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1179,13 +1200,16 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:311
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "visa fler meddelanden"
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1200,7 +1224,7 @@ msgstr ""
 #. module: mail
 #: field:res.partner,notification_email_send:0
 msgid "Receive Messages by Email"
-msgstr ""
+msgstr "Ta emot meddelanden per e-post"
 
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
@@ -1210,7 +1234,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Endast valda grupper"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
@@ -1256,7 +1280,7 @@ msgstr "Endast inkommane post"
 #: code:addons/mail/static/src/xml/mail.xml:292
 #, python-format
 msgid "more"
-msgstr ""
+msgstr "more"
 
 #. module: mail
 #. openerp-web
@@ -1275,49 +1299,49 @@ msgstr "Skriv till mina följare"
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Access Groups"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "Default"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:246
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Mark as Todo"
 
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
 msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "Parent subtype, used for automatic subscription."
 
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:222
 #: code:addons/mail/mail_mail.py:244
 #, python-format
 msgid "\"Followers of %s\" <%s>"
-msgstr ""
+msgstr "\"Followers of %s\" <%s>"
 
 #. module: mail
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 msgid "Add contacts to notify..."
-msgstr ""
+msgstr "Add contacts to notify..."
 
 #. module: mail
 #: view:mail.group:0
@@ -1334,7 +1358,7 @@ msgstr "Blockerad"
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Relaterad meny"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1354,6 +1378,7 @@ msgstr "Följer"
 msgid ""
 "Unfortunately this email alias is already used, please choose a unique one"
 msgstr ""
+"Unfortunately this email alias is already used, please choose a unique one"
 
 #. module: mail
 #: help:mail.alias,alias_user_id:0
@@ -1363,19 +1388,23 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr ""
+msgstr "And"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:111
 #, python-format
 msgid "You have %d unread messages"
-msgstr ""
+msgstr "You have %d unread messages"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -1389,6 +1418,8 @@ msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
@@ -1401,7 +1432,7 @@ msgstr "Bilagor"
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Message Record Name"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
@@ -1416,7 +1447,7 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Topics discussed in this group..."
-msgstr ""
+msgstr "Ämnen under diskussion i denna grupp..."
 
 #. module: mail
 #. openerp-web
@@ -1424,7 +1455,7 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "Followers of"
-msgstr ""
+msgstr "Followers of"
 
 #. module: mail
 #: help:mail.mail,auto_delete:0
@@ -1435,14 +1466,14 @@ msgstr ""
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Discussion Group"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:242
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
@@ -1468,17 +1499,17 @@ msgstr "Hela företaget"
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "and"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Rich-text/HTML message"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr "Månad skapad"
+msgstr "Registreringsmånad"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -1495,7 +1526,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Innehåll"
 
 #. module: mail
 #: field:mail.mail,email_to:0
@@ -1514,7 +1545,7 @@ msgstr "Besvara"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr "Meddelade företag"
+msgstr "Aviserade företag"
 
 #. module: mail
 #. openerp-web
@@ -1550,19 +1581,19 @@ msgstr "Meddelandets unika identifierare"
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Dokumentföljare"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "Ta bort denna följare"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1572,7 +1603,7 @@ msgstr "Aldrig"
 #. module: mail
 #: field:mail.mail,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr "Utgående mailserver"
+msgstr "Utgående e-postserver"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:930
@@ -1616,13 +1647,17 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Meddelanden saknas i gruppen.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Vänligen vänta tills filen är uppladdad."
 
 #. module: mail
 #: view:mail.group:0
@@ -1638,7 +1673,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:243
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Backa till Att göra"
 
 #. module: mail
 #. openerp-web
@@ -1652,22 +1687,22 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:279
 #, python-format
 msgid "nobody"
-msgstr ""
+msgstr "ingen"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Incoming Emails and Discussions"
-msgstr ""
+msgstr "Inkommande post och diskussioner"
 
 #. module: mail
 #: field:mail.group,name:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "You cannot create recursive Partner hierarchies."
-msgstr ""
+msgstr "Du kan inte skapa rekursiv företagsstrukturer."
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1675,6 +1710,8 @@ msgid ""
 "If you have setup a catch-all email domain redirected to the OpenERP server, "
 "enter the domain name here."
 msgstr ""
+"Om du har en 'fånga alla e-postmeddelanden'-domän vidarebefordra den till "
+"OpenERP-servern och ange domännamnet här."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1691,7 +1728,7 @@ msgstr "Meddelanden"
 #: code:addons/mail/static/src/xml/mail.xml:139
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "övrigt..."
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
@@ -1705,12 +1742,12 @@ msgstr "Att göra"
 #: field:mail.group,alias_id:0
 #: field:res.users,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Utgående e-post"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1725,13 +1762,13 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:149
 #, python-format
 msgid "(no email address)"
-msgstr ""
+msgstr "(e-postadress saknas)"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr "Meddelanden"
+msgstr "Meddelandehantering"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1758,7 +1795,7 @@ msgstr ""
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande och kommunikationshistorik"
 
 #. module: mail
 #: help:mail.mail,references:0
@@ -1768,7 +1805,7 @@ msgstr "Meddelandereferens, som identifierar tidigare meddelanden"
 #. module: mail
 #: field:mail.compose.message,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Författarmod"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
@@ -1786,7 +1823,7 @@ msgstr "avgilla"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "Diskussionsgrupp"
 
 #. module: mail
 #: help:mail.mail,email_cc:0
@@ -1796,7 +1833,7 @@ msgstr "Blindkopiemottagare"
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "Alias domän"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1840,7 +1877,7 @@ msgstr "Leverans misslyckades"
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Ytterligare kontakter"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
@@ -1876,7 +1913,7 @@ msgstr "Filter"
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Vänligen komplettera företagets information och e-postadresser"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
@@ -1898,3 +1935,6 @@ msgstr "Litet fotografi"
 #: help:mail.mail,reply_to:0
 msgid "Preferred response address for the message"
 msgstr "Föredragen svarsadress för meddelandet"
+
+#~ msgid "Invitation to follow %s"
+#~ msgstr "Invitation to follow %s"
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index 6f1fc51af7a..cebe952a9c4 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -8,19 +8,19 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 17:03+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:19+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
 msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -34,7 +34,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:marketing.action_marketing_configuration
 #: view:marketing.config.settings:0
 msgid "Configure Marketing"
-msgstr ""
+msgstr "Konfigurera marknadsföring"
 
 #. module: marketing
 #: view:crm.lead:0
@@ -45,17 +45,17 @@ msgstr "Marknadsföring"
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign:0
 msgid "Marketing campaigns"
-msgstr ""
+msgstr "Marknadsföringskampanj"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampanjer"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
@@ -70,7 +70,7 @@ msgstr "Användare"
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns Settings"
-msgstr ""
+msgstr "Kampanjinställningar"
 
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
@@ -80,12 +80,12 @@ msgstr ""
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign:0
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index dc13c6627dc..2dfa0f693bc 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 17:07+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:19+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -72,7 +72,7 @@ msgstr "Utlösare"
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Uppföljning"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index a3eefc673cc..6bdab6cc279 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 17:08+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -32,7 +32,7 @@ msgstr "Medlemskapsprocess"
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "Betalande medlem"
 
 #. module: membership
 #: view:report.membership:0
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index defa55fe964..e558d81e947 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -8,13 +8,13 @@ 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-20 16:41+0000\n"
+"PO-Revision-Date: 2014-03-31 07:55+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-21 06:51+0000\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp
@@ -1555,7 +1555,7 @@ msgstr "完了"
 #. module: mrp
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "この製品を販売する場合、OpenERPは製品に割り当てた部品表を使用して"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -2208,7 +2208,7 @@ msgid ""
 "using the bill of materials assigned to this product.\n"
 "                        The delivery order will be ready once the production "
 "is done."
-msgstr ""
+msgstr "をトリガします。一旦生産されると、配送オーダーは準備完了となります。"
 
 #. module: mrp
 #: field:mrp.config.settings,module_stock_no_autopicking:0
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index a06af50637a..64c5a4e745e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.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: 2013-12-30 15:13+0000\n"
-"Last-Translator: Anders Eriksson, Mobila System <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2014-03-31 17:06+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-31 05:26+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -101,7 +101,7 @@ msgstr ""
 #: help:mrp.production,message_unread:0
 #: help:mrp.production.workcenter.line,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -140,6 +140,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
diff --git a/addons/mrp_byproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po
index 4ef8afe3027..5d8d26af0e8 100644
--- a/addons/mrp_byproduct/i18n/sv.po
+++ b/addons/mrp_byproduct/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:58+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -37,7 +37,7 @@ msgstr "Produkt"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Produktens måttenhet"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -47,7 +47,7 @@ msgstr "Produktionsorder"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Ändra antal för produkter"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
@@ -74,7 +74,7 @@ msgstr "Produktkvantitet"
 #: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
diff --git a/addons/note/i18n/sv.po b/addons/note/i18n/sv.po
index 23b4172eeee..f4fddad811c 100644
--- a/addons/note/i18n/sv.po
+++ b/addons/note/i18n/sv.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: 2013-01-20 18:02+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-31 20:10+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -67,7 +67,7 @@ msgstr "Följare"
 #. module: note
 #: model:note.stage,name:note.note_stage_00
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: note
 #: model:ir.actions.act_window,help:note.action_note_note
@@ -88,6 +88,24 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Klicka för att lägga till en personlig anteckning.\n"
+"           </p><p>\n"
+"             Använd anteckningar för att organisera personliga uppgifter "
+"eller anteckningar. Alla\n"
+"             anteckningar är privata, ingen annan kommer att kunna se dem. "
+"emellertid\n"
+"             du kan dela några anteckningar med andra personer genom att "
+"bjuda in följare\n"
+"             på anteckningen. (Användbart för mötesanteckningar, särskilt "
+"om\n"
+"             du aktiverar pad-funktionen för samarbetsredigering).\n"
+"           </p>\n"
+"             Du kan anpassa hur du behandlar dina anteckningar / uppgifter "
+"genom att lägga till,\n"
+"             tar bort eller modifierar kolumner.\n"
+"           </ p>\n"
+"        "
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_01
@@ -123,7 +141,7 @@ msgstr ""
 #. module: note
 #: help:note.note,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: note
 #: field:note.stage,name:0
@@ -190,60 +208,60 @@ msgstr "Senare"
 #. module: note
 #: model:ir.model,name:note.model_note_stage
 msgid "Note Stage"
-msgstr ""
+msgstr "Anteckningsetapp"
 
 #. module: note
 #: field:note.note,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
-msgstr ""
+msgstr "Användares etapper"
 
 #. module: note
 #: field:note.note,name:0
 msgid "Note Summary"
-msgstr ""
+msgstr "Anteckningssammandrag"
 
 #. module: note
 #: model:ir.actions.act_window,name:note.action_note_stage
 #: view:note.note:0
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: note
 #: help:note.note,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: note
 #: view:note.note:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: note
 #: field:note.note,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Färgindex"
 
 #. module: note
 #: field:note.note,sequence:0
 #: field:note.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: note
 #: view:note.note:0
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: note
 #: view:note.note:0
 msgid "Archive"
-msgstr ""
+msgstr "Arkiv"
 
 #. module: note
 #: field:base.config.settings,module_note_pad:0
@@ -256,6 +274,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
@@ -266,7 +286,7 @@ msgstr ""
 #: field:note.note,current_partner_id:0
 #: field:note.stage,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Ägare"
 
 #. module: note
 #: help:note.stage,sequence:0
@@ -276,9 +296,9 @@ msgstr ""
 #. module: note
 #: field:note.note,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Klardatum"
 
 #. module: note
 #: field:note.stage,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "Nedvikt som standard"
diff --git a/addons/note_pad/i18n/sv.po b/addons/note_pad/i18n/sv.po
index 3a5f0e091d1..dfe381e0b89 100644
--- a/addons/note_pad/i18n/sv.po
+++ b/addons/note_pad/i18n/sv.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-01-26 14:14+0000\n"
-"Last-Translator: Mikael Dúi Bolinder <dui@outlook.com>\n"
+"PO-Revision-Date: 2014-03-31 20:02+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
@@ -25,4 +25,4 @@ msgstr "Anteckning"
 #. module: note_pad
 #: field:note.note,note_pad_url:0
 msgid "Pad Url"
-msgstr ""
+msgstr "Pad Url"
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
index c0b9127d569..e19fa6a20ae 100644
--- a/addons/pad/i18n/sv.po
+++ b/addons/pad/i18n/sv.po
@@ -8,21 +8,21 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:45+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:18
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "&tilde;"
 
 #. module: pad
 #. openerp-web
@@ -32,16 +32,18 @@ msgid ""
 "You must configure the etherpad through the menu Settings > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Du måste konfigurera etherpad via menyn Inställningar> Företag> Företag, på "
+"fliken konfigurationen av ditt företag."
 
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "Etherpad-lite api-nyckel."
 
 #. module: pad
 #: view:res.company:0
 msgid "e.g. beta.primarypad.com"
-msgstr ""
+msgstr "e.g. beta.primarypad.com"
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -51,24 +53,24 @@ msgstr "Bolag"
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Paddar"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Pad-server"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Pad Api-nyckel"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Etherpad lite server. Example: beta.primarypad.com"
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
index eb00d7904af..7d86b50b4fd 100644
--- a/addons/pad_project/i18n/sv.po
+++ b/addons/pad_project/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:42+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
@@ -25,7 +25,7 @@ msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "PAD beskrivning"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index 6557ef8c702..940ce0bfd07 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -8,20 +8,20 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:05+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: plugin
 #: code:addons/plugin/plugin_handler.py:105
 #, python-format
 msgid "Use the Partner button to create a new partner"
-msgstr ""
+msgstr "Använd företagsknappen för att skapa nytt företag"
 
 #. module: plugin
 #: code:addons/plugin/plugin_handler.py:116
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index 970e1a0d1e4..00894f8b80a 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,13 +8,13 @@ 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-22 04:59+0000\n"
+"PO-Revision-Date: 2014-04-01 14:08+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-23 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: point_of_sale
@@ -52,7 +52,7 @@ msgstr "販売レシートの印刷"
 #. module: point_of_sale
 #: field:pos.session,cash_register_balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "計算残高"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -112,7 +112,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "営業担当者"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -135,7 +135,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:1373
 #, python-format
 msgid "Assign a Custom EAN"
-msgstr ""
+msgstr "カスタムEANを割り当て"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -165,7 +165,7 @@ msgstr "現金取出"
 #: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
-msgstr ""
+msgstr "未使用"
 
 #. module: point_of_sale
 #: field:pos.config,iface_vkeyboard:0
@@ -345,6 +345,7 @@ msgid ""
 "Check this if this point of sale should open by default in a self checkout "
 "mode. If unchecked, OpenERP uses the normal cashier mode by default."
 msgstr ""
+"販売時点をセルフチェックアウト・モードでオープンする場合にチェックします。チェックしない場合、OpenERPは通常のレジモードを使用します。"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -425,7 +426,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,to_weight:0
 msgid "To Weight"
-msgstr ""
+msgstr "重量"
 
 #. module: point_of_sale
 #. openerp-web
@@ -748,7 +749,7 @@ msgstr ""
 msgid ""
 "Check if, this is a product you can use to take cash from a statement for "
 "the point of sale backend, example: money lost, transfer to bank, etc."
-msgstr ""
+msgstr "チェックした場合、この製品は販売時点バックエンドの計算書から現金を取り出すために使用できます。例：金銭紛失、銀行振込など。"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -956,7 +957,7 @@ msgstr "売上合計"
 msgid ""
 "Check this if you want to group the Journal Items by Product while closing a "
 "Session"
-msgstr ""
+msgstr "セッションのクローズ中に製品単位で仕訳項目をグループ化する場合はチェックします。"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1080,7 +1081,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Set a Custom EAN"
-msgstr ""
+msgstr "カスタムEANを設定"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1341,7 +1342,7 @@ msgstr "請求合計"
 #: model:ir.model,name:point_of_sale.model_pos_category
 #: field:product.product,pos_categ_id:0
 msgid "Point of Sale Category"
-msgstr ""
+msgstr "販売時点カテゴリ"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1354,7 +1355,7 @@ msgstr "数量の数"
 msgid ""
 "This sequence is automatically created by OpenERP but you can change it to "
 "customize the reference numbers of your orders."
-msgstr ""
+msgstr "このシーケンスはOpenERPが自動で作成しますが、注文の参照番号をカスタマイズするために変更もできます。"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1482,7 +1483,7 @@ msgstr "製品カテゴリ"
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
 msgid "Accounting journal used to post sales entries."
-msgstr ""
+msgstr "売上高の記帳に使われる会計仕訳"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -1540,7 +1541,7 @@ msgstr "不明"
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Point of Sale Cash In"
-msgstr ""
+msgstr "販売時点の現金入"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1594,7 +1595,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,available_in_pos:0
 msgid "Available in the Point of Sale"
-msgstr ""
+msgstr "販売時点で利用可能"
 
 #. module: point_of_sale
 #: selection:pos.config,state:0
@@ -1649,7 +1650,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "販売時点の現金出"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -1754,7 +1755,7 @@ msgstr "Timmermans Kriek 375ml"
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
 msgid "Order IDs Sequence"
-msgstr ""
+msgstr "注文IDシーケンス"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1939,7 +1940,7 @@ msgstr ""
 msgid ""
 "Check if, this is a product you can use to put cash into a statement for the "
 "point of sale backend."
-msgstr ""
+msgstr "チェックした場合、この製品は販売時点バックエンドの計算書に現金を引き当てるために使用できます。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
@@ -2022,7 +2023,7 @@ msgstr "店："
 #. module: point_of_sale
 #: field:account.journal,self_checkout_payment_method:0
 msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "セルフチェックアウト支払方法"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2473,7 +2474,7 @@ msgstr "日付順"
 msgid ""
 "Check if the product should be weighted (mainly used with self check-out "
 "interface)."
-msgstr ""
+msgstr "製品の重量を測定する場合にチェックします(主にセルフチェックアウト・インターフェースで使用)。"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -2568,7 +2569,7 @@ msgstr "ビール"
 #. module: point_of_sale
 #: help:pos.config,name:0
 msgid "An internal identification of the point of sale"
-msgstr ""
+msgstr "販売時点の内部識別"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -2766,7 +2767,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:460
 #, python-format
 msgid "Custom Ean13"
-msgstr ""
+msgstr "カスタムEAN13"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3011,7 +3012,7 @@ msgstr "キャッシュレジスタを開く"
 #. module: point_of_sale
 #: field:account.journal,amount_authorized_diff:0
 msgid "Amount Authorized Difference"
-msgstr ""
+msgstr "公差額"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3055,7 +3056,7 @@ msgstr "ペプシ 330ml"
 msgid ""
 "Person who uses the the cash register. It can be a reliever, a student or an "
 "interim employee."
-msgstr ""
+msgstr "キャッシュレジスタの使用者。交代員や学生、臨時の従業員など。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
@@ -3217,7 +3218,7 @@ msgstr "終了日"
 msgid ""
 "The Point of Sale Category this products belongs to. Those categories are "
 "used to group similar products and are specific to the Point of Sale."
-msgstr ""
+msgstr "販売時点カテゴリは、この製品に属します。これらのカテゴリは類似する製品のグループに使用され、販売時点に固有のものです。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_1,5l_product_template
@@ -3389,7 +3390,7 @@ msgstr "ファンタ ゼロ オレンジ 330ml"
 #. module: point_of_sale
 #: help:product.product,available_in_pos:0
 msgid "Check if you want this product to appear in the Point of Sale"
-msgstr ""
+msgstr "この製品を販売時点で表示する場合はチェックします。"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -3493,7 +3494,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,pos_reference:0
 msgid "Receipt Ref"
-msgstr ""
+msgstr "レシート参照"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
@@ -3569,6 +3570,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                クリックして新しい注文を作成します。\n"
+"              </p><p>\n"
+"                "
+"進行中の注文は、このメニューで閲覧できます。新しい注文の記録には、タッチスクリーン・インターフェース向けの<i>自分のセッション</i>メニューを使用すべ"
+"きです。\n"
+"              </p>\n"
+"            "
 
 #. module: point_of_sale
 #. openerp-web
@@ -3867,6 +3876,8 @@ msgid ""
 "maximum is reached, the user will have an error message at the closing of "
 "his session saying that he needs to contact his manager."
 msgstr ""
+"このフィールドは、セッションを閉じる際の論理的な現金と終了残高の最大許容差を表します。最大値に達した場合は、管理者と連絡が必要なことをエラーメッセージで伝"
+"えます。"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 803947e2dc1..7847b5f71ff 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.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-03-31 21:08+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:24+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -43,6 +43,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att definiera en ny kategori.\n"
+"               </p><p>\n"
+"                 Kategorier används för att bläddra bland dina produkter på "
+"en\n"
+"                 pekskärm.\n"
+"               </p><p>\n"
+"                 Om du knyter ett foto till kategori, anpassas layouten för\n"
+"                 pekskärmsgränssnittet automatiskt. Vi föreslår att inte att "
+"välja\n"
+"                 foto på kategorierna vid användning av för små (1024x768) "
+"skärmar.\n"
+"               </p>\n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -80,13 +94,13 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:398
 #, python-format
 msgid "&atilde;"
-msgstr ""
+msgstr "&tilde;"
 
 #. module: point_of_sale
 #: field:pos.config,journal_id:0
 #: field:pos.order,sale_journal:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Försäljningsjournal"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -112,7 +126,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 493d36e7524..b4a134a77cd 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 17:05+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -41,7 +41,7 @@ msgstr "Related Menu"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -139,7 +139,7 @@ msgstr "Workflow Transitions"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "Senast ändrad av:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -151,7 +151,7 @@ msgstr "Action ID"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "Processvy"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -199,7 +199,7 @@ msgstr "Starting Transitions"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "Relaterad:"
 
 #. module: process
 #: view:process.node:0
@@ -215,14 +215,14 @@ msgstr "Notes"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "Ändra processen"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "Inte applicerbart"
 
 #. module: process
 #: view:process.process:0
@@ -254,7 +254,7 @@ msgstr "Action"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "Välj process"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -341,7 +341,7 @@ msgstr "Kind of Node"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "Underflöde"
 
 #. module: process
 #: view:process.node:0
@@ -354,7 +354,7 @@ msgstr "Outgoing Transitions"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "Anteckningar:"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -378,4 +378,4 @@ msgstr "Object Method"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "Välj"
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index 6614836964a..ffee875fe36 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.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: 2014-02-13 11:15+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2014-03-31 06:07+0000\n"
+"Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-02-14 07:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -557,7 +557,7 @@ msgstr "調達行"
 msgid ""
 "as it's a consumable (as a result of this, the quantity\n"
 "                           on hand may become negative)."
-msgstr ""
+msgstr "ことを考慮します(その結果、手元数量がマイナスになる場合もあります)。"
 
 #. module: procurement
 #: field:procurement.order,note:0
@@ -669,7 +669,7 @@ msgstr "例外"
 msgid ""
 "When you sell this product, a delivery order will be created.\n"
 "                           OpenERP will consider that the"
-msgstr ""
+msgstr "この製品を販売する場合、配送オーダーも作成されます。OpenERPは消耗品として"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:133
@@ -927,7 +927,7 @@ msgstr "調達方法は製品タイプに依存します。"
 #. module: procurement
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will"
-msgstr "この製品を販売する場合、OpenERPは配送のために利用可能在庫を使用します。"
+msgstr "この製品を販売する場合、OpenERPは"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 18d31a4e48f..3b3678652a4 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 17:09+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr ""
+msgstr "Katalogpris"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index c759a185ba3..430958bced1 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:00+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:29+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -82,7 +82,7 @@ msgstr "Idag"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Timeframe"
-msgstr ""
+msgstr "Tidsram"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
@@ -195,7 +195,7 @@ msgstr "project.gtd.timebox"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -225,7 +225,7 @@ msgstr "Tasks selection"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Display"
-msgstr ""
+msgstr "Visa"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
@@ -251,7 +251,7 @@ msgstr "Anger ordningsföljen vid listning av kontext"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -302,4 +302,4 @@ msgstr "För återstart av uppgiften"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "or"
-msgstr ""
+msgstr "eller"
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
index ab9f0d4d56e..29fef1b4167 100644
--- a/addons/project_issue_sheet/i18n/sv.po
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -8,20 +8,20 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 21:04+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
 #, python-format
 msgid "The Analytic Account is pending !"
-msgstr ""
+msgstr "Objektkontot avaktar granskning !"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -41,7 +41,7 @@ msgstr "Tidrapportrad"
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index e2661e7b1a3..592f9a1b4f7 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-30 12:27+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -44,6 +44,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Du kan inte ta bort ett företag som har tilldelats projekt, men du kan "
+"avmarkera  aktiv-rutan."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -56,6 +58,7 @@ msgstr "Projektaktivitetsarbete"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Du kan inte välja en objektkonto som är i stängt eller avbrutet läge."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -72,7 +75,7 @@ msgstr "oktober"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -90,11 +93,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att lägga till ett kundavtal.\n"
+"               </p><p>\n"
+"                 Här hittar du de avtal som rör din kundprojekt i syfte att "
+"spåra faktureringen.\n"
+"               </ p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Objektkonto/projekt"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -166,7 +176,7 @@ msgstr "Avtal att förnya"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -221,6 +231,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                 Här hittar du tidrapporter och inköp du gjorde för avtal "
+"som kan vidarefakturerats till kunden.\n"
+"                 Om du vill registrera nya jobb att fakturera, bör du "
+"använda tidrapportmenyn istället.\n"
+"               </ p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -282,6 +299,7 @@ msgstr "Ange hur mycket tid du förbrukade på din aktivitet"
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
 msgstr ""
+"Vänligen definiera anställd för användaren \"%s\". Du måste skapa en."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -344,7 +362,7 @@ msgstr "Arbete på aktiviteten"
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks"
-msgstr ""
+msgstr "Fakturera uppgifter"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
@@ -372,7 +390,7 @@ msgstr "Skapa en faktura när aktiviteten är avslutad"
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ogiltig åtgärd"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -387,6 +405,8 @@ msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Registrera dina tidrapporter för "
+"projekt '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index c40b5deaf2c..4526c59ee18 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.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-02-16 14:38+0000\n"
+"PO-Revision-Date: 2014-03-31 07:02+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-02-17 06:03+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -227,7 +227,7 @@ msgstr ""
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "この製品を販売する場合、OpenERPは調達先に必要な数量を購入するため"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1219,7 +1219,7 @@ msgid ""
 "                        The delivery order will be ready after having "
 "received the\n"
 "                        products."
-msgstr ""
+msgstr "をトリガします。配送オーダーは製品を受け取った後に準備完了となります。"
 
 #. module: purchase
 #: view:product.product:0
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 7b7f4831fb2..795c543c47c 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -8,24 +8,24 @@ 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-03-31 20:00+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
 msgid "Analytic Accounting for Purchases"
-msgstr ""
+msgstr "Objektredovisning för inköp"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: purchase
 #: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "Standardinköpslista"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tel :"
-msgstr ""
+msgstr "Tel :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -69,7 +69,7 @@ msgstr "Dag"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Avbryt order"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -79,7 +79,7 @@ msgstr "Dagens ordrar"
 #. module: purchase
 #: help:purchase.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -104,12 +104,14 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:1050
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfel!"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:589
@@ -133,7 +135,7 @@ msgstr "Standardpris Inköp"
 #: code:addons/purchase/purchase.py:1037
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr ""
+msgstr "Leverantör saknas för denna produkt !"
 
 #. module: purchase
 #: help:res.company,po_lead:0
@@ -181,24 +183,24 @@ msgstr "Leveransadress :"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Bekräfta order"
 
 #. module: purchase
 #: field:purchase.config.settings,module_warning:0
 msgid "Alerts by products or supplier"
-msgstr ""
+msgstr "Påminnelser via produkter eller leverantör"
 
 #. module: purchase
 #: field:purchase.order,name:0
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr "Order Reference"
+msgstr "Orderreferens"
 
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Faktureringsprocess"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -270,7 +272,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -280,7 +282,7 @@ msgstr "augusti"
 #. module: purchase
 #: view:product.product:0
 msgid "to"
-msgstr ""
+msgstr "till"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -296,7 +298,7 @@ msgstr "Inköpsorder"
 #: help:account.config.settings,group_analytic_account_for_purchases:0
 #: help:purchase.config.settings,group_analytic_account_for_purchases:0
 msgid "Allows you to specify an analytic account on purchase orders."
-msgstr ""
+msgstr "Tillåter dig att ange ett objektkonto på inköpsordrar."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -313,6 +315,18 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Klicka för att skapa ett fakturautkast.\n"
+"           </p><p>\n"
+"             Använd den här menyn för att kontrollera inkommande fakturor "
+"från dina\n"
+"             leverantörer. OpenERP genererar fakturautkast från din "
+"inköpsorder eller leveransmottagningar, enligt dina inställningar.\n"
+"           </p>\n"
+"             När du får en leverantörsfaktura kan du matcha den med\n"
+"             befintliga fakturautkast och validera den.\n"
+"           </p>\n"
+"        "
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -389,6 +403,14 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                     Klicka här för att registrera en leverantörsfaktura.\n"
+"                 </p><p>\n"
+"                     Leverantörsfakturor kan  pre-genereras baserat på "
+"inköpsorder eller leveransmottagningar. Detta gör att du kan kontrollera "
+"dina leverantörsfakturor med dokumentutkast i OpenERP.\n"
+"                 </p>\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
@@ -428,6 +450,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                 Här kan du spåra alla rader från inköpsorder där\n"
+"                 fakturering är \"Baserat på inköpsorderrader\", och som du\n"
+"                 har inte fått en leverantörsfaktura på ännu. Du kan "
+"generera ett\n"
+"                 utkast till leverantörsfakturan baserat på raderna från den "
+"här listan.\n"
+"               </ p>\n"
+"            "
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -437,7 +468,7 @@ msgstr "Planerat datum"
 #. module: purchase
 #: field:purchase.order,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: purchase
 #: field:purchase.order,journal_id:0
@@ -464,7 +495,7 @@ msgstr "Beställningar som inkluderar rader som inte är fakturerade."
 #: view:product.product:0
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Kan köpas"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -489,7 +520,7 @@ msgstr ""
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: purchase
 #: field:res.company,po_lead:0
@@ -515,7 +546,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -539,7 +570,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
-msgstr ""
+msgstr "Kundadress"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -596,12 +627,12 @@ msgstr "Preleminära inköpsorder"
 #. module: purchase
 #: view:product.product:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Leverantörer"
 
 #. module: purchase
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Att köpa"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po
index a553aab04b8..f331a20ba59 100644
--- a/addons/purchase_double_validation/i18n/sv.po
+++ b/addons/purchase_double_validation/i18n/sv.po
@@ -8,42 +8,42 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:33+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Inköpsordrar som inte är godkända ännu."
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "gräns att kräva ett andra godkännande"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Inköpsordrar i väntan på godkännande"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Att godkänna"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Belopp efter vilken granskning av inköpet krävs."
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index 371b4ffb62f..71e87639253 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-04-01 06:46+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -61,6 +61,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Definiera arbetstid och tidtabell som skall utgöra underlag "
+"för tidplaneringen för dina projektdeltagare.\n"
+"              </p>\n"
+"            "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -81,7 +86,7 @@ msgstr "Söndag"
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency Factor"
-msgstr ""
+msgstr "Effektivitetsfaktor"
 
 #. module: resource
 #: view:resource.resource:0
@@ -109,7 +114,7 @@ msgstr "Se till att arbetstid har konfigurerats med riktiga veckodagar!"
 #: code:addons/resource/resource.py:373
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -143,7 +148,7 @@ msgstr "Fredag"
 #. module: resource
 #: view:resource.calendar.attendance:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -169,12 +174,12 @@ msgstr "Sök arbetsperiodsfrånvaro"
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup Manager"
-msgstr ""
+msgstr "Gruppchef"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
@@ -215,7 +220,7 @@ msgstr "Arbetstid"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Start and End time of working."
-msgstr ""
+msgstr "Arbetstidens start och slut"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -306,6 +311,10 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficiency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Detta fält visar effektiviteten av resursen för att utföra uppgifter. t.ex. "
+"resurs sattes på en etapp i 5 dagar med 5 uppgifter som tilldelats honom, "
+"kommer att visa en 100% beläggning för denna etapp som standard, men om vi "
+"lägger en verkningsgrad på 200%, då kommer hans beläggning endast vara 50%."
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
@@ -349,7 +358,7 @@ msgstr "Mänsklig"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 592972259bf..9c1bdac80bb 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -8,19 +8,19 @@ 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-27 14:49+0000\n"
+"PO-Revision-Date: 2014-04-02 02:48+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-28 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order:0
@@ -36,7 +36,7 @@ msgstr "Försäljningsenhet"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Salesperson"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -59,7 +59,7 @@ msgstr "Avbryt order"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Felaktiga data"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
@@ -70,22 +70,22 @@ msgstr ""
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sales order line."
-msgstr ""
+msgstr "Tillåter rabatt per orderrad"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falskt"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Skatt"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -103,7 +103,7 @@ msgstr ""
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "Objekt"
+msgstr "Objektkonto"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -111,6 +111,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: sale
 #: view:sale.report:0
@@ -129,7 +131,7 @@ msgstr "Kundfakturor"
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -137,11 +139,14 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Gör det möjligt att hantera olika priser som baseras på regler per "
+"kundkategori.\n"
+"Exempel: 10% för återförsäljare, kampanj på 5 EUR för den här produkten, etc."
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sales order"
-msgstr ""
+msgstr "Invoice the whole sales order"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -151,12 +156,12 @@ msgstr "Standard betalningsvillkor"
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Tillåter användandet av flera mätenheter"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procentandel"
 
 #. module: sale
 #: report:sale.order:0
@@ -167,7 +172,7 @@ msgstr "Rab.(%)"
 #: code:addons/sale/sale.py:764
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Vänligen ange intäktskonto för denna produkt: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -178,7 +183,7 @@ msgstr "Totalt belopp"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr ""
+msgstr "Skapa fakturor baserat på kundorderrader"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -194,6 +199,10 @@ msgid ""
 "user-wise as well as month wise.\n"
 "                This installs the module account_analytic_analysis."
 msgstr ""
+"Implementerar funktioner (avtal) för tjänsteföretag i objektredovisningen.\n"
+"                 Du kan också se rapporten från objektredovisningen i "
+"sammanfattning per användare samt månadsvis.\n"
+"                 Detta installerar modulen account_analytic_analysis."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -217,17 +226,17 @@ msgstr "Övrig information"
 #: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Faktureringsprocessen"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Kundorder klar"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -239,7 +248,7 @@ msgstr "Offerter och order"
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "Tillåter val och underhåll av flera enheter på produkt."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -260,7 +269,7 @@ msgstr "Rabatt (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Skapa och visa faktura"
 
 #. module: sale
 #: view:board.board:0
@@ -271,12 +280,12 @@ msgstr "Mina offerter"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Tillåt automatiska larm knutna till kund och produkt"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr "Butiksnamn"
+msgstr "Namn på försäljningsställe"
 
 #. module: sale
 #: code:addons/sale/sale.py:598
@@ -302,23 +311,23 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Offert "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "Förskott %s %%"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_exception
 msgid "Sales in Exception"
-msgstr "Kundorder med fel"
+msgstr "Kundorder med undantag"
 
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "A partner to whom the particular product needs to be allotted."
 
 #. module: sale
 #: view:sale.order:0
@@ -332,12 +341,12 @@ msgstr "Status"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr "Augusti"
+msgstr "augusti"
 
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sales orders"
-msgstr ""
+msgstr "Utlös automatiska leveransorder från kundorder"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -352,7 +361,7 @@ msgstr "Kundorderns objektkonton."
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr "Oktober"
+msgstr "oktober"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders
@@ -368,6 +377,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en offert som kan omvandlas till en "
+"kundorder.\n"
+"                \n"
+"               </p><p>\n"
+"                 OpenERP hjälper dig att effektivt hantera hela "
+"försäljningsflödet:\n"
+"                 offert, kundorder, leverans, fakturering och betalning.\n"
+"               </p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order.line.make.invoice:0
@@ -381,19 +400,19 @@ msgstr ""
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Visa faktura"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "Förskott från %s %s"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_quotations
@@ -413,7 +432,7 @@ msgstr "Antal"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Leveransadress för aktuell kundorder."
 
 #. module: sale
 #: report:sale.order:0
@@ -423,17 +442,17 @@ msgstr "Moms :"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr ""
+msgstr "Aktivera fakturering kundorderrader"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr "September"
+msgstr "september"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Momshantering"
+msgstr "Skatteområde"
 
 #. module: sale
 #: help:sale.advance.payment.inv,advance_payment_method:0
@@ -462,7 +481,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Kundorderrader klara att fakturera"
 
 #. module: sale
 #: code:addons/sale/sale.py:308
@@ -487,12 +506,12 @@ msgstr "Fakturaadress för kundordern."
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "Före leverans"
 
 #. module: sale
 #: code:addons/sale/sale.py:781
@@ -505,7 +524,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract / Analytic"
-msgstr ""
+msgstr "Avtal / objektkonto"
 
 #. module: sale
 #: view:sale.report:0
@@ -524,13 +543,13 @@ msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag.
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_sent
 #: model:mail.message.subtype,name:sale.mt_order_sent
 msgid "Quotation sent"
-msgstr ""
+msgstr "Offert skickad"
 
 #. module: sale
 #: field:sale.order,invoice_exists:0
@@ -557,12 +576,12 @@ msgstr "Andelsföretag"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 msgid "Invoice Order"
-msgstr ""
+msgstr "Fakturera order"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -572,7 +591,7 @@ msgstr "Den totala summan."
 #. module: sale
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
+msgstr "Tillåt batchfakturering av leveransorder via journal"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -587,12 +606,12 @@ msgstr "Fakturaadress :"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "Enhet "
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "Standard tidsenhet för tjänster är"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -607,18 +626,18 @@ msgstr "Orderrader med anknytning till mina kundorder"
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "Quotation / Order"
+msgstr "Offert / Order"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "rader"
+msgstr "# av rader"
 
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(update)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -628,12 +647,12 @@ msgstr "Orderrad"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "En och samma anställd kan ha olika roller per avtal"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "Utskrift"
 
 #. module: sale
 #: report:sale.order:0
@@ -649,7 +668,7 @@ msgstr "Kundorderrader"
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Använd flera objektkonton på kundorder"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -668,7 +687,7 @@ msgstr "Skapad datum"
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sales Orders"
-msgstr ""
+msgstr "Adresser på kundorder"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -683,7 +702,7 @@ msgstr "Totalt:"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr "Min försäljning"
+msgstr "Mina kundordrar"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -710,7 +729,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "Globalt intäktskonto saknas."
 
 #. module: sale
 #: code:addons/sale/sale.py:960
@@ -718,17 +737,17 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfel!"
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr ""
+msgstr "Detta inderar att kundordern har minst en faktura."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Skickat med e-post"
 
 #. module: sale
 #: code:addons/sale/res_config.py:97
@@ -749,17 +768,17 @@ msgstr "Levererad"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "Skapa och visa faktura"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr "Quotation Date"
+msgstr "Offertdatum"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: sale
 #: code:addons/sale/sale.py:942
@@ -781,7 +800,7 @@ msgstr "Produktkategori"
 #: code:addons/sale/sale.py:564
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Kan inte avbryta denna kundorder!"
 
 #. module: sale
 #: view:sale.order:0
@@ -813,6 +832,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en offert eller kundorder för denna "
+"kund.\n"
+"               </p><p>\n"
+"                 OpenERP hjälper dig att effektivt hantera hela "
+"försäljningsflödet:\n"
+"                 offert, kundorder, leverans, fakturering och\n"
+"                 betalning.\n"
+"               </p>\n"
+"                 Den sociala funktionen hjälper dig att organisera "
+"diskussioner om varje försäljning\n"
+"                 beställa, och låta din kund att hålla reda på utvecklingen\n"
+"                 av kundorder.\n"
+"               </ p>\n"
+"            "
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders
@@ -824,7 +858,7 @@ msgstr "Kundorder"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "På begäran"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -839,11 +873,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att definiera ett nytt försäljningsställe.\n"
+"               </p><p>\n"
+"                 Varje offert eller försäljningsorder måste kopplas till ett "
+"försäljningsställe. Försäljningsstället\n"
+"                 definierar också lagret som produkterna påverkar vid varje "
+"enskild försäljningstransaktion.\n"
+"               </p>\n"
+"            "
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -864,7 +907,7 @@ msgstr "Undantag"
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr "Butik"
+msgstr "Försäljningsställe"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -892,7 +935,7 @@ msgstr "Ingen korrekt prislista funnen!:"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Visa marginaler på kundordern"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -969,6 +1012,8 @@ msgid ""
 "${object.company_id.name} ${object.state in ('draft', 'sent') and "
 "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: report:sale.order:0
@@ -978,7 +1023,7 @@ msgstr "Pris"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "Offertnummer"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -999,6 +1044,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att skapa en offert, det första steget i en ny "
+"kundorder.\n"
+"               </p><p>\n"
+"                 OpenERP hjälper dig att hantera effektivt hela "
+"försäljningsflödet:\n"
+"                 från offert till kundordern,\n"
+"                 leveransen, fakturering och betalningsflödet.\n"
+"               </p><p>\n"
+"                 Den sociala funktionen hjälper dig att organisera "
+"diskussioner om varje kundorder, och låta dina kunder att övervaka  "
+"utvecklingen  av kundordern.\n"
+"               </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1013,33 +1072,33 @@ msgstr "Leveransadress :"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr "Utkast status"
+msgstr "Kundorder i utkast"
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelanden och kommunikationshistorik"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Ny kopia av offert"
 
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "# kundorder"
 
 #. module: sale
 #: code:addons/sale/sale.py:983
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Kan inte rader orderrader som är i läget '%s'."
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
 msgid "Properties on lines"
-msgstr ""
+msgstr "Egenskaper på rader"
 
 #. module: sale
 #: code:addons/sale/sale.py:865
@@ -1048,6 +1107,8 @@ msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
 msgstr ""
+"Innan val av produkt\n"
+" välj en kund i orderforumläret."
 
 #. module: sale
 #: view:sale.order:0
@@ -1058,7 +1119,7 @@ msgstr "Inklusive moms"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "You cannot create invoice when sales order is not confirmed."
-msgstr ""
+msgstr "Du kan inte skapa faktura innan ordern är bekräftad."
 
 #. module: sale
 #: view:sale.report:0
@@ -1074,7 +1135,7 @@ msgstr "Godkänn offert"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Orderrader att fakturera"
 
 #. module: sale
 #: view:sale.order:0
@@ -1086,7 +1147,7 @@ msgstr "Gruppera på..."
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "Produktfunktioner"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1098,7 +1159,7 @@ msgstr "Schemalagd väntan"
 #: view:sale.order.line:0
 #: field:sale.report,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1109,17 +1170,17 @@ msgstr "Anskaffningsmetod"
 #: view:sale.order:0
 #: field:sale.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_confirmed
 msgid "Quotation confirmed"
-msgstr ""
+msgstr "Bekräftade offerter"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr ""
+msgstr "Offerter i utkast"
 
 #. module: sale
 #: field:sale.order,amount_tax:0
@@ -1152,7 +1213,7 @@ msgstr "Datum då kundordern skapades."
 #. module: sale
 #: view:sale.order:0
 msgid "Terms and conditions..."
-msgstr ""
+msgstr "Villkor..."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1166,7 +1227,7 @@ msgstr "Skapa fakturor"
 #: code:addons/sale/sale.py:983
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Felaktig åtgärd!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1176,7 +1237,7 @@ msgstr "Fax :"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr "Förskott Belopp"
+msgstr "Förskotterat belopp"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1195,6 +1256,9 @@ msgid ""
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
 msgstr ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1205,7 +1269,7 @@ msgstr "Skapa fakturor"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
-msgstr ""
+msgstr "Tillåter angivande av objektkonto på kundorder"
 
 #. module: sale
 #: view:sale.order:0
@@ -1221,7 +1285,7 @@ msgstr "Kundorder innevarande år"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr "Juli"
+msgstr "juli"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -1233,7 +1297,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Cancel Quotation"
-msgstr ""
+msgstr "Avbryt offert"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1249,7 +1313,7 @@ msgstr "Gruppera fakturorna"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "Avtalsadministration"
 
 #. module: sale
 #: view:sale.report:0
@@ -1260,12 +1324,12 @@ msgstr "Månad"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr "Skall granskas av revisorn."
+msgstr "Skall granskas av bokföraren."
 
 #. module: sale
 #: view:sale.order:0
 msgid "My Sales Orders"
-msgstr ""
+msgstr "Mina kundorder"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1316,23 +1380,23 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr ""
+msgstr "Tillåter rabatt per orderrad"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url"
 
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Använd prislistor för kundanpassade priser"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
 #, python-format
 msgid "There is no default shop for the current user's company!"
-msgstr ""
+msgstr "Standardförsäljningsställe saknas för användarens bolag!"
 
 #. module: sale
 #: code:addons/sale/sale.py:277
@@ -1359,6 +1423,10 @@ msgid ""
 "between the Unit Price and Cost Price.\n"
 "                This installs the module sale_margin."
 msgstr ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 
 #. module: sale
 #: report:sale.order:0
@@ -1397,7 +1465,7 @@ msgstr "Att göra"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr ""
+msgstr "Fakturera kundorder"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1516,6 +1584,12 @@ msgid ""
 "Before delivery: A draft invoice is created from the sales order and must be "
 "paid before the products can be delivered."
 msgstr ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1532,7 +1606,7 @@ msgstr "Fakturera utgående från"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "Fast pris (förbetalat)"
 
 #. module: sale
 #: report:sale.order:0
@@ -1542,7 +1616,7 @@ msgstr "Orderdatum"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr "Produkt"
+msgstr "Produkt (försäljningsenhet)"
 
 #. module: sale
 #: selection:sale.report,state:0
@@ -1557,7 +1631,7 @@ msgstr "Order"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "Bekräfta kundorder"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1584,17 +1658,17 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Some order lines"
-msgstr ""
+msgstr "Några orderrader"
 
 #. module: sale
 #: view:res.partner:0
 msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
 
 #. module: sale
 #: model:res.groups,name:sale.group_discount_per_so_line
 msgid "Discount on lines"
-msgstr ""
+msgstr "Rabatt på rader"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1614,16 +1688,19 @@ msgid ""
 "                        will create a draft invoice that can be modified\n"
 "                        before validation."
 msgstr ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
 
 #. module: sale
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr "Kundorder infopanel"
+msgstr "Anslagstavla för kundorder"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Kundorderrader som är 'klara'"
 
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
@@ -1637,6 +1714,14 @@ msgid ""
 "invoice automatically.\n"
 "            It installs the account_analytic_analysis module."
 msgstr ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 
 #. module: sale
 #: model:email.template,report_name:sale.email_template_edi_sale
@@ -1644,6 +1729,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1654,7 +1741,7 @@ msgstr "Datum när kundordern är bekräftad."
 #: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Börja med att avbryta alla fakturor knutna till denna kundorder."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1663,7 +1750,7 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
@@ -1690,32 +1777,32 @@ msgstr "No Customer Defined !"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Leveransadress"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Sale to Invoice"
-msgstr ""
+msgstr "Kundorder att fakturera"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
-msgstr ""
+msgstr "Lagerstyrningsfunktioner"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Cancel Line"
-msgstr ""
+msgstr "Avbryt rad"
 
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
@@ -1726,12 +1813,12 @@ msgstr ""
 #: code:addons/sale/sale.py:780
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Netto total:"
+msgstr "Nettototal:"
 
 #. module: sale
 #: help:sale.order.line,type:0
@@ -1740,28 +1827,31 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Cancelled"
+msgstr "Avbruten"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr "Sök ej fakturerade rader"
+msgstr "Sök icke fakturerade rader"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr ""
+msgstr "Offert skickad"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-postredigeringsguide"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1769,23 +1859,23 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
-msgstr "Butik"
+msgstr "Försäljningsställe"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr "Bekräfta Datum"
+msgstr "Bekräfta datum"
 
 #. module: sale
 #: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Vänligen ange försäljningsjournal för detta bolag: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contract Features"
-msgstr ""
+msgstr "Avtalsfunktioner"
 
 #. module: sale
 #: code:addons/sale/sale.py:287
@@ -1804,7 +1894,7 @@ msgstr "Kundorder"
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr "Antal"
+msgstr "Antal (försäljningeenhet)"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1814,7 +1904,7 @@ msgstr "Bekräftad"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1825,12 +1915,12 @@ msgstr "Bekräfta"
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
-msgstr ""
+msgstr "Du kan inte avbryta en kundorderrad som redan är fakturerad."
 
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: sale
 #: field:sale.order.line,invoice_lines:0
@@ -1847,17 +1937,17 @@ msgstr "Kundorderrader"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "Standardalternativ"
 
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "Objektredovisning för kundorder"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 msgid "Invoiced Ratio"
-msgstr ""
+msgstr "Faktureringsratio"
 
 #. module: sale
 #: code:addons/sale/edi/sale_order.py:140
@@ -1868,17 +1958,17 @@ msgstr "EDI-prislista (%s)"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "På leveransorder"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Referensenhet"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales order lines done"
-msgstr ""
+msgstr "Klara kundorderrader"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:107
@@ -1906,13 +1996,13 @@ msgstr "Fakturor"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr "December"
+msgstr "december"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:96
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Intäktskonto saknas för denna produkt: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1922,7 +2012,7 @@ msgstr "Ofakturerad"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr "Gamla offerters"
+msgstr "Gamla offerter"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -1932,33 +2022,33 @@ msgstr "Belopp ex. moms"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Objektredovisning för kundorder"
 
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Öppna kundordermenyn"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr "Juni"
+msgstr "juni"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "You shouldn't manually invoice the following sale order %s"
-msgstr ""
+msgstr "Du bör ej fakturerar följande kundorder %s manuellt"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr "Utdrag"
+msgstr "Utkast"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr "Momsen."
+msgstr "Andelen moms."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
@@ -1971,6 +2061,8 @@ msgid ""
 "To allow your salesman to make invoices for sales order lines using the menu "
 "'Lines to Invoice'."
 msgstr ""
+"Om du vill att dina säljare att göra fakturor från kundorderrader med hjälp "
+"av menyn 'Rader att fakturera'."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1978,11 +2070,13 @@ msgid ""
 "Sales Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Bekräftade kundorderrader, klara eller i undantagstillstånd och ännu ej "
+"fakturerade"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr "November"
+msgstr "november"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1992,12 +2086,12 @@ msgstr "Avancerad produkt"
 #. module: sale
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
+msgstr "Ger ordningsföljden när raderna på en order visas."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr "Januari"
+msgstr "januari"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_in_progress
@@ -2007,7 +2101,7 @@ msgstr "Pågående kundorder"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "Lägg till rapporterad tid på fakturan"
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2024,12 +2118,12 @@ msgstr "Engagemangsfördröjning"
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order Status"
-msgstr ""
+msgstr "Orderstatus"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "Visa rader att fakturera"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2044,7 +2138,7 @@ msgstr "Bekräftade kundorder att fakturera"
 #. module: sale
 #: model:mail.message.subtype,name:sale.mt_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Sales Order Confirmed"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -2060,12 +2154,12 @@ msgstr "Ingen prislista !: "
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order "
-msgstr ""
+msgstr "Kundorder "
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
-msgstr ""
+msgstr "Använd avtalshantering"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2081,7 +2175,7 @@ msgstr "Beskrivning"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr "Maj"
+msgstr "maj"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -2091,7 +2185,7 @@ msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
-msgstr ""
+msgstr "Ordernummer"
 
 #. module: sale
 #: view:sale.order:0
@@ -2108,12 +2202,12 @@ msgstr "Förskott"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr "Februari"
+msgstr "februari"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr "April"
+msgstr "april"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -2123,6 +2217,8 @@ msgid ""
 "with\n"
 "                        your customer."
 msgstr ""
+"Använd avtal för att kunna hantera dina tjänster med                         "
+"löpande fakturering som en del av samma avtal med din kund."
 
 #. module: sale
 #: view:sale.order:0
@@ -2133,17 +2229,17 @@ msgstr "Sök kundorder"
 #. module: sale
 #: field:sale.advance.payment.inv,advance_payment_method:0
 msgid "What do you want to invoice?"
-msgstr ""
+msgstr "Vad önskar du fakturera?"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sales order lines, not yet delivered"
-msgstr ""
+msgstr "Bekräftar kundorderrader. ej ännu levererade"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence"
-msgstr "Sekvens"
+msgstr "Nummerserie"
 
 #. module: sale
 #: report:sale.order:0
@@ -2154,7 +2250,7 @@ msgstr "Betalningsvillkor"
 #. module: sale
 #: help:account.config.settings,module_sale_analytic_plans:0
 msgid "This allows install module sale_analytic_plans."
-msgstr ""
+msgstr "Detta tillåter installation av modulen sale_analytic_plans."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2186,3 +2282,11 @@ msgstr "Plockad"
 #: field:sale.report,year:0
 msgid "Year"
 msgstr "År"
+
+#~ msgid ""
+#~ "In order to delete a confirmed sales order, you must cancel it before!"
+#~ msgstr ""
+#~ "In order to delete a confirmed sales order, you must cancel it before!"
+
+#~ msgid "No Customer Defined!"
+#~ msgstr "Kund saknas!"
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index 62aedeae231..6b616132401 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:31+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -25,7 +25,7 @@ msgstr "Objektfördelning"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Kundorder"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index 3e082219548..bdb334a7f34 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/i18n/sv.po
@@ -8,46 +8,46 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:39+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Otillräcklig data!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:113
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "Affärsmöjlighet har <b>omvandlats</b> till offerten <em>%s</em>."
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Kundämnen/affärsmöjligheter"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Fakturastatistik"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Märk vinst"
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
 msgid "Default Sales Team"
-msgstr ""
+msgstr "Standardsäljlaget"
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -57,23 +57,24 @@ msgstr "Mina säljteam"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sales order."
 msgstr ""
+"Kryssa här för att stänga affärsmöjligheten efter att ha skapat kundordern."
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
 msgid "Quotation Send"
-msgstr ""
+msgstr "Offert skickad"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:127
@@ -100,7 +101,7 @@ msgstr "Skapa försäljning"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:95
@@ -123,12 +124,12 @@ msgstr "Butik"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Adressuppgifter saknas för denna kund."
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Kundorder bekräftad"
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -142,7 +143,7 @@ msgstr "Säljteam"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Skapa offert"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -162,4 +163,4 @@ msgstr "Kundorder"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "eller"
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index eacbe890a18..5368fa81e4e 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2014-03-31 20:36+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -31,6 +31,8 @@ msgstr "Faktureringstyp"
 msgid ""
 "This invoicing type will be used, by default, to invoice the current partner."
 msgstr ""
+"Denna faktureringstyp kommer att användas som standard för att fakturera det "
+"aktuella företaget."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -45,7 +47,7 @@ msgstr "Fakturering"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Inkommande leveranser"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -101,7 +103,7 @@ msgstr ""
 #. module: sale_journal
 #: help:sale.order,invoice_type_id:0
 msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Skapa fakturor baserat på valda alternativ."
 
 #. module: sale_journal
 #: view:sale.order:0
@@ -135,4 +137,4 @@ msgstr "Kundorder"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Leveransorder"
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
index c1e10227fb6..1f51b3defff 100644
--- a/addons/sale_margin/i18n/sv.po
+++ b/addons/sale_margin/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:30+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -44,3 +44,5 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
 msgstr ""
+"Beräknar lönsamhet genom skillnaden mellan enhetspris och "
+"självkostnadspriset."
diff --git a/addons/sale_stock/i18n/sv.po b/addons/sale_stock/i18n/sv.po
index ffb05e1e6df..036a3e90704 100644
--- a/addons/sale_stock/i18n/sv.po
+++ b/addons/sale_stock/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:29+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -33,7 +33,7 @@ msgstr "Leveransorder"
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Leveranser att fakturera"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:570
@@ -79,7 +79,7 @@ msgstr "Validera"
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Avbryt order"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:209
@@ -131,12 +131,12 @@ msgstr "Lagertransaktion"
 #: code:addons/sale_stock/sale_stock.py:163
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ogiltig åtgärd!"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_project_timesheet:0
 msgid "Project Timesheet"
-msgstr ""
+msgstr "Projekt tidrapport"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
@@ -148,7 +148,7 @@ msgstr ""
 #: code:addons/sale_stock/sale_stock.py:623
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfel!"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_saleprocurement0
@@ -158,7 +158,7 @@ msgstr "Inköpsorder"
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children
 msgid "Contact Details"
-msgstr ""
+msgstr "Kontaktuppgifter"
 
 #. module: sale_stock
 #: selection:sale.config.settings,default_order_policy:0
@@ -174,7 +174,7 @@ msgstr "Kundorder"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_order_line
@@ -288,22 +288,22 @@ msgstr ""
 #. module: sale_stock
 #: help:sale.config.settings,group_mrp_properties:0
 msgid "Allows you to tag sales order lines with properties."
-msgstr ""
+msgstr "Tillåter märkning av kundorderrader med egenskaper"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
-msgstr ""
+msgstr "Skapa fakturor ned leveransorder som underlag"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
-msgstr ""
+msgstr "Tillåter att lägga till transportkostnader"
 
 #. module: sale_stock
 #: view:sale.order:0
 msgid "days"
-msgstr ""
+msgstr "dagar"
 
 #. module: sale_stock
 #: field:sale.order.line,product_packaging:0
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index ef719dd5117..5e5ef8c7e4c 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.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-08 03:50+0000\n"
-"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
+"PO-Revision-Date: 2014-03-31 08:44+0000\n"
+"Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@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-09 06:03+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1933,7 +1933,7 @@ msgstr "現在の在庫"
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by manufacturing orders."
-msgstr ""
+msgstr "この在庫場所は、製造オーダーで生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。"
 
 #. module: stock
 #: help:stock.move,date_expected:0
@@ -3370,7 +3370,7 @@ msgstr "全体処理"
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by procurements."
-msgstr ""
+msgstr "この在庫場所は、調達で生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
@@ -4898,7 +4898,7 @@ msgstr "連鎖移動を含む集荷リストの出荷タイプ（元の場所と
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated when you do an inventory."
-msgstr ""
+msgstr "この在庫場所は、棚卸しの実行で生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。"
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 111173c7ead..fad13a46836 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:11+0000\n"
+"Last-Translator: Peter Jildén <multiadventure@gmail.com>\n"
 "Language-Team: Swedish <sv@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-02-07 07:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1563,7 +1563,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Ready"
-msgstr "Klar"
+msgstr "Redo"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -2494,7 +2494,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sätt till utkast"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index ac0bbd6899f..afdd99135c5 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-05 10:43+0000\n"
-"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
+"PO-Revision-Date: 2014-03-30 09:58+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\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-03-31 06:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -2746,6 +2746,8 @@ msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
 "rounding of \"%s %s\" is accepted by the Unit of Measure."
 msgstr ""
+"Ölçü birimini yuvarlamanız \"%s %s\" sevkiyatına izin vermez, yuvarlama "
+"yalnızca \"%s %s\" in ölçü birimince kabul edilmesini sağlar."
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -4236,6 +4238,7 @@ msgstr "Bu alım listesi faturalandırma gerektirmez."
 msgid ""
 "You have manually created product lines, please delete them to proceed"
 msgstr ""
+"El ile ürün kalemleri oluşturdunuz, ilerlemek için lütfen onları silin"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 159393f02d8..a4cdb73814d 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.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-03-19 10:41+0000\n"
+"PO-Revision-Date: 2014-03-30 12:01+0000\n"
 "Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-20 06:19+0000\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:40+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: stock
@@ -4150,7 +4150,7 @@ msgstr "例如10進位精準度為2將允許重量如9.99公斤，而10進位精
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "總出庫數量"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
@@ -4158,12 +4158,12 @@ msgstr ""
 #: field:stock.picking.in,backorder_id:0
 #: field:stock.picking.out,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "延期交貨清單 -"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "動作追溯性 "
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0
@@ -4183,7 +4183,7 @@ msgstr "產品分類"
 #. module: stock
 #: view:stock.move:0
 msgid "Serial  Number"
-msgstr ""
+msgstr "序號"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4193,7 +4193,7 @@ msgstr "開立發票"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "確認內部調動"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -4203,7 +4203,7 @@ msgstr "配置"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "管理多個倉位與倉庫"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4228,11 +4228,14 @@ msgid ""
 "                to be invoiced when you send or deliver goods.\n"
 "                This installs the module stock_invoice_directly."
 msgstr ""
+"如果設為寄出或交付貨物時開立發票時，允許自動執行開立發票精靈。\n"
+"                to be invoiced when you send or deliver goods.\n"
+"                這將安裝  stock_invoice_directly 模組。"
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "連鎖倉位日記帳"
 
 #. module: stock
 #: code:addons/stock/stock.py:782
@@ -4278,7 +4281,7 @@ msgstr "未來交貨"
 #: field:stock.move,tracking_id:0
 #: view:stock.tracking:0
 msgid "Pack"
-msgstr ""
+msgstr "包裹"
 
 #. module: stock
 #: view:stock.move:0
@@ -4294,7 +4297,7 @@ msgstr "自動檢驗"
 #: code:addons/stock/stock.py:1850
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "該序號的庫存不足！"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4328,7 +4331,7 @@ msgstr "退貨"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "審核盤點結果"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -4340,19 +4343,19 @@ msgstr ""
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "唯一序號將顯示為 前綴字元/序號 [整數參考號]"
 
 #. module: stock
 #: code:addons/stock/product.py:142
 #, python-format
 msgid "Please define stock input account for this product: \"%s\" (id: %d)."
-msgstr ""
+msgstr "請定義入庫會計科目給這個產品：「%s」（id: %d）。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 msgid "Incoming  Products"
-msgstr ""
+msgstr "入庫產品"
 
 #. module: stock
 #: view:product.product:0
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index ca1dc7af2af..a3f79a2af3d 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -8,16 +8,16 @@ 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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:41+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:37+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr "Delvis plockguide"
+msgstr "Guide för ofullständig plockningsprocess"
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index f5e7a86bdd7..ad55966ee6f 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/i18n/sv.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: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-31 20:24+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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:37+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -67,13 +67,13 @@ msgstr "Veckor"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Återkommande händelser"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -85,7 +85,7 @@ msgstr "Prenumerationer"
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr ""
+msgstr "Antalsintervall"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -135,6 +135,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"Om det aktiva fältet är satt till False, kommer det att du kan dölja "
+"prenumerationsdokumentet utan att ta bort det."
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -146,7 +148,7 @@ msgstr "Namn"
 #: code:addons/subscription/subscription.py:147
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "Du kan inte radera en aktiv prenumeration !"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -174,7 +176,7 @@ msgstr "Dagar"
 #: code:addons/subscription/subscription.py:147
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -197,24 +199,24 @@ msgstr "Partner"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Scheduler som körs på abonnemang"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr ""
+msgstr "Prenumerationsdata"
 
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Beskrivning eller sammanfattning av prenumeration"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr ""
+msgstr "Prenumerationsdokument"
 
 #. module: subscription
 #: help:subscription.subscription,active:0
@@ -222,11 +224,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Om det aktiva fältet är satt till False, kommer det att du kan dölja "
+"prenumerationen utan att ta bort den."
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
-msgstr ""
+msgstr "Standardvärde övervägs för fältet när nya dokument genereras."
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -247,7 +251,7 @@ msgstr "Behandla"
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
-msgstr ""
+msgstr "Användaren kan välja källdokument för de genererade dokumenten"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
@@ -259,13 +263,13 @@ msgstr "Dokumenttyper"
 #: code:addons/subscription/subscription.py:120
 #, python-format
 msgid "Wrong Source Document !"
-msgstr ""
+msgstr "Fel källdokument!"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr ""
+msgstr "Prenumeration dokumentfält"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -279,17 +283,19 @@ msgid ""
 "Please provide another source document.\n"
 "This one does not exist !"
 msgstr ""
+"Ange en annan källdokumentet.\n"
+"Detta saknas!"
 
 #. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Standardvärde"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,doc_lines:0
 msgid "Documents created"
-msgstr ""
+msgstr "Dokument skapat"
 
 #. module: subscription
 #: field:subscription.document,active:0
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 61ace31da26..2909c4ad06e 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2014-03-31 20:26+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -25,7 +25,7 @@ msgstr "Inköpsorderrad"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Inkommande leveranser"
 
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
@@ -139,7 +139,7 @@ msgstr "Var uppmärksam på %s !"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sales Order"
-msgstr ""
+msgstr "Varning på kundordern"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -149,7 +149,7 @@ msgstr "Meddelande för faktura"
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sales Order"
-msgstr ""
+msgstr "Meddelande för kundorder"
 
 #. module: warning
 #: view:res.partner:0
@@ -177,7 +177,7 @@ msgstr "Varning för %s"
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sales Order Line"
-msgstr ""
+msgstr "Meddelande för kundorderrad"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,7 +208,7 @@ msgstr "Kundorder"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
diff --git a/addons/web_linkedin/i18n/sv.po b/addons/web_linkedin/i18n/sv.po
new file mode 100644
index 00000000000..a465b52c69b
--- /dev/null
+++ b/addons/web_linkedin/i18n/sv.po
@@ -0,0 +1,152 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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: 2014-03-31 20:16+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"Language-Team: Swedish <sv@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-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:263
+#, python-format
+msgid "LinkedIn search"
+msgstr "Linkedinsökning"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "Programmeringshjälpmedlet är Javascript"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:34
+#, python-format
+msgid ""
+"Please ask your administrator to configure it in Settings > Configuration > "
+"Sales > Social Network Integration."
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:35
+#, python-format
+msgid "LinkedIn:"
+msgstr "LinkedIn:"
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "API-nyckel"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr ""
+"För att använda Linkedin-modulen med denna databas krävs en API-nyckel. Följ "
+"denna procedur:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:60
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn är inte aktiverad"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "API nyckel"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:331
+#, python-format
+msgid "No results found"
+msgstr "Inga resultat hittades"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:62
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr "Logga in på LinkedIn"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript API Domän:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "Gå till denna URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr "här:"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "Personer"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "Kopiera"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:33
+#, python-format
+msgid "LinkedIn access was not enabled on this server."
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr ""

From 5fb77bd6c5116529e619d650feafa52e0714f68b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 2 Apr 2014 10:29:54 +0200
Subject: [PATCH 157/175] [IMP] hr_payroll: ensure localdict is not shared
 between contracts

bzr revid: mat@openerp.com-20140402082954-05zzk1k3ued4go5a
---
 addons/hr_payroll/hr_payroll.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index cc94ac4d5db..67fb89ebcf5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -578,7 +578,7 @@ class hr_payslip(osv.osv):
         payslip_obj = Payslips(self.pool, cr, uid, payslip.employee_id.id, payslip)
         rules_obj = BrowsableObject(self.pool, cr, uid, payslip.employee_id.id, rules)
 
-        localdict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
+        baselocaldict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -588,7 +588,7 @@ class hr_payslip(osv.osv):
 
         for contract in self.pool.get('hr.contract').browse(cr, uid, contract_ids, context=context):
             employee = contract.employee_id
-            localdict.update({'employee': employee, 'contract': contract})
+            localdict = dict(baselocaldict, employee=employee, contract=contract)
             for rule in obj_rule.browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None

From e8775beded96d4038873df180d2c0ffdd63e2c0e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 2 Apr 2014 10:37:13 +0200
Subject: [PATCH 158/175] [FIX] account_voucher: it is authorized to enter
 invoice with negative amount, therefore the check amount constraint must take
 that into account

bzr revid: dle@openerp.com-20140402083713-tayk4r76bmrp9luf
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ff4200ace11..63c8ac5bbf3 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1683,7 +1683,7 @@ class account_bank_statement_line(osv.osv):
     def _check_amount(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
-                diff = abs(obj.amount) - obj.voucher_id.amount
+                diff = abs(obj.amount) - abs(obj.voucher_id.amount)
                 if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff):
                     return False
         return True

From ccc0820348fa3d2ed8b8d7e39e86d14ccd33b44f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 2 Apr 2014 11:05:37 +0200
Subject: [PATCH 159/175] [FIX] account_report_company: missing index on
 `display_name`

bzr revid: odo@openerp.com-20140402090537-aozassn5in2qgd92
---
 addons/account_report_company/account_report_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 6247ca26806..6915657ba84 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -40,7 +40,7 @@ class res_partner(osv.Model):
 
     _columns = {
         # extra field to allow ORDER BY to match visible names
-        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers, select=1),
     }
 
 class account_invoice(osv.Model):

From 4fe43d9ac6fef20576427b94c6f79a97cc2e4a62 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 2 Apr 2014 13:07:00 +0200
Subject: [PATCH 160/175] [FIX] project,project_issue: missing indexes on
 stage/state/project_id/user_id

bzr revid: odo@openerp.com-20140402110700-h3ryoroibj1m92ig
---
 addons/project/project.py             | 8 ++++----
 addons/project_issue/project_issue.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 623a0809b96..f62774fc107 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -766,10 +766,10 @@ class task(base_stage, osv.osv):
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
-        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
+        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True,
                         domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
+                selection=_TASK_STATE, string="Status", readonly=True, select=True,
                 help='The status is set to \'Draft\', when a case is created.\
                       If the case is in progress the status is set to \'Open\'.\
                       When the case is over, the status is set to \'Done\'.\
@@ -788,7 +788,7 @@ class task(base_stage, osv.osv):
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1", track_visibility='onchange'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select=True, track_visibility='onchange'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
@@ -814,7 +814,7 @@ class task(base_stage, osv.osv):
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'user_id': fields.many2one('res.users', 'Assigned to', track_visibility='onchange'),
+        'user_id': fields.many2one('res.users', 'Assigned to', select=True, track_visibility='onchange'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index da28c17d74c..20a61657e20 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -259,7 +259,7 @@ class project_issue(base_stage, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Private Note'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
+                selection=_TASK_STATE, string="Status", readonly=True, select=True,
                 help='The status is set to \'Draft\', when a case is created.\
                       If the case is in progress the status is set to \'Open\'.\
                       When the case is over, the status is set to \'Done\'.\
@@ -283,9 +283,9 @@ class project_issue(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        track_visibility='onchange',
+                        track_visibility='onchange', select=True,
                         domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
-        'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'),
+        'project_id': fields.many2one('project.project', 'Project', track_visibility='onchange', select=True),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
         'day_open': fields.function(_compute_day, string='Days to Open', \

From 19993ab1d56bbb1ffa70662cc2577edc7e0815a6 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 2 Apr 2014 13:27:30 +0200
Subject: [PATCH 161/175] [FIX] expression: translated search as params are
 flatten, we need to expand "%s" placeholders when using the `in` operator

bzr revid: chs@openerp.com-20140402112730-eoqxt0pu7lvcq5yg
---
 openerp/addons/base/tests/test_expression.py | 13 ++++++++++
 openerp/osv/expression.py                    | 26 +++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/tests/test_expression.py b/openerp/addons/base/tests/test_expression.py
index 4f533a5e170..9c0cd01cb5a 100644
--- a/openerp/addons/base/tests/test_expression.py
+++ b/openerp/addons/base/tests/test_expression.py
@@ -439,5 +439,18 @@ class test_expression(common.TransactionCase):
         partner_parent_id_col._auto_join = False
         state_country_id_col._auto_join = False
 
+    def test_translate_search(self):
+        Country = self.registry('res.country')
+        be = self.ref('base.be')
+        domains = [
+            [('name', '=', 'Belgium')],
+            [('name', 'ilike', 'Belgi')],
+            [('name', 'in', ['Belgium', 'Care Bears'])],
+        ]
+
+        for domain in domains:
+            ids = Country.search(self.cr, self.uid, domain)
+            self.assertListEqual([be], ids)
+
 if __name__ == '__main__':
     unittest2.main()
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 360ab4984cf..9c70c0f0192 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -1032,17 +1032,18 @@ class expression(object):
                         sql_operator = sql_operator[4:] if sql_operator[:3] == 'not' else '='
                         inselect_operator = 'not inselect'
 
-                    if sql_operator == 'in':
-                        right = tuple(right)
+                    trans_left = 'value'
+                    left = '"%s"' % (left,)
+                    instr = '%s'
 
                     if self.has_unaccent and sql_operator.endswith('like'):
+                        assert isinstance(right, basestring)
                         trans_left = 'unaccent(value)'
                         left = 'unaccent("%s")' % (left,)
                         instr = 'unaccent(%s)'
-                    else:
-                        trans_left = 'value'
-                        left = '"%s"' % (left,)
-                        instr = '%s'
+                    elif sql_operator == 'in':
+                        # params will be flatten by to_sql() => expand the placeholders
+                        instr = '(%s)' % ', '.join(['%s'] * len(right))
 
                     subselect = """(SELECT res_id
                                       FROM ir_translation
@@ -1058,12 +1059,13 @@ class expression(object):
                                 """.format(trans_left=trans_left, operator=sql_operator,
                                            right=instr, table=working_model._table, left=left)
 
-                    params = [working_model._name + ',' + field,
-                              context.get('lang', False) or 'en_US',
-                              'model',
-                              right,
-                              right,
-                              ]
+                    params = (
+                        working_model._name + ',' + field,
+                        context.get('lang') or 'en_US',
+                        'model',
+                        right,
+                        right,
+                    )
                     push(create_substitution_leaf(leaf, ('id', inselect_operator, (subselect, params)), working_model))
 
                 else:

From 1cdf8ac3f2052160d5c37d80fe330c0a802c8523 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 2 Apr 2014 14:20:23 +0200
Subject: [PATCH 162/175] [FIX] crm.lead: missing index on stage_id/type/state

bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux
---
 addons/crm/crm_lead.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bd3c6f33f4e..6c4ef607c0d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -264,10 +264,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         'opt_out': fields.boolean('Opt-Out', oldname='optout',
             help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. "
                     "Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."),
-        'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
+        'type': fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', select=True, help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange', select=True,
                         domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
         'referred': fields.char('Referred By', size=64),
@@ -277,7 +277,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
+                selection=crm.AVAILABLE_STATES, string="Status", readonly=True, select=True,
                 help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
 
         # Only used for type opportunity

From 4612b417afeb0853c8a69666ed0b30c19389874f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 3 Apr 2014 06:02:13 +0000
Subject: [PATCH 163/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
---
 addons/crm/i18n/sv.po  | 157 +++++++++++++++++++++++++----------
 addons/hr/i18n/sv.po   | 181 +++++++++++++++++++++++++++++------------
 addons/mail/i18n/sv.po |   4 +-
 addons/sale/i18n/sv.po |   4 +-
 4 files changed, 249 insertions(+), 97 deletions(-)

diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index e22587633bb..c2c52b3ab0d 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.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-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-03-31 16:46+0000\n"
+"PO-Revision-Date: 2014-04-02 14:14+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-01 06:52+0000\n"
+"X-Launchpad-Export-Date: 2014-04-03 06:01+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Här kan du konfigurera din inkommande e-postserver, och skapa kundämnen från "
+"inkommande e-post."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:897
@@ -55,6 +57,11 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"Varning obearbetade inkommande kundämnen är mer än 5 dagar gamla. \n"
+"Namn: [[object.name]] \n"
+"ID: [[object.id]] \n"
+"Beskrivning: [[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
@@ -65,7 +72,7 @@ msgstr "Action"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "Ställ in säljlaget till försäljningsavdelningen"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -76,7 +83,7 @@ msgstr "Välj affärsmöjligheter"
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Hantera insamlingar"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -87,7 +94,7 @@ msgstr "Stängledtid"
 #. module: crm
 #: view:crm.lead:0
 msgid "Available for mass mailing"
-msgstr ""
+msgstr "Tillgänglig för mass-e-post"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -123,13 +130,13 @@ msgstr "Bolagsnamn"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Utbildning"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Försäljningsetiketter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -139,7 +146,7 @@ msgstr "Förv stängning"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Cancel Call"
-msgstr ""
+msgstr "Avbryt samtal"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -155,7 +162,7 @@ msgstr "Rule Name"
 #: code:addons/crm/crm_phonecall.py:282
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Det är endast möjligt att konvertera ett samtal åt gången"
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -233,17 +240,17 @@ msgstr "Undantagen"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities that are assigned to me"
-msgstr ""
+msgstr "Affärsmöjligheter knutna till mig"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "# Möten"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Påminnelse till användare"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -253,12 +260,12 @@ msgstr "Villkor"
 #. module: crm
 #: view:crm.lead:0
 msgid "Assigned to My Team(s)"
-msgstr ""
+msgstr "Tilldelat till mina lag"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "Slå samman affärsmöjligheter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -329,6 +336,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att definiera en ny kundsegmentering. \n"
+"               </p><p> \n"
+"                 Skapa specifika kategorier som du kan koppla till din \n"
+"                 kontakter för att bättre hantera dina interaktioner med "
+"dem. \n"
+"                 Segmenteringsverktyget kan tilldela kategorier för "
+"kontakter \n"
+"                 enligt kriterier du anger. \n"
+"               </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -341,7 +359,7 @@ msgstr "Kontakt"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the salesman with the team leader."
-msgstr ""
+msgstr "Vid eskalering till detta säljlag, åsidosätts gruppledaren."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -381,6 +399,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att skapa en affärsmöjlighet knuten till denna "
+"kund. \n"
+"               </p><p> \n"
+"                 Använd affärsmöjligheter för övervaka på "
+"marknadsföringsprocess, följ \n"
+"                 upp potentiella affärer och bättre prognostisera dina "
+"framtida intäkter. \n"
+"               </p><p> \n"
+"                 Du kommer att kunna planera möten och telefonsamtal från \n"
+"                 möjligheter, omvandla dem till citat, bifoga relaterade \n"
+"                 dokument, spåra alla diskussioner och mycket mer. \n"
+"               </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
@@ -407,7 +439,7 @@ msgstr "Segmentation"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Länka till en befintlig kund"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -465,6 +497,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att definiera ett nytt säljlag. \n"
+"               </p><p> \n"
+"                 Använd säljlag för att organisera dina olika säljare eller "
+"\n"
+"                 avdelningar i separata grupper. Varje lag kommer att arbeta "
+"i \n"
+"                 sin egen lista av möjligheter. \n"
+"               </ p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -554,6 +596,9 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"Statusen är satt till \"Att göra\", när ett ärende skapas. Om ärendet pågår "
+"är status inställd på \"Öppen\". När samtalet är över, är status satt till "
+"\"Hållet\". Om samtalet behöver göras då status är inställd på 'Ej Hållet \"."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
@@ -583,6 +628,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Påminnelse på kundämne: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:759
@@ -626,6 +673,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"             Klicka för att lägga till en ny kategori. \n"
+"           </p><p> \n"
+"             Skapa specifika telefonsamtalskategorier för att bättre "
+"definiera vilken typ av \n"
+"             samtal som systemet spårar. \n"
+"           </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -673,7 +728,7 @@ msgstr "Företagssegmentering"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Loggade ett samtal för  %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -698,12 +753,12 @@ msgstr "The name of the segmentation."
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Kundämnen från USA"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "Sannolikheten för avslut skall vara mellan 0% och 100%!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -737,7 +792,7 @@ msgstr "TV"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Konvertera till affärsmöjlighet"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
@@ -764,6 +819,8 @@ msgstr "Sök telefonsamtal"
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Kundämnen / Affärsmöjligheter som är tilldelade ett av de säljlag jag "
+"hanterar"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -789,12 +846,12 @@ msgstr "Från %s: %s"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Konvertera till affärsmöjlighet"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that did not ask not to be included in mass mailing campaigns"
-msgstr ""
+msgstr "Kundämnen som inte avböjt att ingå i massutskickskampanjer"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -822,6 +879,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Länk mellan etapperna och säljlag. När den är inställd, begränsas aktuell "
+"etapp till det valda säljlaget."
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -860,7 +919,7 @@ msgstr "Företagskategori"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Avslutsratio (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -875,7 +934,7 @@ msgstr "Utgående"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to me"
-msgstr ""
+msgstr "Kundämnen tilldelade till mig"
 
 #. module: crm
 #: view:crm.lead:0
@@ -895,7 +954,7 @@ msgstr "Märk förlorad"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Kundämnen i utkast"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -914,7 +973,7 @@ msgstr "Skicka e-post"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -961,7 +1020,7 @@ msgstr "Nästa åtgärd"
 #: code:addons/crm/crm_lead.py:777
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
-msgstr ""
+msgstr "<b>Företag</b> inställd på <em>%s</em>."
 
 #. module: crm
 #: selection:crm.lead.report,state:0
@@ -1054,7 +1113,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:712
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "Kundämne <b>konverterad till affärsmöjlighet</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1069,7 +1128,7 @@ msgstr "År för samtal"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Leads"
-msgstr ""
+msgstr "Öppna kundämnen"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1083,7 +1142,7 @@ msgstr "Steg"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Telefonsamtal tilldelade till mig"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1093,7 +1152,7 @@ msgstr "Användarinloggning"
 #. module: crm
 #: view:crm.lead:0
 msgid "No salesperson"
-msgstr ""
+msgstr "Ingen säljare"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1120,22 +1179,22 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Affärsmöjlighet skapad"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Description..."
-msgstr ""
+msgstr "Beskrivning..."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1159,6 +1218,20 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"           Klicka för att skapa en ny affärsmöjlighet. \n"
+"           </p><p> \n"
+"           OpenERP hjälper dig övervaka din marknadsföringsprocess för att "
+"följa \n"
+"           upp potentiella affärer och bättre prognostisera dina framtida "
+"intäkter. \n"
+"           </p><p> \n"
+"           Du kommer att kunna planera möten och telefonsamtal från \n"
+"           affärsmöjligheter, omvandla dem till offerter, bifoga relaterade "
+"\n"
+"           dokument, spåra alla diskussioner och mycket mer. \n"
+"           </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1177,12 +1250,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Betalningsmoder"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1233,7 +1306,7 @@ msgstr ""
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "Kundämne skapat"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1271,7 +1344,7 @@ msgstr "okänd"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1284,7 +1357,7 @@ msgstr "Datum"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Nätsupport"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1320,7 +1393,7 @@ msgstr "Marknadsavdelning"
 #: code:addons/crm/crm_lead.py:582
 #, python-format
 msgid "Merged lead"
-msgstr ""
+msgstr "Sammanfoga kundämnen"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1344,7 +1417,7 @@ msgstr "Sammanslagna affärsmöjligheter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Konsulting"
 
 #. module: crm
 #: field:crm.case.section,code:0
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 1f4d5260e94..2f08a0c9526 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -8,13 +8,13 @@ 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-19 07:39+0000\n"
+"PO-Revision-Date: 2014-04-02 13:01+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-20 06:19+0000\n"
+"X-Launchpad-Export-Date: 2014-04-03 06:01+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr
@@ -59,6 +59,9 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"Medelstort foto av den anställde. Det storleksändras automatiskt till "
+"128x128px , med bildförhållande bevaras. Använd det här fältet i formulär "
+"vyer eller några Kanban vyer."
 
 #. module: hr
 #: view:hr.config.settings:0
@@ -155,7 +158,7 @@ msgstr "Fel! Du kan inte skapa rekursiva kategorier."
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "Detta installerar modulen hr_recruitment."
 
 #. module: hr
 #: view:hr.employee:0
@@ -166,12 +169,12 @@ msgstr "Född"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Employee Tags"
-msgstr ""
+msgstr "Etiketter på anställda"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "Starta rekrytering"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -201,12 +204,12 @@ msgstr "Meddelanden"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr "Begåvningsutveckling"
+msgstr "Kompetensutveckling"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "Detta installerar modulen hr_timesheet_sheet."
 
 #. module: hr
 #: view:hr.employee:0
@@ -240,7 +243,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Medelstort foto"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -302,6 +305,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Litet foto av den anställde. Det storleksändras automatiskt till 64x64px, "
+"men bildförhållandet bevaras. Använd det här fältet i de fall en liten bild "
+"krävs."
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -311,12 +317,12 @@ msgstr "Födelsedatum"
 #. module: hr
 #: help:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Antal nya personer som väntas anställas"
 
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "Öppna personalmenyn"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -324,6 +330,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -331,6 +339,8 @@ msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
 msgstr ""
+"Detta installerar modulen account_analytic_analysis, vilket kommer att "
+"installera kundorder också."
 
 #. module: hr
 #: view:board.board:0
@@ -399,7 +409,7 @@ msgstr "Kontakt för den anställde"
 #. module: hr
 #: view:hr.employee:0
 msgid "e.g. Part Time"
-msgstr ""
+msgstr "eg Deltid"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -423,6 +433,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att definiera en ny befattning. \n"
+"               </p><p> \n"
+"                 Befattningar används för att definiera arbetsuppgifter och "
+"deras krav. \n"
+"                 Du kan hålla reda på hur många anställda du har per "
+"befattning \n"
+"                 och följa utvecklingen efter vad du planerat \n"
+"                 för framtiden. \n"
+"               </p><p> \n"
+"                 Du kan bifoga en enkät till en befattning. Den kommer att "
+"användas i \n"
+"                 rekryteringsprocessen för att utvärdera sökande till "
+"befattningen. \n"
+"               </p>\n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -435,26 +461,28 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Detta installerar modulen hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "Fel! Rekusriva hierarkier med anställda ej möjligt-"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Detta installerar modulen hr_attendance"
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Litet foto"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -465,12 +493,12 @@ msgstr "Anställningskategori"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Detta installerar modulen hr_contract"
 
 #. module: hr
 #: view:hr.employee:0
@@ -480,7 +508,7 @@ msgstr "Relaterad användare"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -490,12 +518,12 @@ msgstr "Kategori"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Avsluta rekryteringen"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Installerar närvarofunktionerna"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -520,12 +548,12 @@ msgstr "Kontaktinformation"
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "Relaterade anställda"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Hantera röda dagar, ledighet och jobbönskemål"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -552,12 +580,12 @@ msgstr "Anställningskontrakt"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Avtal"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande och kommunikationshistorik"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -567,12 +595,12 @@ msgstr "Personnummer"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Administrera rekryteringsprocessen"
 
 #. module: hr
 #: view:hr.employee:0
@@ -582,12 +610,12 @@ msgstr "Aktiv"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Personaladministration"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Installera ditt lands lönehantering"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -602,7 +630,7 @@ msgstr "Företag"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -627,21 +655,30 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att lägga till en ny anställd. \n"
+"               </p><p> \n"
+"                 Med bara en snabb blick på OpenERP anställdskärmen, \n"
+"                 kan du lätt hitta all information du behöver för varje "
+"person; \n"
+"                 kontaktuppgifter, befattning, tillgänglighet etc. \n"
+"               </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "Personalinställningar"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Medborgarskap och annan information"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Fel! Rekursiv avdelningsstruktur ej tillåten."
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -651,7 +688,7 @@ msgstr "ArbetsAdress"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Publik information"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -666,7 +703,7 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Senaste kontakt"
 
 #. module: hr
 #: field:hr.employee,image:0
@@ -676,7 +713,7 @@ msgstr "Bild"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -691,17 +728,28 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att skapa en avdelning. \n"
+"               </p><p> \n"
+"                 OpenERP avdelningsstruktur används för att hantera alla "
+"dokument \n"
+"                 relaterade till de anställda från avdelningarna: kostnader, "
+"tidrapporter, \n"
+"                 blad och helgdagar, rekryteringar etc. \n"
+"               </p>\n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Detta installerar modulen hr_timesheet."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Väntat antal anställda vid denna befattning efter en ny rekryteringsomgång."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -716,6 +764,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"                 Klicka för att definiera en ny avdelning. \n"
+"               </p><p> \n"
+"                 Din avdelningsstruktur används för att hantera alla "
+"dokument \n"
+"                 relaterade till de anställda från avdelningarna: kostnader "
+"och tidrapporter, \n"
+"                 blad och helgdagar, rekryteringar etc. \n"
+"               </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -740,19 +798,23 @@ msgstr "Arbetsmobil"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Rekrytering pågår"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Tillåter fakturering baserat på tidrapporter (kundorder-modulen kommer "
+"installeras)"
 
 #. module: hr
 #: code:addons/hr/hr.py:221
 #, python-format
 msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!"
 msgstr ""
+"Välkommen till %s! Snälla hjälp honom / henne att ta de första stegen med "
+"OpenERP!"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -772,7 +834,7 @@ msgstr "Administrera tidrapporter"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_payroll_modules
 msgid "Payroll"
-msgstr ""
+msgstr "Lön"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -792,12 +854,12 @@ msgstr "I befattning"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Detta installerar modulen hr_payroll"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "Registrera avtal per anställd"
 
 #. module: hr
 #: view:hr.department:0
@@ -812,7 +874,7 @@ msgstr "Medborgarskap"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Extra funktioner"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -822,7 +884,7 @@ msgstr "Anteckningar"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr ""
+msgstr "Underordnad hierarki"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -865,23 +927,23 @@ msgstr "Avdelningsnamn"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Rapporter"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Lönadministration"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Konfgiurera personaladministrationen"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Ingen rekrytering"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -901,7 +963,7 @@ msgstr "Logga in"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Prognosticerat antal anställda"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -909,11 +971,13 @@ msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
 msgstr ""
+"Som standard 'befattning\", ställ in den på\"Rekrytering pågår\" om "
+"rekryteringsprocessen pågår för denna befattning."
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -939,6 +1003,21 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\"> \n"
+"                   <p> \n"
+"                     <b>Human Resources instrumentpanelen är tomt. </b> \n"
+"                   </p><p> \n"
+"                     För att lägga till din första rapport i denna "
+"instrumentpanelen, gå till någon \n"
+"                     meny, växla till lista eller graf visa och klicka <i> "
+"\"Lägg till \n"
+"                     anslagstavla \"</ i> i de utökade sökmöjligheter. \n"
+"                   </p><p> \n"
+"                     Du kan välja och gruppera data innan du sätter in i \n"
+"                     anslagstavla med sökalternativen. \n"
+"                   </p> \n"
+"               </div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -954,12 +1033,12 @@ msgstr "Namnet på befattningen måste vara unikt per bolag!"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Detta installerar modulen hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -981,4 +1060,4 @@ msgstr "Underordnad"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 2706147bd73..a5add364ac0 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -9,13 +9,13 @@ 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-04-02 02:34+0000\n"
+"PO-Revision-Date: 2014-04-03 05:29+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Svenska <info@openerpsweden.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-04-02 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-03 06:02+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: mail
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 9c1bdac80bb..8863ff16091 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -8,13 +8,13 @@ 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-04-02 02:48+0000\n"
+"PO-Revision-Date: 2014-04-03 05:30+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@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-04-02 06:44+0000\n"
+"X-Launchpad-Export-Date: 2014-04-03 06:02+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: sale

From 6fca27626a16e2be953d9093713ec7ec8d662ab5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 3 Apr 2014 10:45:24 +0200
Subject: [PATCH 164/175] [FIX] expression: do not double quote column names

bzr revid: chs@openerp.com-20140403084524-9rb174osjrbmhgwc
---
 openerp/osv/expression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 9c70c0f0192..93e28dcccb3 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -1039,7 +1039,7 @@ class expression(object):
                     if self.has_unaccent and sql_operator.endswith('like'):
                         assert isinstance(right, basestring)
                         trans_left = 'unaccent(value)'
-                        left = 'unaccent("%s")' % (left,)
+                        left = 'unaccent(%s)' % (left,)
                         instr = 'unaccent(%s)'
                     elif sql_operator == 'in':
                         # params will be flatten by to_sql() => expand the placeholders

From 1395c9ee0e14ce2c35dbf6258678d3b032d52c73 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 14:04:14 +0100
Subject: [PATCH 165/175] [IMP] website: snippet editor: change size automatic
 button into a cross between resize handler

bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
---
 addons/website/static/src/css/snippets.css       | 16 ++++++++++++----
 addons/website/static/src/css/snippets.sass      | 14 ++++++++++----
 .../static/src/js/website.snippets.editor.js     | 16 ++++++----------
 .../website/static/src/xml/website.snippets.xml  |  5 ++++-
 addons/website/views/snippets.xml                |  3 ---
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 4121b70ef2e..726855f311b 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -328,14 +328,10 @@
 }
 .oe_overlay .oe_handle.size .oe_handle_button {
   z-index: 3;
-  content: "Resize";
-  width: 64px;
   text-align: center;
   margin-left: -32px;
   margin-top: -10px;
-  cursor: row-resize;
   left: 0px;
-  top: 9px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button:hover {
   background: rgba(30, 30, 30, 0.8);
@@ -344,6 +340,18 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.size .size {
+  width: 64px;
+  cursor: row-resize;
+  top: 9px;
+}
+.oe_overlay .oe_handle.size .auto_size {
+  width: 20px;
+  padding: 0 5px;
+  top: 1px;
+  margin-left: 36px;
+  cursor: pointer;
+}
 .oe_overlay .oe_handle.readonly {
   cursor: auto !important;
 }
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index d7442a5b0f7..9b12e9df246 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -240,18 +240,24 @@
             bottom: -6px
             .oe_handle_button
                 z-index: 3
-                content: "Resize"
-                width: 64px
                 text-align: center
                 margin-left: -32px
                 margin-top: -10px
-                cursor: row-resize
                 left: 0px
-                top: 9px
                 &:hover
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+            .size
+                width: 64px
+                cursor: row-resize
+                top: 9px
+            .auto_size
+                width: 20px
+                padding: 0 5px
+                top: 1px
+                margin-left: 36px
+                cursor: pointer
         &.readonly
             cursor: auto !important
             &:before, &.size
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index b8533236e01..bb9c6c0e48e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1021,7 +1021,7 @@
             if (resize_values.w) this.$overlay.find(".oe_handle.w").removeClass("readonly");
             if (resize_values.size) this.$overlay.find(".oe_handle.size").removeClass("readonly");
 
-            this.$overlay.find(".oe_handle:not(:has(.oe_handle_button)), .oe_handle .oe_handle_button").on('mousedown', function (event){
+            this.$overlay.find(".oe_handle:not(.size), .oe_handle.size .size").on('mousedown', function (event){
                 event.preventDefault();
 
                 var $handle = $(this);
@@ -1123,6 +1123,11 @@
                 $body.mousemove(body_mousemove);
                 $body.mouseup(body_mouseup);
             });
+            this.$overlay.find(".oe_handle.size .auto_size").on('click', function (event){
+                self.$target.css("height", "");
+                self.BuildingBlock.cover_target(self.$overlay, self.$target);
+                return false;
+            });
         },
         getSize: function () {
             this.grid = {};
@@ -1286,15 +1291,6 @@
             this.grid.size = 8;
             return this.grid;
         },
-        start: function () {
-            var self = this;
-            this._super();
-            this.$el.find(".js_size_auto").on('click', function (event){
-                self.$target.css("height", "");
-                self.BuildingBlock.cover_target(self.$overlay, self.$target);
-                return false;
-            });
-        },
     });
 
     website.snippet.options.parallax = website.snippet.Option.extend({
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 511876b116d..c5cf94d4791 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -38,7 +38,10 @@
                 <div class='oe_handle n readonly'><div></div></div>
                 <div class='oe_handle e readonly'><div></div></div>
                 <div class='oe_handle w readonly'><div></div></div>
-                <div class='oe_handle size readonly'><div class="oe_handle_button size">Resize</div></div>
+                <div class='oe_handle size readonly'>
+                    <div class="oe_handle_button size">Resize</div>
+                    <div class="oe_handle_button auto_size">x</div>
+                </div>
                 <div class='oe_handle s readonly'><div></div></div>
             </div>
         </div>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index cdc4bd8f961..55bd7679b66 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -952,9 +952,6 @@
     <div data-snippet-option-id='resize'
         data-selector="section, .carousel, .parallax"
         data-selector-children=".oe_structure, [data-oe-type=html]">
-        <li>
-            <a href="#" class="button js_size_auto">Size Automatic</a>
-        </li>
     </div>
 
     <div data-snippet-option-id='margin-x'

From af8147fc95cd35e68f35c8d83fa5836f97134cbb Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 18 Mar 2014 14:06:55 +0100
Subject: [PATCH 166/175] [FIX] Display placeholder on IE9.

The hack was not working since we migrate jQuery 1.8 to 1.9 because $.browser has been removed.

bzr revid: jke@openerp.com-20140318130655-yqgj851enc0293hr
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3dc148bc7c1..5e68a71022b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2253,7 +2253,7 @@ instance.web.form.ReinitializeFieldMixin =  _.extend({}, instance.web.form.Reini
 /**
     Some hack to make placeholders work in ie9.
 */
-if ($.browser.msie && $.browser.version === "9.0") {
+if (!('placeholder' in document.createElement('input'))) {    
     document.addEventListener("DOMNodeInserted",function(event){
         var nodename =  event.target.nodeName.toLowerCase();
         if ( nodename === "input" || nodename == "textarea" ) {

From 9d65ff69dab89198e551fbeff94bed7ca86f933b Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 18 Mar 2014 16:00:59 +0100
Subject: [PATCH 167/175] [FIX] Hack css for graph view

The best way will be to set svg height, but IE9 does not understand height="xxx". So we override the overflow set by bootstrap.css to fix it.

bzr revid: jke@openerp.com-20140318150059-nd6bdd58uvr1s4um
---
 addons/web_graph/static/src/css/graph.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css
index 1949028d6d8..25ee5db9594 100644
--- a/addons/web_graph/static/src/css/graph.css
+++ b/addons/web_graph/static/src/css/graph.css
@@ -1,3 +1,11 @@
+ /* 
+ This is a hack for IE9 ...
+ Attrs : width and height are not take in consideration
+ */
+.openerp svg:not(:root) {
+    overflow: visible;    
+}
+
 .graph_pivot_mode {
     position:initial;
 }

From edf0f26d5963a5a9736d9358bbf37b9fd7b9d5d7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 19 Mar 2014 05:52:26 +0000
Subject: [PATCH 168/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
---
 addons/hr/i18n/am.po             | 963 +++++++++++++++++++++++++++++++
 addons/product_margin/i18n/am.po | 283 +++++++++
 2 files changed, 1246 insertions(+)
 create mode 100644 addons/hr/i18n/am.po
 create mode 100644 addons/product_margin/i18n/am.po

diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po
new file mode 100644
index 00000000000..3b86e0a2a06
--- /dev/null
+++ b/addons/hr/i18n/am.po
@@ -0,0 +1,963 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2014-03-18 13:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Amharic <am@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-19 05:52+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "Allow timesheets validation by managers"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "አስፈላጊ"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "የሰራተኞች መረጃ ማገናኘት"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+#: model:ir.ui.menu,name:hr.menu_hr_root
+#: model:ir.ui.menu,name:hr.menu_human_resources_configuration
+msgid "Human Resources"
+msgstr "የሰው ሀይል አስተዳደር"
+
+#. module: hr
+#: help:hr.employee,image_medium:0
+msgid ""
+"Medium-sized photo of the employee. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Time Tracking"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.view_department_form_installer
+msgid "Create Your Departments"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_evaluation:0
+msgid "Organize employees periodic evaluation"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
+msgid "Department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work Email"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,image:0
+msgid ""
+"This field holds the image used as photo for the employee, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_holidays:0
+msgid "This installs the module hr_holidays."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:res.users,employee_ids:0
+msgid "Related employees"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_recruitment:0
+msgid "This installs the module hr_recruitment."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Birth"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Employee Tags"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Launch Recruitement"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Leaves"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Married"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Talent Management"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "This installs the module hr_timesheet_sheet."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendance"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,image_small:0
+msgid ""
+"Small-sized photo of the employee. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.client,name:hr.action_client_hr_menu
+msgid "Open HR Menu"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"This installs the module account_analytic_analysis, which will install sales "
+"management too."
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "Current Number of Employees"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_expense:0
+msgid "Manage employees expenses"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Tel:"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+msgid "Departments"
+msgstr ""
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new job position.\n"
+"              </p><p>\n"
+"                Job Positions are used to define jobs and their "
+"requirements.\n"
+"                You can keep track of the number of employees you have per "
+"job\n"
+"                position and follow the evolution according to what you "
+"planned\n"
+"                for the future.\n"
+"              </p><p>\n"
+"                You can attach a survey to a job position. It will be used "
+"in\n"
+"                the recruitment process to evaluate the applicants for this "
+"job\n"
+"                position.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_evaluation:0
+msgid "This installs the module hr_evaluation."
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_attendance:0
+msgid "This installs the module hr_attendance."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_contract:0
+msgid "This installs the module hr_contract."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Related User"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "or"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Stop Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_attendance:0
+msgid "Install attendances feature"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_holidays:0
+msgid "Manage holidays, leaves and allocation requests"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_recruitment:0
+msgid "Manage the recruitment process"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Human Resources Management"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Install your country's payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account Number"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new employee.\n"
+"              </p><p>\n"
+"                With just a quick glance on the OpenERP employee screen, "
+"you\n"
+"                can easily find all the information you need for each "
+"person;\n"
+"                contact data, job position, availability, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "HR Settings"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Citizenship & Other Info"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You cannot create recursive departments."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Public Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a department.\n"
+"              </p><p>\n"
+"                OpenERP's department structure is used to manage all "
+"documents\n"
+"                related to employees by departments: expenses, timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet:0
+msgid "This installs the module hr_timesheet."
+msgstr ""
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.view_department_form_installer
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new department.\n"
+"              </p><p>\n"
+"                Your departments structure is used to manage all documents\n"
+"                related to employees by departments: expenses and "
+"timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,city:0
+msgid "City"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Recruitement in Progress"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allow invoicing based on timesheets (the sale application will be installed)"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet:0
+msgid "Manage timesheets"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_payroll_modules
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Single"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Position"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_payroll:0
+msgid "This installs the module hr_payroll."
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_contract:0
+msgid "Record contracts per employee"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Additional Features"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Subordinate Hierarchy"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee,name_related:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee.category,employee_ids:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+msgid "Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
+msgid "Reports"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_payroll:0
+msgid "Manage payroll"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
+msgid "Configure Human Resources"
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "No Recruitment"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,login:0
+msgid "Login"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Total Forecasted Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,state:0
+msgid ""
+"By default 'In position', set it to 'In Recruitment' if recruitment process "
+"is going on for this job position."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_board_hr
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Human Resources dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_expense:0
+msgid "This installs the module hr_expense."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Widower"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Apply"
+msgstr ""
diff --git a/addons/product_margin/i18n/am.po b/addons/product_margin/i18n/am.po
new file mode 100644
index 00000000000..c9eea96959e
--- /dev/null
+++ b/addons/product_margin/i18n/am.po
@@ -0,0 +1,283 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-03-18 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Amharic <am@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-19 05:52+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "ተመላሽ"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr ""
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "ከ"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multiplication of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "ለ"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnover - Standard price"
+msgstr "የተመላሽ መደበኛ ዋጋ"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "ያልተከፈለና የተከፈለ ደረሰኞች"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "የእቃው አይነት በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "የእቃዎች መካከለኛ ዋጋ"
+
+#. module: product_margin
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "ቅናሽ ዋጋ"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "ተከፈል"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "የሽያጭ ክፍተት"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "ሊሸጥ የሚችል እቃ"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "ሊሸጥ የሚችል እቃ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "የእቃው መደበኛ ዋጋ"
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr "የእቃው መጠን የጨመረበት ቀን"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "የመመዘኛ መስፈርት"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "አጠቃላይ ዋጋ"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multiplication of Cost price and quantity of Supplier Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "የሚጠበቅ ጭማሪ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices."
+msgstr "የመካከለኛ ዋጋ ለገዢዎች"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "የመካከለኛ ዋጋ አቅራቢዎች "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "የሁሉም ዋጋ በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr "እቃው ከጨመረበት ቀን ጀምሮ"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multiplication of Invoice price and quantity of Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "መደበኛ ዋጋ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "ግዢዎች"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "በአይነታቸው መከፍፈል"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr ""
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "የተከፈተና የትከፈል"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "ሽያጭ"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "ውጤት"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "አጠቃላይ መርጃ"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "የግዢ ክፍተት"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "መሰረዝ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "or"
+msgstr "ወይም"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "የእቃው መጨመር"

From 48d3befa070ffd82f267e5c51ff05673824c9993 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 20 Mar 2014 00:45:42 +0100
Subject: [PATCH 169/175] ir_logging disabled by default

bzr revid: al@openerp.com-20140319234542-jsmxchx7tuv13e13
---
 openerp/netsvc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 3de345a0adf..26691c120a5 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -191,7 +191,8 @@ def init_logger():
         logger.handlers = []
         logger.setLevel(level)
         logger.addHandler(handler)
-        logger.addHandler(postgresqlHandler)
+        if tools.config['log_db']:
+            logger.addHandler(postgresqlHandler)
         if loggername != '':
             logger.propagate = False
 

From 6e4db0a0a682c806384e1b9fa8fd6f5f04c89376 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 20 Mar 2014 01:05:24 +0100
Subject: [PATCH 170/175] ir_logging fix config option

bzr revid: al@openerp.com-20140320000524-gs98xy6iqh2ceev6
---
 openerp/netsvc.py       | 6 +++---
 openerp/tools/config.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 9efc7120589..28919f23d4d 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -22,23 +22,23 @@
 import logging
 import logging.handlers
 import os
+import pprint
 import release
 import sys
 import threading
-from pprint import pformat
 
 import psycopg2
 
-import tools
 import openerp
 import sql_db
+import tools
 
 _logger = logging.getLogger(__name__)
 
 def log(logger, level, prefix, msg, depth=None):
     indent=''
     indent_after=' '*len(prefix)
-    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
+    for line in (prefix + pprint.pformat(msg, depth=depth)).split('\n'):
         logger.log(level, indent+line)
         indent=indent_after
 
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 8963720fda0..6b4e3f68f6a 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -187,7 +187,7 @@ class configmanager(object):
         group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
         group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
-        group.add_option('--log-db', dest='log_db', help="database where OpenERP will store the exceptions", my_default=False)
+        group.add_option('--log-db', dest='log_db', help="Logging database", my_default=False)
         # For backward-compatibility, map the old log levels to something
         # quite close.
         levels = [
@@ -392,7 +392,7 @@ class configmanager(object):
                 'xmlrpc', 'syslog', 'without_demo', 'timezone',
                 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
                 'static_http_enable', 'static_http_document_root', 'static_http_url_prefix',
-                'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level'
+                'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level', 'log_db'
                 ]
 
         for arg in keys:

From e73230d0fcce4ff7b5bbf4c95fd4eef393e2eb8f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 20 Mar 2014 01:09:12 +0100
Subject: [PATCH 171/175] ir_logging fix logger names

bzr revid: al@openerp.com-20140320000912-1a5hngnw8ilq22k8
---
 openerp/netsvc.py       | 8 ++++----
 openerp/tools/config.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 28919f23d4d..d762eb5006f 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -205,15 +205,15 @@ def init_logger():
 
 DEFAULT_LOG_CONFIGURATION = [
     'openerp.workflow.workitem:WARNING',
-    'openerp.netsvc.rpc.request:INFO',
-    'openerp.netsvc.rpc.response:INFO',
+    'openerp.http.rpc.request:INFO',
+    'openerp.http.rpc.response:INFO',
     'openerp.addons.web.http:INFO',
     'openerp.sql_db:INFO',
     ':INFO',
 ]
 PSEUDOCONFIG_MAPPER = {
-    'debug_rpc_answer': ['openerp:DEBUG','openerp.netsvc.rpc.request:DEBUG', 'openerp.netsvc.rpc.response:DEBUG'],
-    'debug_rpc': ['openerp:DEBUG','openerp.netsvc.rpc.request:DEBUG'],
+    'debug_rpc_answer': ['openerp:DEBUG','openerp.http.rpc.request:DEBUG', 'openerp.http.rpc.response:DEBUG'],
+    'debug_rpc': ['openerp:DEBUG','openerp.http.rpc.request:DEBUG'],
     'debug': ['openerp:DEBUG'],
     'debug_sql': ['openerp.sql_db:DEBUG'],
     'info': [],
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 6b4e3f68f6a..8313f4d786e 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -183,9 +183,9 @@ class configmanager(object):
         group.add_option("--logrotate", dest="logrotate", action="store_true", my_default=False, help="enable logfile rotation")
         group.add_option("--syslog", action="store_true", dest="syslog", my_default=False, help="Send the log to the syslog server")
         group.add_option('--log-handler', action="append", default=DEFAULT_LOG_HANDLER, my_default=DEFAULT_LOG_HANDLER, metavar="PREFIX:LEVEL", help='setup a handler at LEVEL for a given PREFIX. An empty PREFIX indicates the root logger. This option can be repeated. Example: "openerp.orm:DEBUG" or "werkzeug:CRITICAL" (default: ":INFO")')
-        group.add_option('--log-request', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.request:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.request:DEBUG')
-        group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
-        group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.http:DEBUG')
+        group.add_option('--log-request', action="append_const", dest="log_handler", const="openerp.http.rpc.request:DEBUG", help='shortcut for --log-handler=openerp.http.rpc.request:DEBUG')
+        group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.http.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.http.rpc.response:DEBUG')
+        group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.http:DEBUG", help='shortcut for --log-handler=openerp.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
         group.add_option('--log-db', dest='log_db', help="Logging database", my_default=False)
         # For backward-compatibility, map the old log levels to something

From 800ab84e3b64b97d534d2f02d1eb7f8098ab16de Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 20 Mar 2014 05:47:27 +0000
Subject: [PATCH 172/175] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140320054727-1wcctx54alajpzne
---
 openerp/addons/base/i18n/ab.po       |   4 +-
 openerp/addons/base/i18n/af.po       |   4 +-
 openerp/addons/base/i18n/am.po       |   4 +-
 openerp/addons/base/i18n/ar.po       |   4 +-
 openerp/addons/base/i18n/bg.po       |   4 +-
 openerp/addons/base/i18n/bn.po       |   4 +-
 openerp/addons/base/i18n/bs.po       |   4 +-
 openerp/addons/base/i18n/ca.po       |   4 +-
 openerp/addons/base/i18n/cs.po       |   4 +-
 openerp/addons/base/i18n/da.po       |   4 +-
 openerp/addons/base/i18n/de.po       |   4 +-
 openerp/addons/base/i18n/el.po       |   4 +-
 openerp/addons/base/i18n/en_GB.po    |   4 +-
 openerp/addons/base/i18n/es.po       |   4 +-
 openerp/addons/base/i18n/es_AR.po    |   4 +-
 openerp/addons/base/i18n/es_BO.po    |   4 +-
 openerp/addons/base/i18n/es_CL.po    |   4 +-
 openerp/addons/base/i18n/es_CR.po    |   4 +-
 openerp/addons/base/i18n/es_DO.po    |   4 +-
 openerp/addons/base/i18n/es_EC.po    |   4 +-
 openerp/addons/base/i18n/es_MX.po    |   4 +-
 openerp/addons/base/i18n/es_PE.po    |   4 +-
 openerp/addons/base/i18n/es_VE.po    |   4 +-
 openerp/addons/base/i18n/et.po       |   4 +-
 openerp/addons/base/i18n/eu.po       |   4 +-
 openerp/addons/base/i18n/fa.po       |   4 +-
 openerp/addons/base/i18n/fa_AF.po    |   4 +-
 openerp/addons/base/i18n/fi.po       |   4 +-
 openerp/addons/base/i18n/fr.po       |   4 +-
 openerp/addons/base/i18n/fr_CA.po    | 197 +++++++++++++++++++++------
 openerp/addons/base/i18n/gl.po       |   4 +-
 openerp/addons/base/i18n/gu.po       |   4 +-
 openerp/addons/base/i18n/he.po       |   4 +-
 openerp/addons/base/i18n/hi.po       |   4 +-
 openerp/addons/base/i18n/hr.po       |   4 +-
 openerp/addons/base/i18n/hu.po       |   4 +-
 openerp/addons/base/i18n/hy.po       |   4 +-
 openerp/addons/base/i18n/id.po       |   4 +-
 openerp/addons/base/i18n/is.po       |   4 +-
 openerp/addons/base/i18n/it.po       |   4 +-
 openerp/addons/base/i18n/ja.po       |   4 +-
 openerp/addons/base/i18n/ka.po       |   4 +-
 openerp/addons/base/i18n/kk.po       |   4 +-
 openerp/addons/base/i18n/ko.po       |   4 +-
 openerp/addons/base/i18n/lt.po       |   4 +-
 openerp/addons/base/i18n/lv.po       |   4 +-
 openerp/addons/base/i18n/mk.po       |   4 +-
 openerp/addons/base/i18n/mn.po       |   4 +-
 openerp/addons/base/i18n/nb.po       |   4 +-
 openerp/addons/base/i18n/nl.po       |   4 +-
 openerp/addons/base/i18n/nl_BE.po    |   4 +-
 openerp/addons/base/i18n/pl.po       |   4 +-
 openerp/addons/base/i18n/pt.po       |   4 +-
 openerp/addons/base/i18n/pt_BR.po    |   4 +-
 openerp/addons/base/i18n/ro.po       |   4 +-
 openerp/addons/base/i18n/ru.po       |   4 +-
 openerp/addons/base/i18n/sk.po       |   4 +-
 openerp/addons/base/i18n/sl.po       |   4 +-
 openerp/addons/base/i18n/sq.po       |   4 +-
 openerp/addons/base/i18n/sr.po       |   4 +-
 openerp/addons/base/i18n/sr@latin.po |   4 +-
 openerp/addons/base/i18n/sv.po       |   4 +-
 openerp/addons/base/i18n/th.po       |   4 +-
 openerp/addons/base/i18n/tlh.po      |   4 +-
 openerp/addons/base/i18n/tr.po       |   4 +-
 openerp/addons/base/i18n/uk.po       |   4 +-
 openerp/addons/base/i18n/ur.po       |   4 +-
 openerp/addons/base/i18n/vi.po       |   4 +-
 openerp/addons/base/i18n/zh_CN.po    |   4 +-
 openerp/addons/base/i18n/zh_HK.po    |   4 +-
 openerp/addons/base/i18n/zh_TW.po    |   4 +-
 71 files changed, 294 insertions(+), 183 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 0d6e5aaef89..6b28e22586f 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.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-03-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 69e8103fdbd..248585cfa4a 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.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-03-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index fca6a2b148c..dce06ee8cd5 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.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-03-12 04:42+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 4e9c2e2b4bd..15a0ba086b4 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,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-03-12 04:42+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 0f4c299e8e9..87b6fde3494 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,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-03-12 04:43+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index 6f848c3918a..18d9cb25618 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.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-03-12 04:43+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index ba7d39d340f..64560df5bfc 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,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-03-12 04:43+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index c51a2a0e546..5e9a509e2f8 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,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-03-12 04:43+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 3c18cc5bc07..d5f8a06d703 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,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-03-12 04:44+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index ad2f9c7542b..14414eccc68 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.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-03-12 04:44+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index dcf9b51367a..1e0a1c51e4c 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.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-03-12 04:46+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index d0144cde2fa..2428ce6643d 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,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-03-12 04:46+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 4577c3be9d6..3ac3d49d9ad 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.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-03-12 04:55+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 161143cb35c..3289f1acd3c 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,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-03-12 04:53+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 8316f687607..ff156da38c1 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.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-03-12 04:55+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 090125e661b..4d8aa3b9f5e 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.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-03-12 04:56+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 0df508399c7..e5fb10c6ca3 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,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-03-12 04:56+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 56f664e3259..ff0e9053b68 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.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-03-12 04:57+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index c93d78cbb59..c95ba0fcad8 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.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-03-12 04:56+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 11977f93058..6126d7c2a6f 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,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-03-12 04:57+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index e8919023269..332d7384c82 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.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-03-12 04:57+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index d6c439413be..cbdab27c57d 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.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-03-12 04:58+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index ff2410c4b72..15260ad574a 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.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-03-12 04:55+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 0e16cb4c3be..1192725aac4 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,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-03-12 04:44+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 54a890ed5a6..6fabc952d95 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.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-03-12 04:42+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 51409288f56..1b0e025410e 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,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-03-12 04:50+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 808dd0f67fe..af0a0e59729 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.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-03-12 04:58+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 86b4287d829..5646cffb9c9 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,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-03-12 04:45+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 1470da528cd..a7cb0c9fd67 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,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-03-12 04:45+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index 0d23b54db1a..c132e8506f3 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.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-03-12 04:56+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -29,7 +29,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sainte Hélène"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "Date et heure"
 
 #. module: base
 #: code:addons/fields.py:652
@@ -68,7 +68,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "Hongrois / Magyar"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -81,6 +81,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Vous aide à gérer vos projets et tâches, en assurant leur suivi, en générant "
+"des planifications, etc."
 
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
@@ -221,7 +223,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sz
 msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
 
 #. module: base
 #: code:addons/orm.py:4485
@@ -352,7 +354,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Gestion de la relation client (CRM)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery
@@ -389,14 +391,14 @@ msgstr ""
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr ""
+msgstr "Limite de crédit"
 
 #. module: base
 #: field:ir.model.constraint,date_update:0
 #: field:ir.model.data,date_update:0
 #: field:ir.model.relation,date_update:0
 msgid "Update Date"
-msgstr ""
+msgstr "Mettre à jour la date"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
@@ -407,12 +409,12 @@ msgstr ""
 #: view:ir.attachment:0
 #: field:ir.attachment,create_uid:0
 msgid "Owner"
-msgstr ""
+msgstr "Propriétaire"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Source Object"
-msgstr ""
+msgstr "Objet source"
 
 #. module: base
 #: model:res.partner.bank.type,format_layout:base.bank_normal
@@ -434,7 +436,7 @@ msgstr ""
 #: field:ir.model.access,group_id:0
 #: view:res.groups:0
 msgid "Group"
-msgstr ""
+msgstr "Groupe"
 
 #. module: base
 #: constraint:res.lang:0
@@ -442,6 +444,9 @@ msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
 msgstr ""
+"Vous avez spécifié une directive de format date/temps non valide. Veuillez "
+"vous référer à la liste des directives autorisées, qui s'affiche lorsque "
+"vous modifiez une langue."
 
 #. module: base
 #: code:addons/orm.py:4153
@@ -555,6 +560,19 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"Gestion et organisation d'événements\n"
+"====================================\n"
+"\n"
+"Le module 'Événement' vous permet d'organiser efficacement des événements et "
+"toutes les tâches liées : planification, suivi des inscriptions, des "
+"présences, etc.\n"
+"\n"
+"Fonctionnalités clés\n"
+"--------------------\n"
+"* Gestion des événements et des inscriptions\n"
+"* Utilisation d'e-mails pour automatiquement confirmer et envoyer des "
+"accusés de réception pour chaque inscription à un événement\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -567,6 +585,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
+"Si vous cochez ceci, alors la seconde fois que l'utilisateur imprimera avec "
+"le même nom de pièce jointe, cela retournera le rapport stocké"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_byproduct
@@ -597,7 +617,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "Facture sur les feuilles de temps"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -613,12 +633,12 @@ msgstr ""
 #. module: base
 #: field:res.country,name:0
 msgid "Country Name"
-msgstr ""
+msgstr "Nom du pays"
 
 #. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
-msgstr ""
+msgstr "Colombie"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
@@ -640,7 +660,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Achats et ventes"
 
 #. module: base
 #: view:ir.translation:0
@@ -721,6 +741,33 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Comptabilité et gestion financière\n"
+"==================================\n"
+"\n"
+"Le module de comptabilité et de finance couvre :\n"
+"------------------------------------------------\n"
+"    * Comptabilité générale\n"
+"    * Comptabilité de coût / comptabilité analytique\n"
+"    * Comptabilité de tiers\n"
+"    * Gestion des taxes\n"
+"    * Budgets\n"
+"    * Factures clients et fournisseurs\n"
+"    * Relevés bancaires\n"
+"    * Réconciliations par partenaire\n"
+"\n"
+"Il créé également un tableau de bord pour les comptables qui inclut :\n"
+"---------------------------------------------------------------------\n"
+"    * Une liste des factures clients à approuver\n"
+"    * L'analyse de la société\n"
+"    * Un graphe de la trésorerie\n"
+"\n"
+"Les processus tels que le maintien de la comptabilité générale se fait par "
+"le biais des revues financières définies (les lignes d'écriture à regrouper "
+"le sont à travers un journal)\n"
+"pour un exercice donné et pour la préparation des reçus il ya un module "
+"nommé account_voucher.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -763,7 +810,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr ""
+msgstr "Jordanie"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
@@ -788,7 +835,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule_admin
@@ -820,6 +867,10 @@ msgid ""
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
+"Fournit les champs qui seront utilisés pour récupérer le numéro du "
+"cellulaire. Exemple: vous sélectionnez une facture, alors, "
+"`object.invoice_address_id.mobile` est le champ qui représente le numéro du "
+"cellulaire correct."
 
 #. module: base
 #: view:ir.mail_server:0
@@ -840,7 +891,7 @@ msgstr ""
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Nom du fichier"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -891,6 +942,33 @@ msgid ""
 "also possible in order to automatically create a meeting when a holiday "
 "request is accepted by setting up a type of meeting in Leave Type.\n"
 msgstr ""
+"\n"
+"Gère les absences et les demandes de congés\n"
+"===========================================\n"
+"\n"
+"Cette application contrôle la programmation des congés de votre société. Il "
+"permet aux employés de faire des demandes de congés. Ensuite, les managers "
+"peuvent examiner les demandes et les approuver ou les rejeter. De cette "
+"façon, vous pouvez contrôler la planification de l'ensemble des congés de "
+"votre entreprise ou de votre département.\n"
+"\n"
+"Vous pouvez configurer plusieurs sortes d'absences (maladie, congés payés, "
+"congés sans soldes…) et allouer rapidement ces absences à un employé ou un "
+"département en utilisant les demandes de congés. Un employé peut aussi faire "
+"une demande de congés pour plus de jours en ajoutant une allocation. Cela va "
+"augmenter le total des jours disponibles pour ce type de congés (si la "
+"demande est acceptée).\n"
+"\n"
+"Vous pouvez suivre les absences de différentes façons grâce aux rapports "
+"suivants : \n"
+"\n"
+"* Résumé des absences\n"
+"* Absences par département\n"
+"* Analyse des absences\n"
+"\n"
+"Une synchronisation avec les agendas internes (Réunions du module CRM) est "
+"aussi possible dans le but de créer automatiquement une réunion quand une "
+"demande de congés est accepté en ajoutant une type de réunion Absence.\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -900,7 +978,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "Opportunités"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -910,7 +988,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papouasie-Nouvelle-Guinée"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -941,7 +1019,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #. module: base
 #: help:ir.model.constraint,type:0
@@ -957,7 +1035,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
-msgstr ""
+msgstr "Espagne"
 
 #. module: base
 #: help:ir.actions.act_window,domain:0
@@ -978,17 +1056,17 @@ msgstr ""
 #. module: base
 #: field:res.partner,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Cellulaire"
 
 #. module: base
 #: model:res.country,name:base.om
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr ""
+msgstr "MRP - PBM"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_attendance
@@ -1026,12 +1104,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Créer un menu"
 
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "Inde"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request_link-act
@@ -1047,7 +1125,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Gestion de flotte"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1107,6 +1185,36 @@ msgid ""
 "* Planned Revenue by Stage and User (graph)\n"
 "* Opportunities by Stage (graph)\n"
 msgstr ""
+"\n"
+"Le module OpenERP de gestion de la relation client (CRM)\n"
+"=============================================\n"
+"\n"
+"Cette application permet aux utilisateurs de gérer efficacement et "
+"intelligemment leurs pistes, opportunités, réunions et appels "
+"téléphoniques.\n"
+"\n"
+"Elle gère les tâches clés comme la communication, l'identification, les "
+"assignations, les résolutions et les notifications.\n"
+"\n"
+"OpenERP assure que toutes les demandes sont suivis par les utilisateurs, les "
+"clients et les fournisseurs. Il permet d'envoyer automatiquement des "
+"rappels, d'escalader des requêtes, de lancer des actions spécifiques et de "
+"nombreuses autres selon les règles de l'entreprise.\n"
+"\n"
+"Le grand avantage de ce système est que les utilisateurs n'ont rien à faire "
+"de spécial. Le module CRM dispose d'une passerelle de courriel permettant de "
+"synchroniser les courriels reçus et OpenERP. De cette façon, les "
+"utilisateurs peuvent simplement envoyer des courriels au système de suivi "
+"des demandes.\n"
+"\n"
+"OpenERP s'occupera de remercier les utilisateurs de leur message, de diriger "
+"cette demande à l'équipe appropriée et de s'assurer que toute les "
+"communications futures seront rangées à la bonne place.\n"
+"\n"
+"\n"
+"Le tableau bord de cette application inclus:\n"
+"* les revenus prévus par étape de vente et par utilisateur (graphique);\n"
+"* les opportunités par étape de vente (graphique).\n"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1241,17 +1349,17 @@ msgstr ""
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "Factice"
 
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalide pour l'architecture de la vue"
 
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Îles Caïmans"
 
 #. module: base
 #: view:ir.rule:0
@@ -1287,7 +1395,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "Char"
-msgstr ""
+msgstr "Caractère"
 
 #. module: base
 #: field:ir.module.category,visible:0
@@ -1365,6 +1473,9 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
+"%W - Numéro de semaine dans l'année (lundi est le premier jour de la "
+"semaine) en nombre décimal [00,53]. Tous les jours de la nouvelle année "
+"précédant le premier lundi sont considérés faisant partie de la semaine 0."
 
 #. module: base
 #: code:addons/base/module/wizard/base_language_install.py:53
@@ -1390,13 +1501,13 @@ msgstr ""
 #. module: base
 #: field:ir.actions.act_url,url:0
 msgid "Action URL"
-msgstr ""
+msgstr "URL de l'action"
 
 #. module: base
 #: field:base.module.import,module_name:0
 #: field:ir.module.module,shortdesc:0
 msgid "Module Name"
-msgstr ""
+msgstr "Nom du module"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -1423,7 +1534,7 @@ msgstr ""
 #: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "Recherche"
 
 #. module: base
 #: code:addons/osv.py:154
@@ -1451,12 +1562,12 @@ msgstr ""
 #: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
-msgstr ""
+msgstr "Opération annulée"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document
 msgid "Document Management System"
-msgstr ""
+msgstr "Système de gestion des documents"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
@@ -1499,7 +1610,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_purchase_management
 #: model:ir.ui.menu,name:base.menu_purchase_root
 msgid "Purchases"
-msgstr ""
+msgstr "Achats"
 
 #. module: base
 #: model:res.country,name:base.md
@@ -1524,12 +1635,12 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "Fonctionnalités"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Data"
-msgstr ""
+msgstr "Données"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_claim
@@ -1597,7 +1708,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Réseau social"
 
 #. module: base
 #: view:res.lang:0
@@ -12871,7 +12982,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index d0ea8b19736..68ab1d36f65 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.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-03-12 04:46+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 32d105932c4..cf0edaaecf7 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.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-03-12 04:46+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 829f5f0dd6e..70d012d1998 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.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-03-12 04:47+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index cb6b74c5d76..e790f6b39e1 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.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-03-12 04:47+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 502eb7017f4..44627278dbc 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,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-03-12 04:52+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 65678f0c39c..b812e7ee525 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,8 +13,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-03-12 04:47+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 25c2c973edc..6275f5896e6 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -9,8 +9,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-03-12 04:42+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 3e1d92922eb..f69a0ae481d 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.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-03-12 04:48+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 979703590c3..ee314bae98b 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.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-03-12 04:47+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index b42ad24c4d9..d76609aa203 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,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-03-12 04:48+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 496096243a8..03850c59478 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.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-03-12 04:48+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 8ded3adc823..837f7516cc2 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.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-03-12 04:45+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 1f79cb3bea8..5592883f098 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.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-03-12 04:48+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 59699d475f1..50fb6e38537 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.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-03-12 04:49+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 255c8cca12c..55518a7b577 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,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-03-12 04:49+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 11ab8a66389..f64156a0738 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.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-03-12 04:49+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 16ef3f6b681..46cfd2f956a 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.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-03-12 04:49+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index c6aadd7f268..1d69c955339 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,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-03-12 04:50+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 4cc42eafc50..066dfdb196a 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.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-03-12 04:50+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 1a075753bd5..9950ea883b2 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,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-03-12 04:44+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 650b53002a3..d8e2ab7b023 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.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-03-12 04:56+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index b98dcfd3e61..bdfe4178bb1 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,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-03-12 04:51+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 40be88b6a5b..ac1ec23c839 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,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-03-12 04:51+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index dd733b834d7..0d5261a6539 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.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-03-12 04:55+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 2eef4d852ee..f6afb07778e 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,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-03-12 04:51+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 36b5686a172..dde0d09a88b 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,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-03-12 04:51+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index fb2f429717c..fa23b9fca86 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.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-03-12 04:52+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index b8c16a387b2..2ce1102afb6 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,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-03-12 04:52+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index d2e13a78447..75418986b60 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,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-03-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 418010621fc..61b34a233f5 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.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-03-12 04:52+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 6574959fd41..8c9348c3094 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.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-03-12 04:58+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 06b1a9d5ba7..a8e01fb7a5d 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,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-03-12 04:53+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 560d3e03eef..db7e38e2fec 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.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-03-12 04:53+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 9ac32871bc4..afcd43207d9 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,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-03-12 04:53+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index eea736aa946..2411e610e83 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,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-03-12 04:54+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 7065c8cf42b..5ec02766e6d 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,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-03-12 04:54+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 0b9702b1f6d..d18f9aaea23 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.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-03-12 04:54+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index c6a970ba990..ae1c01cef12 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.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-03-12 04:54+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index f9ff9274e58..6ea18ad57c9 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,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-03-12 04:57+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 852bbaa62c1..700bf5c84c7 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.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-03-12 04:54+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 4d96c33f880..1b7ff7144f5 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,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-03-12 04:57+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 520e10d4b469f7e18cad701887832ffec91dc1b0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 20 Mar 2014 11:15:55 +0100
Subject: [PATCH 173/175] [FIX] account invoice analysis exclude proforma from
 invoiced

bzr revid: al@openerp.com-20140320101555-hw2bgaqs2kw0b7of
---
 addons/account/report/account_invoice_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 24723d7fb12..eebc95ae0e2 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -25,7 +25,7 @@
                 <separator/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
-                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
+                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel','proforma','proforma2'))]" help = "Open and Paid Invoices"/>
                 <separator/>
                 <filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/>
                 <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>

From abf8e0d54f63dcc8cbf7a8fc3b8745fa138b1ad3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Mar 2014 18:51:29 +0100
Subject: [PATCH 174/175] [ADD] crm: mass convert lead to opp, add force
 assignation checkbox, to force the salesman/salesteam on converted/merged
 lead/opps or leave the existing salesman/salesteam

bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 347475d100f..70f6712df74 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -197,8 +197,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
                 ('each_exist_or_create', 'Use existing partner or create'),
                 ('nothing', 'Do not link to a customer')
             ], 'Related Customer', required=True),
-        # Uncomment me in trunk
-        # 'force_assignation': fields.boolean('Force assignation', help='If unchecked, this will leave the salesman of duplicated opportunities'),
+        'force_assignation': fields.boolean('Force assignation', help='If unchecked, this will leave the salesman of duplicated opportunities'),
     }
 
     _defaults = {
@@ -274,10 +273,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)
-        # Remove me in trunk
-        ctx['no_force_assignation'] = ctx.get('no_force_assignation', True) 
-        # Uncomment me in trunk
-        # ctx['no_force_assignation'] = not data.force_assignation
+        ctx['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 54d8cd1e866d1a6dc0b594588a6d900d6404728c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Mar 2014 19:38:14 +0100
Subject: [PATCH 175/175] [FIX] crm: round robin tests on salesman assignation
 set force assignation true

bzr revid: dle@openerp.com-20140320183814-163zwgilty4l2jv7
---
 addons/crm/test/lead2opportunity_assign_salesmen.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index 12d212ec5fd..76b35be531d 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -65,8 +65,8 @@
   Salesman create a mass convert wizard and convert all the leads.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01"), 'no_force_assignation': False})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False}, context=context)
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   The leads should now be opps with a salesman and a salesteam.  Also, salesmen should have been assigned following a round-robin method.